2008-09-25 Robert Millan <rmh@aybabtu.com>

        * conf/i386-pc.rmk (grub_mkdevicemap_SOURCES): Remove
        `util/i386/get_disk_name.c'.
        * conf/i386-efi.rmk: Likewise.
        * conf/x86_64-efi.rmk: Likewise.
        * conf/i386-coreboot.rmk: Likewise.
        * conf/i386-ieee1275.rmk: Likewise.
        * conf/powerpc-ieee1275.rmk (grub_mkdevicemap_SOURCES): Remove
        `util/ieee1275/get_disk_name.c'.
        * include/grub/util/misc.h (grub_util_get_disk_name): Remove.
        * util/ieee1275/get_disk_name.c: Remove file.
        * util/i386/get_disk_name.c: Remove file.
        * util/grub-mkdevicemap.c (make_device_map): Back to hardcoding
        "hd%d" for device.map entries, rather than using
        grub_util_get_disk_name().

diff --git a/ChangeLog b/ChangeLog
index 9b1000f3fb5ee38a1e6a6c3dd23c5f6e471fdb2e..36b114245be206f661137eabb0f644b097aa666c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2008-09-25  Robert Millan  <rmh@aybabtu.com>
+
+       * conf/i386-pc.rmk (grub_mkdevicemap_SOURCES): Remove
+       `util/i386/get_disk_name.c'.
+       * conf/i386-efi.rmk: Likewise.
+       * conf/x86_64-efi.rmk: Likewise.
+       * conf/i386-coreboot.rmk: Likewise.
+       * conf/i386-ieee1275.rmk: Likewise.
+       * conf/powerpc-ieee1275.rmk (grub_mkdevicemap_SOURCES): Remove
+       `util/ieee1275/get_disk_name.c'.
+       * include/grub/util/misc.h (grub_util_get_disk_name): Remove.
+       * util/ieee1275/get_disk_name.c: Remove file.
+       * util/i386/get_disk_name.c: Remove file.
+       * util/grub-mkdevicemap.c (make_device_map): Back to hardcoding
+       "hd%d" for device.map entries, rather than using
+       grub_util_get_disk_name().
+
 2008-09-24  Carles Pina i Estany  <carles@pina.cat>
 
        * disk/dmraid_nvidia.c (grub_dmraid_nv_detect): Fix `unused parameter'

diff --git a/conf/i386-coreboot.rmk b/conf/i386-coreboot.rmk
index 788442e2527f14e88f47dd8ced459b9ed14cd4d7..78088fd3f4117580577d417f925bc40704d588c7 100644 (file)
--- a/conf/i386-coreboot.rmk
+++ b/conf/i386-coreboot.rmk
@@ -51,8 +51,7 @@ sbin_UTILITIES += grub-emu
 endif
 
 # For grub-mkdevicemap.
-grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/misc.c         \
-       util/i386/get_disk_name.c
+grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/misc.c
 
 # For grub-emu.
 util/grub-emu.c_DEPENDENCIES = grub_emu_init.h

diff --git a/conf/i386-efi.rmk b/conf/i386-efi.rmk
index 67daa6a953c8d2a90e0e927c7d980815cadc5c5e..c13a3a78915cf688a78041f00f934f1d759850a3 100644 (file)
--- a/conf/i386-efi.rmk
+++ b/conf/i386-efi.rmk
@@ -28,8 +28,7 @@ util/i386/efi/grub-mkimage.c_DEPENDENCIES = Makefile
 #      kern/fs.c kern/env.c fs/fshelp.c
 
 # For grub-mkdevicemap.
-grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/misc.c         \
-       util/i386/get_disk_name.c
+grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/misc.c
 
 # For grub-emu.
 util/grub-emu.c_DEPENDENCIES = grub_emu_init.h

diff --git a/conf/i386-ieee1275.rmk b/conf/i386-ieee1275.rmk
index 78a5d915bb72baa8864f319e0d75f996b439a97c..2e27ca1daf9741d85eeedec8a9735c844648752c 100644 (file)
--- a/conf/i386-ieee1275.rmk
+++ b/conf/i386-ieee1275.rmk
@@ -48,8 +48,7 @@ sbin_UTILITIES += grub-emu
 endif
 
 # For grub-mkdevicemap.
-grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/misc.c         \
-       util/i386/get_disk_name.c
+grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/misc.c
 
 # For grub-emu.
 util/grub-emu.c_DEPENDENCIES = grub_emu_init.h

diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index e1aa60c39baee0735a9aa15755ce5b90b56aa527..82cb12b40516a8742ae34f0170897950f0e2356a 100644 (file)
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -108,8 +108,7 @@ grub_setup_SOURCES = util/i386/pc/grub-setup.c util/hostdisk.c      \
        grub_setup_init.c
 
 # For grub-mkdevicemap.
-grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/misc.c         \
-       util/i386/get_disk_name.c
+grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/misc.c
 
 # For grub-emu.
 util/grub-emu.c_DEPENDENCIES = grub_emu_init.h

diff --git a/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk
index c06e55da47d370135fa1cb565bcd87afefe73edc..9460ba46f9259ef6d04e897610b4db812cca492b 100644 (file)
--- a/conf/powerpc-ieee1275.rmk
+++ b/conf/powerpc-ieee1275.rmk
@@ -34,8 +34,7 @@ sbin_UTILITIES += grub-emu
 endif
  
 # For grub-mkdevicemap.
-grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/misc.c         \
-       util/ieee1275/get_disk_name.c
+grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/misc.c
 
 # For grub-emu
 util/grub-emu.c_DEPENDENCIES = grub_emu_init.h

diff --git a/conf/x86_64-efi.rmk b/conf/x86_64-efi.rmk
index 29a695e353be86811fe258fd5a4c68714c409bf4..a1b94b664a58c8be93d80e3059cd4d2ba7781e64 100644 (file)
--- a/conf/x86_64-efi.rmk
+++ b/conf/x86_64-efi.rmk
@@ -30,8 +30,7 @@ grub_mkimage_SOURCES = util/i386/efi/grub-mkimage.c util/misc.c \
 #      kern/fs.c kern/env.c fs/fshelp.c
 
 # For grub-mkdevicemap.
-grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/misc.c         \
-       util/i386/get_disk_name.c
+grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/misc.c
 
 # For grub-emu.
 util/grub-emu.c_DEPENDENCIES = grub_emu_init.h

diff --git a/include/grub/util/misc.h b/include/grub/util/misc.h
index 3f145e86a7eee6988b1e97ab05f567276f3fcf94..52090b7019f2d6e2365a2b038c79de8248108199 100644 (file)
--- a/include/grub/util/misc.h
+++ b/include/grub/util/misc.h
@@ -56,7 +56,6 @@ void grub_util_load_image (const char *path, char *buf);
 void grub_util_write_image (const char *img, size_t size, FILE *out);
 void grub_util_write_image_at (const void *img, size_t size, off_t offset,
                               FILE *out);
-char *grub_util_get_disk_name (int disk, char *name);
 
 #ifndef  HAVE_ASPRINTF
 

diff --git a/util/grub-mkdevicemap.c b/util/grub-mkdevicemap.c
index 38a90b7b3a1968ebacde75e323f2072e08f737f8..cd9ea1940f4e695edb0310c06dd9a63c8fd4a879 100644 (file)
--- a/util/grub-mkdevicemap.c
+++ b/util/grub-mkdevicemap.c
@@ -450,11 +450,8 @@ make_device_map (const char *device_map, int floppy_disks)
          
          if (realpath (discn, name))
            {
-             char *p;
              strcat (name, "/disc");
-             p = grub_util_get_disk_name (num_hd, name);
-             fprintf (fp, "(%s)\t%s\n", p, name);
-             free (p);
+             fprintf (fp, "(hd%d)\t%s\n", num_hd, name);
            }
          
          num_hd++;
@@ -472,10 +469,7 @@ make_device_map (const char *device_map, int floppy_disks)
       get_ide_disk_name (name, i);
       if (check_device (name))
        {
-         char *p;
-         p = grub_util_get_disk_name (num_hd, name);
-         fprintf (fp, "(%s)\t%s\n", p, name);
-         free (p);
+         fprintf (fp, "(hd%d)\t%s\n", num_hd, name);
          num_hd++;
        }
     }
@@ -505,10 +499,7 @@ make_device_map (const char *device_map, int floppy_disks)
       get_ataraid_disk_name (name, i);
       if (check_device (name))
        {
-         char *p;
-         p = grub_util_get_disk_name (num_hd, name);
-         fprintf (fp, "(%s)\t%s\n", p, name);
-         free (p);
+         fprintf (fp, "(hd%d)\t%s\n", num_hd, name);
           num_hd++;
         }
     }
@@ -538,10 +529,7 @@ make_device_map (const char *device_map, int floppy_disks)
       get_scsi_disk_name (name, i);
       if (check_device (name))
        {
-         char *p;
-         p = grub_util_get_disk_name (num_hd, name);
-         fprintf (fp, "(%s)\t%s\n", p, name);
-         free (p);
+         fprintf (fp, "(hd%d)\t%s\n", num_hd, name);
          num_hd++;
        }
     }
@@ -564,10 +552,7 @@ make_device_map (const char *device_map, int floppy_disks)
            get_dac960_disk_name (name, controller, drive);
            if (check_device (name))
              {
-               char *p;
-               p = grub_util_get_disk_name (num_hd, name);
-               fprintf (fp, "(%s)\t%s\n", p, name);
-               free (p);
+               fprintf (fp, "(hd%d)\t%s\n", num_hd, name);
                num_hd++;
              }
          }
@@ -633,10 +618,7 @@ make_device_map (const char *device_map, int floppy_disks)
        get_i2o_disk_name (name, unit);
        if (check_device (name))
          {
-           char *p;
-           p = grub_util_get_disk_name (num_hd, name);
-           fprintf (fp, "(%s)\t%s\n", p, name);
-           free (p);
+           fprintf (fp, "(hd%d)\t%s\n", num_hd, name);
            num_hd++;
          }
       }

diff --git a/util/i386/get_disk_name.c b/util/i386/get_disk_name.c
index 38195e2489ef1ce10b957a80ae7d2b29158d467b..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/util/i386/get_disk_name.c
+++ b/util/i386/get_disk_name.c
@@ -1,31 +0,0 @@
-/* get_disk_name.c */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2007 Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  GRUB is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <grub/util/misc.h>
-
-char *
-grub_util_get_disk_name (int disk, char *name  __attribute__ ((unused)))
-{
-  char *p;
-
-  p = xmalloc (16);
-  sprintf (p, "hd%d", disk);
-  
-  return p;
-}

diff --git a/util/ieee1275/get_disk_name.c b/util/ieee1275/get_disk_name.c
index 30e965ab4dc2d9716fa136da865ec0ee77277622..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/util/ieee1275/get_disk_name.c
+++ b/util/ieee1275/get_disk_name.c
@@ -1,61 +0,0 @@
-/* get_disk_name.c */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2007 Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  GRUB is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <config.h>
-#include <stdio.h>
-#include <grub/util/misc.h>
-
-char *
-grub_util_get_disk_name (int disk __attribute__ ((unused)), char *name)
-{
-  int p[2];
-
-  char *line = NULL;
-  size_t zero = 0;
-  int len;
-
-  pipe (p);
-
-  switch (fork ())
-    {
-    case -1:
-      perror ("fork");
-      exit (1);
-    case 0:
-      close (1);
-      dup (p[1]);
-      close (p[0]);
-      close (p[1]);
-      execlp ("ofpathname", "ofpathname", "-a", name, NULL);
-      perror ("execlp");
-    default:
-      close (0);
-      dup (p[0]);
-      close (p[0]);
-      close (p[1]);
-    }
-
-  len = getline (&line, &zero, stdin);
-  if (len < 2)
-    grub_util_error ("ofpathname didn't print a meaningful alias name");
-
-  line[len - 1] = '\0';
-  
-  return line;
-}