vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2007-05-16 Jeroen Dekkers <jeroen@dekkers.cx>

Browse source 
* util/getroot.c (grub_guess_root_device): Remove RAID and LVM
	code, first search for device in /dev/mapper, then in /dev.
	(grub_util_get_grub_dev): New function.
	* include/grub/util/getroot.h (grub_util_get_grub_dev): Add
	prototype.
	* util/grub-probe.c (probe): Remove check for RAID, call
	grub_util_get_grub_dev() instead of
	grub_util_biosdisk_get_grub_dev().
	* util/grub-emu.c (main): Call grub_util_get_grub_dev() instead of
	grub_util_biosdisk_get_grub_dev().
	* util/i386/pc/grub-setup.c (main): Likewise.
This commit is contained in:
jeroen 2007-05-16 21:38:44 +00:00
parent 8fff7c2f2a
commit 849d55d3d1
6 changed files with 51 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

36
util/getroot.c
View file

@ -1,7 +1,7 @@
/* getroot.c - Get root device */
/*
* GRUB -- GRand Unified Bootloader
* Copyright (C) 1999,2000,2001,2002,2003,2006 Free Software Foundation, Inc.
* Copyright (C) 1999,2000,2001,2002,2003,2006,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
@ -225,32 +225,46 @@ grub_guess_root_device (const char *dir)
if (stat (dir, &st) < 0)
grub_util_error ("Cannot stat `%s'", dir);
/* This might be truly slow, but is there any better way? */
os_dev = find_root_device ("/dev", st.st_dev);
if (! os_dev)
return 0;
#ifdef __linux__
/* We first try to find the device in the /dev/mapper directory. If
we don't do this, we get useless device names like /dev/dm-0 for
LVM. */
os_dev = find_root_device ("/dev/mapper", st.st_dev);
if (!os_dev)
#endif __linux_
{
/* This might be truly slow, but is there any better way? */
os_dev = find_root_device ("/dev", st.st_dev);
}
return os_dev;
}
char *
grub_util_get_grub_dev (const char *os_dev)
{
/* Check for LVM. */
if (!strncmp (os_dev, "/dev/mapper/", 12))
{
char *grub_dev = xmalloc (strlen (os_dev) - 12);
char *grub_dev = xmalloc (strlen (os_dev) - 12 + 1);
strcpy (grub_dev, os_dev+12);
return grub_dev;
}
/* Check for RAID. */
if (!strncmp (os_dev, "/dev/md", 7))
{
char *p, *grub_dev = xmalloc (8);
p = strchr (os_dev, 'm');
strncpy (grub_dev, p, 8);
memcpy (grub_dev, p, 7);
grub_dev[7] = '\0';
return grub_dev;
}
#endif
return os_dev;
/* If it's not RAID or LVM, it should be a biosdisk. */
return grub_util_biosdisk_get_grub_dev (os_dev);
}