From 8be63f2ef6fec43245bea2aa737cc5b1e2f84779 Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Fri, 3 Feb 2012 22:36:51 +0100 Subject: [PATCH] * Makefile.util.def (grub-mkdevicemap): Removed. * include/grub/emu/hostdisk.h (grub_util_get_os_disk): New proto. * include/grub/util/deviceiter.h: Removed. * util/deviceiter.c: Likewise. * util/getroot.c (grub_util_get_os_disk): New function. * util/grub-install.in: Remove grub-mkdevicemap. Use -t disk as replacement for EFI. * util/grub-mkdevicemap.c: Removed. * util/grub-probe.c (probe): Handle PRINT_DISK. (argp_parser): Handle -t disk. --- ChangeLog | 13 + Makefile.util.def | 16 - include/grub/emu/hostdisk.h | 3 + include/grub/util/deviceiter.h | 11 - util/deviceiter.c | 954 --------------------------------- util/getroot.c | 17 + util/grub-install.in | 34 +- util/grub-mkdevicemap.c | 171 ------ util/grub-probe.c | 22 +- 9 files changed, 66 insertions(+), 1175 deletions(-) delete mode 100644 include/grub/util/deviceiter.h delete mode 100644 util/deviceiter.c delete mode 100644 util/grub-mkdevicemap.c diff --git a/ChangeLog b/ChangeLog index c2a12984f..41e860288 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2012-02-03 Vladimir Serbinenko + + * Makefile.util.def (grub-mkdevicemap): Removed. + * include/grub/emu/hostdisk.h (grub_util_get_os_disk): New proto. + * include/grub/util/deviceiter.h: Removed. + * util/deviceiter.c: Likewise. + * util/getroot.c (grub_util_get_os_disk): New function. + * util/grub-install.in: Remove grub-mkdevicemap. Use -t disk as + replacement for EFI. + * util/grub-mkdevicemap.c: Removed. + * util/grub-probe.c (probe): Handle PRINT_DISK. + (argp_parser): Handle -t disk. + 2012-02-03 Vladimir Serbinenko * util/grub-mkfont.c: Migrate to argp. diff --git a/Makefile.util.def b/Makefile.util.def index 843c3ea60..98a7e1ecb 100644 --- a/Makefile.util.def +++ b/Makefile.util.def @@ -284,22 +284,6 @@ program = { condition = COND_GRUB_MKFONT; }; -program = { - name = grub-mkdevicemap; - installdir = sbin; - mansection = 8; - - common = util/grub-mkdevicemap.c; - common = util/deviceiter.c; - common = util/devicemap.c; - - ldadd = libgrubmods.a; - ldadd = libgrubgcry.a; - ldadd = libgrubkern.a; - ldadd = grub-core/gnulib/libgnu.a; - ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)'; -}; - program = { name = grub-probe; installdir = sbin; diff --git a/include/grub/emu/hostdisk.h b/include/grub/emu/hostdisk.h index e8df694a6..950d26c03 100644 --- a/include/grub/emu/hostdisk.h +++ b/include/grub/emu/hostdisk.h @@ -61,4 +61,7 @@ grub_uint64_t grub_util_get_fd_sectors (int fd, unsigned *log_secsize); #endif +char * +grub_util_get_os_disk (const char *os_dev); + #endif /* ! GRUB_BIOSDISK_MACHINE_UTIL_HEADER */ diff --git a/include/grub/util/deviceiter.h b/include/grub/util/deviceiter.h deleted file mode 100644 index a8af03cfe..000000000 --- a/include/grub/util/deviceiter.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef GRUB_DEVICEITER_MACHINE_UTIL_HEADER -#define GRUB_DEVICEITER_MACHINE_UTIL_HEADER 1 - -#include - -void grub_util_iterate_devices (int NESTED_FUNC_ATTR (*hook) (const char *, int), - int floppy_disks); -void grub_util_emit_devicemap_entry (FILE *fp, char *name, int is_floppy, - int *num_fd, int *num_hd); - -#endif /* ! GRUB_DEVICEITER_MACHINE_UTIL_HEADER */ diff --git a/util/deviceiter.c b/util/deviceiter.c deleted file mode 100644 index 87cbc9ebc..000000000 --- a/util/deviceiter.c +++ /dev/null @@ -1,954 +0,0 @@ -/* deviceiter.c - iterate over system devices */ -/* - * GRUB -- GRand Unified Bootloader - * Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2007,2008,2011 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 . - */ - -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -#ifdef __linux__ -# if !defined(__GLIBC__) || \ - ((__GLIBC__ < 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ < 1))) -/* Maybe libc doesn't have large file support. */ -# include /* _llseek */ -# endif /* (GLIBC < 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR < 1)) */ -# include /* ioctl */ -# ifndef HDIO_GETGEO -# define HDIO_GETGEO 0x0301 /* get device geometry */ -/* If HDIO_GETGEO is not defined, it is unlikely that hd_geometry is - defined. */ -struct hd_geometry -{ - unsigned char heads; - unsigned char sectors; - unsigned short cylinders; - unsigned long start; -}; -# endif /* ! HDIO_GETGEO */ -# ifndef FLOPPY_MAJOR -# define FLOPPY_MAJOR 2 /* the major number for floppy */ -# endif /* ! FLOPPY_MAJOR */ -# ifndef MAJOR -# define MAJOR(dev) \ - ({ \ - unsigned long long __dev = (dev); \ - (unsigned) ((__dev >> 8) & 0xfff) \ - | ((unsigned int) (__dev >> 32) & ~0xfff); \ - }) -# endif /* ! MAJOR */ -# ifndef MINOR -# define MINOR(dev) \ - ({ \ - unsigned long long __dev = (dev); \ - (unsigned) (__dev & 0xff) | ((unsigned int) (__dev >> 12) & ~0xff); \ - }) -# endif /* ! MINOR */ -# ifndef CDROM_GET_CAPABILITY -# define CDROM_GET_CAPABILITY 0x5331 /* get capabilities */ -# endif /* ! CDROM_GET_CAPABILITY */ -# ifndef BLKGETSIZE -# define BLKGETSIZE _IO(0x12,96) /* return device size */ -# endif /* ! BLKGETSIZE */ - -#ifdef HAVE_DEVICE_MAPPER -# include -#endif -#endif /* __linux__ */ - -/* Use __FreeBSD_kernel__ instead of __FreeBSD__ for compatibility with - kFreeBSD-based non-FreeBSD systems (e.g. GNU/kFreeBSD) */ -#if defined(__FreeBSD__) && ! defined(__FreeBSD_kernel__) -# define __FreeBSD_kernel__ -#endif -#ifdef __FreeBSD_kernel__ - /* Obtain version of kFreeBSD headers */ -# include -# ifndef __FreeBSD_kernel_version -# define __FreeBSD_kernel_version __FreeBSD_version -# endif - - /* Runtime detection of kernel */ -# include -int -get_kfreebsd_version (void) -{ - struct utsname uts; - int major; - int minor; - int v[2]; - - uname (&uts); - sscanf (uts.release, "%d.%d", &major, &minor); - - if (major >= 9) - major = 9; - if (major >= 5) - { - v[0] = minor/10; v[1] = minor%10; - } - else - { - v[0] = minor%10; v[1] = minor/10; - } - return major*100000+v[0]*10000+v[1]*1000; -} -#endif /* __FreeBSD_kernel__ */ - -#if defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) -# include /* ioctl */ -# include -# include /* CDIOCCLRDEBUG */ -# if defined(__FreeBSD_kernel__) -# include -# if __FreeBSD_kernel_version >= 500040 -# include -# endif -# endif /* __FreeBSD_kernel__ */ -#endif /* __FreeBSD_kernel__ || __NetBSD__ || __OpenBSD__ */ - -#ifdef HAVE_OPENDISK -# include -#endif /* HAVE_OPENDISK */ - -#ifdef __linux__ -/* Check if we have devfs support. */ -static int -have_devfs (void) -{ - struct stat st; - return stat ("/dev/.devfsd", &st) == 0; -} -#endif /* __linux__ */ - -/* These three functions are quite different among OSes. */ -static void -get_floppy_disk_name (char *name, int unit) -{ -#if defined(__linux__) - /* GNU/Linux */ - if (have_devfs ()) - sprintf (name, "/dev/floppy/%d", unit); - else - sprintf (name, "/dev/fd%d", unit); -#elif defined(__GNU__) - /* GNU/Hurd */ - sprintf (name, "/dev/fd%d", unit); -#elif defined(__FreeBSD_kernel__) - /* kFreeBSD */ - if (get_kfreebsd_version () >= 400000) - sprintf (name, "/dev/fd%d", unit); - else - sprintf (name, "/dev/rfd%d", unit); -#elif defined(__NetBSD__) - /* NetBSD */ - /* opendisk() doesn't work for floppies. */ - sprintf (name, "/dev/rfd%da", unit); -#elif defined(__OpenBSD__) - /* OpenBSD */ - sprintf (name, "/dev/rfd%dc", unit); -#elif defined(__QNXNTO__) - /* QNX RTP */ - sprintf (name, "/dev/fd%d", unit); -#elif defined(__CYGWIN__) - /* Cygwin */ - sprintf (name, "/dev/fd%d", unit); -#elif defined(__MINGW32__) - (void) unit; - *name = 0; -#else -# warning "BIOS floppy drives cannot be guessed in your operating system." - /* Set NAME to a bogus string. */ - *name = 0; -#endif -} - -static void -get_ide_disk_name (char *name, int unit) -{ -#if defined(__linux__) - /* GNU/Linux */ - sprintf (name, "/dev/hd%c", unit + 'a'); -#elif defined(__GNU__) - /* GNU/Hurd */ - sprintf (name, "/dev/hd%d", unit); -#elif defined(__FreeBSD_kernel__) - /* kFreeBSD */ - if (get_kfreebsd_version () >= 400000) - sprintf (name, "/dev/ad%d", unit); - else - sprintf (name, "/dev/rwd%d", unit); -#elif defined(__NetBSD__) && defined(HAVE_OPENDISK) - /* NetBSD */ - char shortname[16]; - int fd; - - sprintf (shortname, "wd%d", unit); - fd = opendisk (shortname, O_RDONLY, name, - 16, /* length of NAME */ - 0 /* char device */ - ); - close (fd); -#elif defined(__OpenBSD__) - /* OpenBSD */ - sprintf (name, "/dev/rwd%dc", unit); -#elif defined(__QNXNTO__) - /* QNX RTP */ - /* Actually, QNX RTP doesn't distinguish IDE from SCSI, so this could - contain SCSI disks. */ - sprintf (name, "/dev/hd%d", unit); -#elif defined(__CYGWIN__) - /* Cygwin emulates all disks as /dev/sdX. */ - (void) unit; - *name = 0; -#elif defined(__MINGW32__) - sprintf (name, "//./PHYSICALDRIVE%d", unit); -#else -# warning "BIOS IDE drives cannot be guessed in your operating system." - /* Set NAME to a bogus string. */ - *name = 0; -#endif -} - -static void -get_scsi_disk_name (char *name, int unit) -{ -#if defined(__linux__) - /* GNU/Linux */ - sprintf (name, "/dev/sd%c", unit + 'a'); -#elif defined(__GNU__) - /* GNU/Hurd */ - sprintf (name, "/dev/sd%d", unit); -#elif defined(__FreeBSD_kernel__) - /* kFreeBSD */ - if (get_kfreebsd_version () >= 400000) - sprintf (name, "/dev/da%d", unit); - else - sprintf (name, "/dev/rda%d", unit); -#elif defined(__NetBSD__) && defined(HAVE_OPENDISK) - /* NetBSD */ - char shortname[16]; - int fd; - - sprintf (shortname, "sd%d", unit); - fd = opendisk (shortname, O_RDONLY, name, - 16, /* length of NAME */ - 0 /* char device */ - ); - close (fd); -#elif defined(__OpenBSD__) - /* OpenBSD */ - sprintf (name, "/dev/rsd%dc", unit); -#elif defined(__QNXNTO__) - /* QNX RTP */ - /* QNX RTP doesn't distinguish SCSI from IDE, so it is better to - disable the detection of SCSI disks here. */ - *name = 0; -#elif defined(__CYGWIN__) - /* Cygwin emulates all disks as /dev/sdX. */ - sprintf (name, "/dev/sd%c", unit + 'a'); -#elif defined(__MINGW32__) - (void) unit; - *name = 0; -#else -# warning "BIOS SCSI drives cannot be guessed in your operating system." - /* Set NAME to a bogus string. */ - *name = 0; -#endif -} - -#ifdef __FreeBSD_kernel__ -static void -get_ada_disk_name (char *name, int unit) -{ - sprintf (name, "/dev/ada%d", unit); -} - -static void -get_ataraid_disk_name (char *name, int unit) -{ - sprintf (name, "/dev/ar%d", unit); -} - -static void -get_mfi_disk_name (char *name, int unit) -{ - sprintf (name, "/dev/mfid%d", unit); -} -#endif - -#ifdef __linux__ -static void -get_virtio_disk_name (char *name, int unit) -{ -#ifdef __sparc__ - sprintf (name, "/dev/vdisk%c", unit + 'a'); -#else - sprintf (name, "/dev/vd%c", unit + 'a'); -#endif -} - -static void -get_dac960_disk_name (char *name, int controller, int drive) -{ - sprintf (name, "/dev/rd/c%dd%d", controller, drive); -} - -static void -get_acceleraid_disk_name (char *name, int controller, int drive) -{ - sprintf (name, "/dev/rs/c%dd%d", controller, drive); -} - -static void -get_ataraid_disk_name (char *name, int unit) -{ - sprintf (name, "/dev/ataraid/d%c", unit + '0'); -} - -static void -get_i2o_disk_name (char *name, char unit) -{ - sprintf (name, "/dev/i2o/hd%c", unit); -} - -static void -get_cciss_disk_name (char *name, int controller, int drive) -{ - sprintf (name, "/dev/cciss/c%dd%d", controller, drive); -} - -static void -get_ida_disk_name (char *name, int controller, int drive) -{ - sprintf (name, "/dev/ida/c%dd%d", controller, drive); -} - -static void -get_mmc_disk_name (char *name, int unit) -{ - sprintf (name, "/dev/mmcblk%d", unit); -} - -static void -get_xvd_disk_name (char *name, int unit) -{ - sprintf (name, "/dev/xvd%c", unit + 'a'); -} -#endif - -static struct seen_device -{ - struct seen_device *next; - struct seen_device **prev; - const char *name; -} *seen; - -/* Check if DEVICE can be read. Skip any DEVICE that we have already seen. - If an error occurs, return zero, otherwise return non-zero. */ -static int -check_device_readable_unique (const char *device) -{ - char *real_device; - char buf[512]; - FILE *fp; - struct seen_device *seen_elt; - - /* If DEVICE is empty, just return error. */ - if (*device == 0) - return 0; - - /* Have we seen this device already? */ - real_device = canonicalize_file_name (device); - if (! real_device) - return 0; - if (grub_named_list_find (GRUB_AS_NAMED_LIST (seen), real_device)) - { - grub_dprintf ("deviceiter", "Already seen %s (%s)\n", - device, real_device); - goto fail; - } - - fp = fopen (device, "r"); - if (! fp) - { - switch (errno) - { -#ifdef ENOMEDIUM - case ENOMEDIUM: -# if 0 - /* At the moment, this finds only CDROMs, which can't be - read anyway, so leave it out. Code should be - reactivated if `removable disks' and CDROMs are - supported. */ - /* Accept it, it may be inserted. */ - return 1; -# endif - break; -#endif /* ENOMEDIUM */ - default: - /* Break case and leave. */ - break; - } - /* Error opening the device. */ - goto fail; - } - - /* Make sure CD-ROMs don't get assigned a BIOS disk number - before SCSI disks! */ -#ifdef __linux__ -# ifdef CDROM_GET_CAPABILITY - if (ioctl (fileno (fp), CDROM_GET_CAPABILITY, 0) >= 0) - goto fail; -# else /* ! CDROM_GET_CAPABILITY */ - /* Check if DEVICE is a CD-ROM drive by the HDIO_GETGEO ioctl. */ - { - struct hd_geometry hdg; - struct stat st; - - if (fstat (fileno (fp), &st)) - goto fail; - - /* If it is a block device and isn't a floppy, check if HDIO_GETGEO - succeeds. */ - if (S_ISBLK (st.st_mode) - && MAJOR (st.st_rdev) != FLOPPY_MAJOR - && ioctl (fileno (fp), HDIO_GETGEO, &hdg)) - goto fail; - } -# endif /* ! CDROM_GET_CAPABILITY */ -#endif /* __linux__ */ - -#if defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) -# ifdef CDIOCCLRDEBUG - if (ioctl (fileno (fp), CDIOCCLRDEBUG, 0) >= 0) - goto fail; -# endif /* CDIOCCLRDEBUG */ -#endif /* __FreeBSD_kernel__ || __NetBSD__ || __OpenBSD__ */ - - /* Attempt to read the first sector. */ - if (fread (buf, 1, 512, fp) != 512) - { - fclose (fp); - goto fail; - } - - /* Remember that we've seen this device. */ - seen_elt = xmalloc (sizeof (*seen_elt)); - seen_elt->name = real_device; /* steal memory */ - grub_list_push (GRUB_AS_LIST_P (&seen), GRUB_AS_LIST (seen_elt)); - - fclose (fp); - return 1; - -fail: - free (real_device); - return 0; -} - -static void -clear_seen_devices (void) -{ - while (seen) - { - struct seen_device *seen_elt = seen; - seen = seen->next; - free (seen_elt); - } - seen = NULL; -} - -#ifdef __linux__ -struct device -{ - char *stable; - char *kernel; -}; - -/* Sort by the kernel name for preference since that most closely matches - older device.map files, but sort by stable by-id names as a fallback. - This is because /dev/disk/by-id/ usually has a few alternative - identifications of devices (e.g. ATA vs. SATA). - check_device_readable_unique will ensure that we only get one for any - given disk, but sort the list so that the choice of which one we get is - stable. */ -static int -compare_devices (const void *a, const void *b) -{ - const struct device *left = (const struct device *) a; - const struct device *right = (const struct device *) b; - - if (left->kernel && right->kernel) - { - int ret = strcmp (left->kernel, right->kernel); - if (ret) - return ret; - } - - return strcmp (left->stable, right->stable); -} -#endif /* __linux__ */ - -void -grub_util_iterate_devices (int NESTED_FUNC_ATTR (*hook) (const char *, int), - int floppy_disks) -{ - int i; - - clear_seen_devices (); - - /* Floppies. */ - for (i = 0; i < floppy_disks; i++) - { - char name[16]; - struct stat st; - - get_floppy_disk_name (name, i); - if (stat (name, &st) < 0) - break; - /* In floppies, write the map, whether check_device_readable_unique - succeeds or not, because the user just may not insert floppies. */ - if (hook (name, 1)) - goto out; - } - -#ifdef __linux__ - { - DIR *dir = opendir ("/dev/disk/by-id"); - - if (dir) - { - struct dirent *entry; - struct device *devs; - size_t devs_len = 0, devs_max = 1024, i; - - devs = xmalloc (devs_max * sizeof (*devs)); - - /* Dump all the directory entries into names, resizing if - necessary. */ - for (entry = readdir (dir); entry; entry = readdir (dir)) - { - /* Skip current and parent directory entries. */ - if (strcmp (entry->d_name, ".") == 0 || - strcmp (entry->d_name, "..") == 0) - continue; - /* Skip partition entries. */ - if (strstr (entry->d_name, "-part")) - continue; - /* Skip device-mapper entries; we'll handle the ones we want - later. */ - if (strncmp (entry->d_name, "dm-", sizeof ("dm-") - 1) == 0) - continue; - /* Skip RAID entries; they are handled by upper layers. */ - if (strncmp (entry->d_name, "md-", sizeof ("md-") - 1) == 0) - continue; - if (devs_len >= devs_max) - { - devs_max *= 2; - devs = xrealloc (devs, devs_max * sizeof (*devs)); - } - devs[devs_len].stable = - xasprintf ("/dev/disk/by-id/%s", entry->d_name); - devs[devs_len].kernel = - canonicalize_file_name (devs[devs_len].stable); - devs_len++; - } - - qsort (devs, devs_len, sizeof (*devs), &compare_devices); - - closedir (dir); - - /* Now add all the devices in sorted order. */ - for (i = 0; i < devs_len; ++i) - { - if (check_device_readable_unique (devs[i].stable)) - { - if (hook (devs[i].stable, 0)) - goto out; - } - free (devs[i].stable); - free (devs[i].kernel); - } - free (devs); - } - } - - if (have_devfs ()) - { - i = 0; - while (1) - { - char discn[32]; - char name[PATH_MAX]; - struct stat st; - - /* Linux creates symlinks "/dev/discs/discN" for convenience. - The way to number disks is the same as GRUB's. */ - sprintf (discn, "/dev/discs/disc%d", i++); - if (stat (discn, &st) < 0) - break; - - if (realpath (discn, name)) - { - strcat (name, "/disc"); - if (hook (name, 0)) - goto out; - } - } - goto out; - } -#endif /* __linux__ */ - - /* IDE disks. */ - for (i = 0; i < 96; i++) - { - char name[16]; - - get_ide_disk_name (name, i); - if (check_device_readable_unique (name)) - { - if (hook (name, 0)) - goto out; - } - } - -#ifdef __FreeBSD_kernel__ - /* IDE disks using ATA Direct Access driver. */ - if (get_kfreebsd_version () >= 800000) - for (i = 0; i < 96; i++) - { - char name[16]; - - get_ada_disk_name (name, i); - if (check_device_readable_unique (name)) - { - if (hook (name, 0)) - goto out; - } - } - - /* ATARAID disks. */ - for (i = 0; i < 8; i++) - { - char name[20]; - - get_ataraid_disk_name (name, i); - if (check_device_readable_unique (name)) - { - if (hook (name, 0)) - goto out; - } - } - - /* LSI MegaRAID SAS. */ - for (i = 0; i < 32; i++) - { - char name[20]; - - get_mfi_disk_name (name, i); - if (check_device_readable_unique (name)) - { - if (hook (name, 0)) - goto out; - } - } -#endif - -#ifdef __linux__ - /* Virtio disks. */ - for (i = 0; i < 26; i++) - { - char name[16]; - - get_virtio_disk_name (name, i); - if (check_device_readable_unique (name)) - { - if (hook (name, 0)) - goto out; - } - } - - /* ATARAID disks. */ - for (i = 0; i < 8; i++) - { - char name[20]; - - get_ataraid_disk_name (name, i); - if (check_device_readable_unique (name)) - { - if (hook (name, 0)) - goto out; - } - } - - /* Xen virtual block devices. */ - for (i = 0; i < 26; i++) - { - char name[16]; - - get_xvd_disk_name (name, i); - if (check_device_readable_unique (name)) - { - if (hook (name, 0)) - goto out; - } - } -#endif /* __linux__ */ - - /* The rest is SCSI disks. */ - for (i = 0; i < 48; i++) - { - char name[16]; - - get_scsi_disk_name (name, i); - if (check_device_readable_unique (name)) - { - if (hook (name, 0)) - goto out; - } - } - -#ifdef __linux__ - /* This is for DAC960 - we have - /dev/rd/cdp. - - DAC960 driver currently supports up to 8 controllers, 32 logical - drives, and 7 partitions. */ - { - int controller, drive; - - for (controller = 0; controller < 8; controller++) - { - for (drive = 0; drive < 15; drive++) - { - char name[24]; - - get_dac960_disk_name (name, controller, drive); - if (check_device_readable_unique (name)) - { - if (hook (name, 0)) - goto out; - } - } - } - } - - /* This is for Mylex Acceleraid - we have - /dev/rd/cdp. */ - { - int controller, drive; - - for (controller = 0; controller < 8; controller++) - { - for (drive = 0; drive < 15; drive++) - { - char name[24]; - - get_acceleraid_disk_name (name, controller, drive); - if (check_device_readable_unique (name)) - { - if (hook (name, 0)) - goto out; - } - } - } - } - - /* This is for CCISS - we have - /dev/cciss/cdp. */ - { - int controller, drive; - - for (controller = 0; controller < 3; controller++) - { - for (drive = 0; drive < 16; drive++) - { - char name[24]; - - get_cciss_disk_name (name, controller, drive); - if (check_device_readable_unique (name)) - { - if (hook (name, 0)) - goto out; - } - } - } - } - - /* This is for Compaq Intelligent Drive Array - we have - /dev/ida/cdp. */ - { - int controller, drive; - - for (controller = 0; controller < 3; controller++) - { - for (drive = 0; drive < 16; drive++) - { - char name[24]; - - get_ida_disk_name (name, controller, drive); - if (check_device_readable_unique (name)) - { - if (hook (name, 0)) - goto out; - } - } - } - } - - /* This is for I2O - we have /dev/i2o/hd */ - { - char unit; - - for (unit = 'a'; unit < 'f'; unit++) - { - char name[24]; - - get_i2o_disk_name (name, unit); - if (check_device_readable_unique (name)) - { - if (hook (name, 0)) - goto out; - } - } - } - - /* MultiMediaCard (MMC). */ - for (i = 0; i < 10; i++) - { - char name[16]; - - get_mmc_disk_name (name, i); - if (check_device_readable_unique (name)) - { - if (hook (name, 0)) - goto out; - } - } - -# ifdef HAVE_DEVICE_MAPPER -# define dmraid_check(cond, ...) \ - if (! (cond)) \ - { \ - grub_dprintf ("deviceiter", __VA_ARGS__); \ - goto dmraid_end; \ - } - - /* DM-RAID. */ - if (grub_device_mapper_supported ()) - { - struct dm_tree *tree = NULL; - struct dm_task *task = NULL; - struct dm_names *names = NULL; - unsigned int next = 0; - void *top_handle, *second_handle; - struct dm_tree_node *root, *top, *second; - - /* Build DM tree for all devices. */ - tree = dm_tree_create (); - dmraid_check (tree, "dm_tree_create failed\n"); - task = dm_task_create (DM_DEVICE_LIST); - dmraid_check (task, "dm_task_create failed\n"); - dmraid_check (dm_task_run (task), "dm_task_run failed\n"); - names = dm_task_get_names (task); - dmraid_check (names, "dm_task_get_names failed\n"); - dmraid_check (names->dev, "No DM devices found\n"); - do - { - names = (void *) names + next; - dmraid_check (dm_tree_add_dev (tree, MAJOR (names->dev), - MINOR (names->dev)), - "dm_tree_add_dev (%s) failed\n", names->name); - next = names->next; - } - while (next); - - /* Walk the second-level children of the inverted tree; that is, devices - which are directly composed of non-DM devices such as hard disks. - This class includes all DM-RAID disks and excludes all DM-RAID - partitions. */ - root = dm_tree_find_node (tree, 0, 0); - top_handle = NULL; - top = dm_tree_next_child (&top_handle, root, 1); - while (top) - { - second_handle = NULL; - second = dm_tree_next_child (&second_handle, top, 1); - while (second) - { - const char *node_name, *node_uuid; - char *name; - - node_name = dm_tree_node_get_name (second); - dmraid_check (node_name, "dm_tree_node_get_name failed\n"); - node_uuid = dm_tree_node_get_uuid (second); - dmraid_check (node_uuid, "dm_tree_node_get_uuid failed\n"); - if (strncmp (node_uuid, "DMRAID-", 7) != 0) - { - grub_dprintf ("deviceiter", "%s is not DM-RAID\n", node_name); - goto dmraid_next_child; - } - - name = xasprintf ("/dev/mapper/%s", node_name); - if (check_device_readable_unique (name)) - { - if (hook (name, 0)) - { - free (name); - if (task) - dm_task_destroy (task); - if (tree) - dm_tree_free (tree); - goto out; - } - } - free (name); - -dmraid_next_child: - second = dm_tree_next_child (&second_handle, top, 1); - } - top = dm_tree_next_child (&top_handle, root, 1); - } - -dmraid_end: - if (task) - dm_task_destroy (task); - if (tree) - dm_tree_free (tree); - } -# endif /* HAVE_DEVICE_MAPPER */ -#endif /* __linux__ */ - -out: - clear_seen_devices (); -} - diff --git a/util/getroot.c b/util/getroot.c index a11afd079..120980b90 100644 --- a/util/getroot.c +++ b/util/getroot.c @@ -1906,6 +1906,23 @@ device_is_wholedisk (const char *os_dev) } #endif /* defined(__FreeBSD__) || defined(__FreeBSD_kernel__) */ +char * +grub_util_get_os_disk (const char *os_dev) +{ + struct stat st; + + grub_util_info ("Looking for %s", os_dev); + + if (stat (os_dev, &st) < 0) + { + grub_error (GRUB_ERR_BAD_DEVICE, "cannot stat `%s'", os_dev); + grub_util_info ("cannot stat `%s'", os_dev); + return 0; + } + + return convert_system_partition_to_system_disk (os_dev, &st); +} + char * grub_util_biosdisk_get_grub_dev (const char *os_dev) { diff --git a/util/grub-install.in b/util/grub-install.in index 2cec0c4ca..2c05ed70d 100644 --- a/util/grub-install.in +++ b/util/grub-install.in @@ -40,7 +40,6 @@ self="`basename $0`" grub_setup="${sbindir}/`echo grub-setup | sed ${transform}`" grub_mkimage="${bindir}/`echo grub-mkimage | sed ${transform}`" -grub_mkdevicemap="${sbindir}/`echo grub-mkdevicemap | sed ${transform}`" grub_probe="${sbindir}/`echo grub-probe | sed ${transform}`" grub_editenv="${bindir}/`echo grub-editenv | sed ${transform}`" grub_mkrelpath="${bindir}/`echo grub-mkrelpath | sed ${transform}`" @@ -101,7 +100,6 @@ usage () { printf " --grub-setup=%-11s%s\n" "$(gettext "FILE")" "$(gettext "use FILE as grub-setup")" printf " --grub-mkimage=%-9s%s\n" "$(gettext "FILE")" "$(gettext "use FILE as grub-mkimage")" printf " --grub-mkrelpath=%-7s%s\n" "$(gettext "FILE")" "$(gettext "use FILE as grub-mkrelpath")" - printf " --grub-mkdevicemap=%-5s%s\n" "$(gettext "FILE")" "$(gettext "use FILE as grub-mkdevicemap")" printf " --grub-probe=%-11s%s\n" "$(gettext "FILE")" "$(gettext "use FILE as grub-probe")" printf " --no-floppy %s\n" "$(gettext "do not probe any floppy drive")" printf " --allow-floppy %s\n" "$(gettext "Make the drive also bootable as floppy (default for fdX devices). May break on some BIOSes.")" @@ -197,10 +195,11 @@ do --grub-mkrelpath=*) grub_mkrelpath="`echo "$option" | sed 's/--grub-mkrelpath=//'`" ;; + # Ignore: for compatibility --grub-mkdevicemap) - grub_mkdevicemap="`argument "$option" "$@"`"; shift;; + shift;; --grub-mkdevicemap=*) - grub_mkdevicemap="`echo "$option" | sed 's/--grub-mkdevicemap=//'`" ;; + ;; --grub-probe) grub_probe="`argument "$option" "$@"`"; shift;; @@ -310,35 +309,27 @@ else exit 1 fi -set "$grub_mkdevicemap" dummy -if test -f "$1"; then - : -else - echo "$1: Not found." 1>&2 - exit 1 -fi - if [ x"$platform" = xefi ]; then # Find the EFI System Partition. efidir= if test -d "${bootdir}/efi"; then - install_device="`"$grub_mkdevicemap" --device-map=/dev/stdout | "$grub_probe" --target=device --device-map=/dev/stdin "${bootdir}/efi"`" + install_device="`"$grub_probe" --target=device --device-map= "${bootdir}/efi"`" # Is it a mount point? - if test "x$install_device" != "x`"$grub_mkdevicemap" --device-map=/dev/stdout | "$grub_probe" --target=device --device-map=/dev/stdin "${bootdir}"`"; then + if test "x$install_device" != "x`"$grub_probe" --target=device --device-map= "${bootdir}"`"; then efidir="${bootdir}/efi" fi elif test -d "${bootdir}/EFI"; then - install_device="`"$grub_mkdevicemap" --device-map=/dev/stdout | "$grub_probe" --target=device --device-map=/dev/stdin "${bootdir}/EFI"`" + install_device="`"$grub_probe" --target=device --device-map= "${bootdir}/EFI"`" # Is it a mount point? - if test "x$install_device" != "x`"$grub_mkdevicemap" --device-map=/dev/stdout | "$grub_probe" --target=device --device-map=/dev/stdin "${bootdir}"`"; then + if test "x$install_device" != "x`"$grub_probe" --target=device --device-map= "${bootdir}"`"; then efidir="${bootdir}/EFI" fi elif test -n "$rootdir" && test "x$rootdir" != "x/"; then # The EFI System Partition may have been given directly using # --root-directory. - install_device="`"$grub_mkdevicemap" --device-map=/dev/stdout | "$grub_probe" --target=device --device-map=/dev/stdin "${rootdir}"`" + install_device="`"$grub_probe" --target=device --device-map= "${rootdir}"`" # Is it a mount point? - if test "x$install_device" != "x`"$grub_mkdevicemap" --device-map=/dev/stdout | "$grub_probe" --target=device --device-map=/dev/stdin "${rootdir}/.."`"; then + if test "x$install_device" != "x`"$grub_probe" --target=device --device-map= "${rootdir}/.."`"; then efidir="${rootdir}" fi fi @@ -705,12 +696,11 @@ elif [ x"$platform" = xefi ]; then # fiddle about with grub-probe to get hold of this reasonably reliably. # Use fresh device map text to avoid any problems with stale data, since # all we need here is a one-to-one mapping. - clean_devmap="$($grub_mkdevicemap --device-map=/dev/stdout)" - efidir_drive="$(echo "$clean_devmap" | "$grub_probe" --device-map="${device_map}" --target=drive --device-map=/dev/stdin "$efidir")" - if test -z "$efidir_drive"; then + efidir_drive="$("$grub_probe" --target=drive --device-map= "$efidir")" + efidir_disk="$("$grub_probe" --target=disk --device-map= "$efidir")" + if test -z "$efidir_drive" || test -z "$efidir_disk"; then echo "Can't find GRUB drive for $efidir; unable to create EFI Boot Manager entry." >&2 else - efidir_disk="$(echo "$clean_devmap" | grep "^$(echo "$efidir_drive" | sed 's/,[^)]*//')" | cut -f2)" efidir_part="$(echo "$efidir_drive" | sed 's/^([^,]*,[^0-9]*//; s/[^0-9].*//')" efibootmgr $efi_quiet -c -d "$efidir_disk" -p "$efidir_part" -w \ -L "$bootloader_id" -l "\\EFI\\$efi_distributor\\$efi_file" diff --git a/util/grub-mkdevicemap.c b/util/grub-mkdevicemap.c deleted file mode 100644 index bdf8ef1c6..000000000 --- a/util/grub-mkdevicemap.c +++ /dev/null @@ -1,171 +0,0 @@ -/* grub-mkdevicemap.c - make a device map file automatically */ -/* - * GRUB -- GRand Unified Bootloader - * Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2007,2008,2009,2010 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 . - */ - -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -#define _GNU_SOURCE 1 -#include - -#include "progname.h" - -static void -make_device_map (const char *device_map, int floppy_disks) -{ - int num_hd = 0; - int num_fd = 0; - FILE *fp; - - auto int NESTED_FUNC_ATTR process_device (const char *name, int is_floppy); - - int NESTED_FUNC_ATTR process_device (const char *name, int is_floppy) - { - grub_util_emit_devicemap_entry (fp, (char *) name, - is_floppy, &num_fd, &num_hd); - return 0; - } - - if (strcmp (device_map, "-") == 0) - fp = stdout; - else - fp = fopen (device_map, "w"); - - if (! fp) - grub_util_error (_("cannot open %s"), device_map); - - grub_util_iterate_devices (process_device, floppy_disks); - - if (fp != stdout) - fclose (fp); -} - -static struct option options[] = - { - {"device-map", required_argument, 0, 'm'}, - {"probe-second-floppy", no_argument, 0, 's'}, - {"no-floppy", no_argument, 0, 'n'}, - {"help", no_argument, 0, 'h'}, - {"version", no_argument, 0, 'V'}, - {"verbose", no_argument, 0, 'v'}, - {0, 0, 0, 0} - }; - -static void -usage (int status) -{ - if (status) - fprintf (stderr, - _("Try `%s --help' for more information.\n"), program_name); - else - printf (_("\ -Usage: %s [OPTION]...\n\ -\n\ -Generate a device map file automatically.\n\ -\n\ - -n, --no-floppy do not probe any floppy drive\n\ - -s, --probe-second-floppy probe the second floppy drive\n\ - -m, --device-map=FILE use FILE as the device map [default=%s]\n\ - -h, --help display this message and exit\n\ - -V, --version print version information and exit\n\ - -v, --verbose print verbose messages\n\ -\n\ -Report bugs to <%s>.\n\ -"), program_name, - DEFAULT_DEVICE_MAP, PACKAGE_BUGREPORT); - - exit (status); -} - -int -main (int argc, char *argv[]) -{ - char *dev_map = 0; - int floppy_disks = 1; - - set_program_name (argv[0]); - - grub_util_init_nls (); - - /* Check for options. */ - while (1) - { - int c = getopt_long (argc, argv, "snm:r:hVv", options, 0); - - if (c == -1) - break; - else - switch (c) - { - case 'm': - if (dev_map) - free (dev_map); - - dev_map = xstrdup (optarg); - break; - - case 'n': - floppy_disks = 0; - break; - - case 's': - floppy_disks = 2; - break; - - case 'h': - usage (0); - break; - - case 'V': - printf ("%s (%s) %s\n", program_name, PACKAGE_NAME, PACKAGE_VERSION); - return 0; - - case 'v': - verbosity++; - break; - - default: - usage (1); - break; - } - } - - if (verbosity > 1) - grub_env_set ("debug", "all"); - - make_device_map (dev_map ? : DEFAULT_DEVICE_MAP, floppy_disks); - - free (dev_map); - - return 0; -} diff --git a/util/grub-probe.c b/util/grub-probe.c index a99f5258d..2a987b58b 100644 --- a/util/grub-probe.c +++ b/util/grub-probe.c @@ -66,7 +66,8 @@ enum { PRINT_EFI_HINT, PRINT_ARC_HINT, PRINT_COMPATIBILITY_HINT, - PRINT_MSDOS_PARTTYPE + PRINT_MSDOS_PARTTYPE, + PRINT_DISK }; static int print = PRINT_FS; @@ -343,6 +344,23 @@ probe (const char *path, char **device_names, char delim) return; } + if (print == PRINT_DISK) + { + for (curdev = device_names; *curdev; curdev++) + { + char *disk; + disk = grub_util_get_os_disk (*curdev); + if (!disk) + { + grub_print_error (); + continue; + } + printf ("%s", disk); + putchar (delim); + } + return; + } + for (curdev = device_names; *curdev; curdev++) { grub_util_pull_device (*curdev); @@ -753,6 +771,8 @@ argp_parser (int key, char *arg, struct argp_state *state) print = PRINT_ARC_HINT; else if (!strcmp (arg, "compatibility_hint")) print = PRINT_COMPATIBILITY_HINT; + else if (!strcmp (arg, "disk")) + print = PRINT_DISK; else argp_usage (state); break;