[1875] 2008-09-25 Robert Millan <[email protected]>
Robert Millan <[email protected]>
| Newsgroups | gmane.comp.boot-loaders.grub.cvs |
|---|---|
| Message-ID | <[email protected]> |
Revision: 1875
http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=1875
Author: robertmh
Date: 2008-09-25 14:15:24 +0000 (Thu, 25 Sep 2008)
Log Message:
-----------
2008-09-25 Robert Millan <[email protected]>
* 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().
Modified Paths:
--------------
trunk/grub2/ChangeLog
trunk/grub2/conf/i386-coreboot.rmk
trunk/grub2/conf/i386-efi.rmk
trunk/grub2/conf/i386-ieee1275.rmk
trunk/grub2/conf/i386-pc.rmk
trunk/grub2/conf/powerpc-ieee1275.rmk
trunk/grub2/conf/x86_64-efi.rmk
trunk/grub2/include/grub/util/misc.h
trunk/grub2/util/grub-mkdevicemap.c
trunk/grub2/util/i386/get_disk_name.c
trunk/grub2/util/ieee1275/get_disk_name.c
Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog 2008-09-24 21:01:11 UTC (rev 1874)
+++ trunk/grub2/ChangeLog 2008-09-25 14:15:24 UTC (rev 1875)
@@ -1,3 +1,20 @@
+2008-09-25 Robert Millan <[email protected]>
+
+ * 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 <[email protected]>
* disk/dmraid_nvidia.c (grub_dmraid_nv_detect): Fix `unused parameter'
Modified: trunk/grub2/conf/i386-coreboot.rmk
===================================================================
--- trunk/grub2/conf/i386-coreboot.rmk 2008-09-24 21:01:11 UTC (rev 1874)
+++ trunk/grub2/conf/i386-coreboot.rmk 2008-09-25 14:15:24 UTC (rev 1875)
@@ -51,8 +51,7 @@
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
Modified: trunk/grub2/conf/i386-efi.rmk
===================================================================
--- trunk/grub2/conf/i386-efi.rmk 2008-09-24 21:01:11 UTC (rev 1874)
+++ trunk/grub2/conf/i386-efi.rmk 2008-09-25 14:15:24 UTC (rev 1875)
@@ -28,8 +28,7 @@
# 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
Modified: trunk/grub2/conf/i386-ieee1275.rmk
===================================================================
--- trunk/grub2/conf/i386-ieee1275.rmk 2008-09-24 21:01:11 UTC (rev 1874)
+++ trunk/grub2/conf/i386-ieee1275.rmk 2008-09-25 14:15:24 UTC (rev 1875)
@@ -48,8 +48,7 @@
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
Modified: trunk/grub2/conf/i386-pc.rmk
===================================================================
--- trunk/grub2/conf/i386-pc.rmk 2008-09-24 21:01:11 UTC (rev 1874)
+++ trunk/grub2/conf/i386-pc.rmk 2008-09-25 14:15:24 UTC (rev 1875)
@@ -108,8 +108,7 @@
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
Modified: trunk/grub2/conf/powerpc-ieee1275.rmk
===================================================================
--- trunk/grub2/conf/powerpc-ieee1275.rmk 2008-09-24 21:01:11 UTC (rev 1874)
+++ trunk/grub2/conf/powerpc-ieee1275.rmk 2008-09-25 14:15:24 UTC (rev 1875)
@@ -34,8 +34,7 @@
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
Modified: trunk/grub2/conf/x86_64-efi.rmk
===================================================================
--- trunk/grub2/conf/x86_64-efi.rmk 2008-09-24 21:01:11 UTC (rev 1874)
+++ trunk/grub2/conf/x86_64-efi.rmk 2008-09-25 14:15:24 UTC (rev 1875)
@@ -30,8 +30,7 @@
# 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
Modified: trunk/grub2/include/grub/util/misc.h
===================================================================
--- trunk/grub2/include/grub/util/misc.h 2008-09-24 21:01:11 UTC (rev 1874)
+++ trunk/grub2/include/grub/util/misc.h 2008-09-25 14:15:24 UTC (rev 1875)
@@ -56,7 +56,6 @@
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
Modified: trunk/grub2/util/grub-mkdevicemap.c
===================================================================
--- trunk/grub2/util/grub-mkdevicemap.c 2008-09-24 21:01:11 UTC (rev 1874)
+++ trunk/grub2/util/grub-mkdevicemap.c 2008-09-25 14:15:24 UTC (rev 1875)
@@ -450,11 +450,8 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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++;
}
}
Modified: trunk/grub2/util/i386/get_disk_name.c
===================================================================
--- trunk/grub2/util/i386/get_disk_name.c 2008-09-24 21:01:11 UTC (rev 1874)
+++ trunk/grub2/util/i386/get_disk_name.c 2008-09-25 14:15:24 UTC (rev 1875)
@@ -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;
-}
Modified: trunk/grub2/util/ieee1275/get_disk_name.c
===================================================================
--- trunk/grub2/util/ieee1275/get_disk_name.c 2008-09-24 21:01:11 UTC (rev 1874)
+++ trunk/grub2/util/ieee1275/get_disk_name.c 2008-09-25 14:15:24 UTC (rev 1875)
@@ -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;
-}