[patch] Patch to fix missing /dev/root

grub-0.97-fix-dev-root.patch (text/plain), 1.77 KB, created by Richard Yao (RETIRED) on 2013-01-31 21:35:11 UTC

diff --git a/util/grub-install.in b/util/grub-install.in
index b588bbe..bceecfa 100644
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -214,23 +214,6 @@ resolve_symlink () {
 	echo "$tmp_fname"
 }
 
-# Usage: find_device file
-# Find block device on which the file resides.
-find_device () {
-    # For now, this uses the program `df' to get the device name, but is
-    # this really portable?
-    tmp_fname=`df $1/ | sed -n 's%.*\(/dev/[^ 	]*\).*%\1%p'`
-
-    if test -z "$tmp_fname"; then
-	echo "Could not find device for $1" 2>&1
-	exit 1
-    fi
-
-	tmp_fname=`resolve_symlink $tmp_fname`
-
-    echo "$tmp_fname"
-}
-
 # Check the arguments.
 for option in "$@"; do
     case "$option" in
@@ -383,36 +366,6 @@ case "$install_device" in
     exit 1 ;;
 esac
 
-# Get the root drive.
-root_device=`find_device ${rootdir}`
-bootdir_device=`find_device ${bootdir}`
-
-# Check if the boot directory is in the same device as the root directory.
-if test "x$root_device" != "x$bootdir_device"; then
-    # Perhaps the user has a separate boot partition.
-    root_device=$bootdir_device
-    grub_prefix="/grub"
-fi
-
-# Convert the root device to a GRUB drive.
-root_drive=`convert "$root_device"`
-if test "x$root_drive" = x; then
-    exit 1
-fi
-
-# Check if the root directory exists in the same device as the grub
-# directory.
-grubdir_device=`find_device ${grubdir}`
-
-if test "x$grubdir_device" != "x$root_device"; then
-    # For now, cannot deal with this situation.
-    cat <<EOF 1>&2
-You must set the root directory by the option --root-directory, because
-$grubdir does not exist in the root device $root_device.
-EOF
-    exit 1
-fi
-
 # Copy the GRUB images to the GRUB directory.
 for file in ${grubdir}/stage1 ${grubdir}/stage2 ${grubdir}/*stage1_5; do
     rm -f $file || exit 1