Fix for bug http://bugzilla.vyatta.com/show_bug.cgi?id=3712

3 files changed, 3 insertions, 258 deletions

diff --git a/Makefile.am b/Makefile.am
index 27152ff0..9e66286c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,7 +15,7 @@ bin_SCRIPTS += scripts/vyatta-functions
 sbin_SCRIPTS += scripts/init-floppy
 sbin_SCRIPTS += scripts/rl-system.init
 sbin_SCRIPTS += scripts/install-system
-sbin_SCRIPTS += scripts/grub-setup
+sbin_SCRIPTS += scripts/vyatta-grub-setup
 sbin_SCRIPTS += scripts/quick-install
 sbin_SCRIPTS += scripts/standalone_root_pw_reset
 sbin_SCRIPTS += scripts/vyatta-passwd-sync
diff --git a/scripts/grub-setup b/scripts/grub-setup
deleted file mode 100755
index 1bf47dde..00000000
--- a/scripts/grub-setup
+++ /dev/null
@@ -1,255 +0,0 @@
-#!/bin/sh
-#
-# Module: grup-setup
-# 
-# **** License ****
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program 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.
-#
-# This code was originally developed by Vyatta, Inc.
-# Portions created by Vyatta are Copyright (C) 2006, 2007 Vyatta, Inc.
-# All Rights Reserved.
-# 
-# Author: Robert Bays
-# Date: 2006
-# Description:
-# 
-# **** End License ****
-#
-# Vyatta grub customization setup script.
-#
-#
-
-UNION="false"
-while getopts u: c
-do
-  case $c in
-    u)       UNION=true;
-             livedir=$OPTARG;;
-  esac
-done
-shift `expr $OPTIND - 1`
-
-ROOT_PARTITION="$1"
-GRUB_OPTIONS="$2"
-ROOTFSDIR="$3"
-
-[ "$ROOT_PARTITION" ] || exit 1 
-
-# Grub options
-if [ "$GRUB_OPTIONS" ]
-then
-	GRUB_OPTIONS="$GRUB_OPTIONS quiet"
-else
-	GRUB_OPTIONS=quiet
-fi
-
-# Path to standalone root password reset script
-pass_reset=/opt/vyatta/sbin/standalone_root_pw_reset
-
-# Output to both console (last device is /dev/console)
-vty_console="console=ttyS0,9600 console=tty0"
-serial_console="console=tty0 console=ttyS0,9600"
-
-# If vga_logo is set, enable use of the VGA monitor for displaying the
-# logo during boot.  The "vga=" boot command specifies a VGA mode that
-# is encoded as shown below.  We pick a value that is likely to work
-# on most systems:
-#
-# Color depth      | 640x480 | 800x600 | 1024x768 | 1280x1024
-# -----------------+---------+---------+----------+----------
-# 256 (8bit)       |   769       771       773        775
-# 32000 (15bit)    |   784       787       790        793
-# 65000 (16bit)    |   785       788       791        794
-# 16.7 Mill.(24bit)|   786       789       792        795
-#
-vga_logo="vga=785"
-
-# get list of kernels, except Xen
-kernel_versions=$(ls $ROOTFSDIR/boot/vmlinuz-* 2> /dev/null | grep -v xen | awk -F/ '{ print $5 }' | sed 's/vmlinuz//g' | sort -r)
-
-# get xen kernel info
-xen_kernel_version=$(ls $ROOTFSDIR/boot/vmlinuz*xen 2> /dev/null | awk -F/ '{ print $5 }' | sed 's/vmlinuz//g' | sort -r)
-xen_version=$(ls $ROOTFSDIR/boot/xen-* 2> /dev/null | awk -F/ '{ print $5 }' | sort -r)
-
-# Figure out whether we are running on the serial or KVM console:
-if [ "`tty`" == "/dev/ttyS0" ]; then
-      # Since user is running on serial console, make that the default.
-      default_console=1
-else
-      # Since user is running on KVM console, make that the default
-      default_console=0
-fi
-
-if eval "$UNION"; then
-    GRUB_OPTIONS="boot=live live-media-path=/boot/$livedir module=$livedir quiet persistent noautologin nonetworking nouser hostname=vyatta"
-    union_kernel_versions=$(ls $ROOTFSDIR/boot/$livedir/vmlinuz-* 2> /dev/null | grep -v xen | awk -F/ '{ print $6 }' | sed 's/vmlinuz//g' | sort -r)
-else 
-    # Read UUID off of filesystem and use it to tell GRUB where to mount drive
-    # This allows device to move around and grub will still find it
-    uuid=$(dumpe2fs -h /dev/${ROOT_PARTITION} 2>/dev/null | awk '/^Filesystem UUID/ {print $3}')
-    if [ -z "$uuid" ]
-    then
-	# TODO: use /proc/mount if dumpe2fs fails
-        echo "Unable to read filesystem UUID.  Exiting."
-        exit 1
-    else
-        GRUB_OPTIONS="$GRUB_OPTIONS root=UUID=$uuid ro"
-    fi
-fi
-
-# Check for diagnostic partition residing in first partition of drive 
-# holding the root partition.
-
-diag_drive_number=""
-
-if [ ${ROOT_PARTITION:0:2} = "md" ]; then
-    # Select the first disk in the RAID group to look for diag partition on
-    root_disks=`echo /sys/block/$ROOT_PARTITION/slaves/*`
-    root_disk=`echo ${root_disks} | awk '{ print $1 }'`
-    root_disk=${root_disk##*/}
-    root_disk=${root_disk:0:${#root_disk}-1}
-else
-    # Shave off the partition number to get the disk name
-    root_disk=${ROOT_PARTITION:0:${#ROOT_PARTITION}-1}
-fi
-
-# If the root partition is not occupying the first partition, then we
-# can look for a diag partition there.
-if [ "$ROOT_PARTITION" != "${root_disk}1" ]; then
-    first_part_fstype=`fdisk -l /dev/$root_disk | grep ^/dev/${root_disk}1 | awk '{ print $6 }'`
-
-    if [ "$first_part_fstype" = "FAT16" -o "$first_part_fstype" = "Dell" ]; then
-        # Translate the Linux drive letter (e.g. the "a" in "/dev/sda") into
-        # a drive number that grub uses. i.e. "a" = 0, "b" = 1, etc.
-	diag_drive_letter=${root_disk:2:1}
-	diag_drive_number=`echo $diag_drive_letter | od -t u1 -N 1 | awk '{ print $2 }'`
-	let diag_drive_number-=97
-    fi
-fi
-
-(
-    # create the grub.cfg file for grub
-    # The "default=" line selects which boot option will be used by default.
-    # Numbering starts at 0 for the first option.
-    echo -e "set default=$default_console"
-    echo "set timeout=5"
-    # set serial console options
-    echo -e "serial --unit=0 --speed=9600"
-    echo "terminal serial"
-
-    if [ ${ROOT_PARTITION:0:2} = "md" ]; then
-	echo ""
-	echo -e "insmod raid"
-	echo -e "root ($ROOT_PARTITION)"
-    fi
-
-    echo ""
-    echo "echo -n Press ESC to enter the Grub menu..."
-    echo "if sleep --verbose --interruptible 5 ; then"
-    echo -e "\tterminal console"
-    echo -e "\techo -n Press the ESC key to enter the Grub menu..."
-    echo -e "\tif sleep --verbose --interruptible 5 ; then"
-    echo -e "\t\tterminal serial"
-    ## don't set timeout here. causes boot problem on 64-bit
-    # echo -e "\t\tset timeout=0"
-    echo -e "\tfi"
-    echo "fi"
-    echo ""
-
-    # create xen kernels if they exist
-    if [ -n "$xen_kernel_version" ]; then
-       for xversion in $xen_kernel_version; do
-          echo
-          echo
-          echo -e "menuentry \"Vyatta Xen linux$xversion dom0\" {"
-          echo -e "\tmultiboot /boot/$xen_version "
-          echo -e "\tmodule /boot/vmlinuz$xversion $GRUB_OPTIONS $vga_logo $vty_console"
-          echo -e  "\tmodule /boot/initrd.img$xversion"
-          echo -e "}"
-       done
-    fi
-
-    if [ -f "$ROOTFSDIR/boot/vmlinuz" ] && ! eval $UNION ; then
-       # Set first system boot option.  Make KVM the default console in this one.
-       echo -e "menuentry \"Vyatta OFR (KVM console)\" {"
-       echo -e "\tlinux /boot/vmlinuz $GRUB_OPTIONS $vga_logo $vty_console"
-       echo -e  "\tinitrd /boot/initrd.img"
-       echo -e "}"
-  
-       # Set the second system boot option.  Make the serial port be the default
-       # console in this one.
-       echo
-       echo -e "menuentry \"Vyatta OFR (Serial console)\" {"
-       echo -e "\tlinux /boot/vmlinuz $GRUB_OPTIONS $serial_console"
-       echo -e  "\tinitrd /boot/initrd.img"
-       echo -e "}"
-    fi
-  
-    # create union kernels if they exist
-    if [ -n "$union_kernel_versions" ]; then
-       for kversion in $union_kernel_versions; do
-          echo
-          echo -e "menuentry \"Vyatta OFR linux$kversion (KVM console)\" {"
-          echo -e "\tlinux /boot/$livedir/vmlinuz$kversion $GRUB_OPTIONS $vga_logo $vty_console"
-          echo -e  "\tinitrd /boot/$livedir/initrd.img$kversion"
-          echo -e "}"
-          echo
-          echo -e "menuentry \"Vyatta OFR linux$kversion (Serial console)\" {"
-          echo -e "\tlinux /boot/$livedir/vmlinuz$kversion $GRUB_OPTIONS $serial_console"
-          echo -e  "\tinitrd /boot/$livedir/initrd.img$kversion"
-          echo -e "}"
-       done
-    fi
-
-    # create other kernels if they exist
-    if [ -n "$kernel_versions" ]; then
-       for kversion in $kernel_versions; do
-          echo
-          echo -e "menuentry \"Vyatta OFR linux$kversion (KVM console)\" {"
-          echo -e "\tlinux /boot/vmlinuz$kversion $GRUB_OPTIONS $vga_logo $vty_console"
-          echo -e  "\tinitrd /boot/initrd.img$kversion"
-          echo -e "}"
-          echo
-          echo -e "menuentry \"Vyatta OFR linux$kversion (Serial console)\" {"
-          echo -e "\tlinux /boot/vmlinuz$kversion $GRUB_OPTIONS $serial_console"
-          echo -e  "\tinitrd /boot/initrd.img$kversion"
-          echo -e "}"
-       done
-    fi
-
-    # Set options for root password reset.  Offer 
-    # options for both serial and KVM console.
-  
-    echo
-    echo -e "menuentry \"Root password reset to factory (KVM console)\" {"
-    echo -e "\tlinux /boot/vmlinuz $GRUB_OPTIONS $vga_logo $vty_console init=$pass_reset"
-    echo -e "\tinitrd /boot/initrd.img"
-    echo -e "}"
-  
-    echo
-    echo -e "menuentry \"Root password reset to factory (Serial console)\" {"
-    echo -e "\tlinux /boot/vmlinuz $GRUB_OPTIONS $serial_console init=$pass_reset"
-    echo -e "\tinitrd /boot/initrd.img"
-    echo -e "}"
-
-    if [ -n "$diag_drive_number" ]; then
-	echo 
-	echo -e "menuentry \"Diagnostics\" {"
-	echo -e "\tchainloader (hd$diag_drive_number,1)+1"
-	echo -e "}"
-    fi
-    
-
-) >"$ROOTFSDIR"/boot/grub/grub.cfg
-
-(   [ -s /boot/grub/menu.lst ] &&
-	upgrade-from-grub-legacy &&
-	rm -f /boot/grub/menu.lst*
-) || true
diff --git a/scripts/install-system b/scripts/install-system
index 7229cfda..15a4285e 100644
--- a/scripts/install-system
+++ b/scripts/install-system
@@ -897,12 +897,12 @@ install_grub () {
       fi
   fi
 
-  # if union install tell grub-setup
+  # if union install tell vyatta-grub-setup
   if eval "$UNION"; then
     version=$(egrep -i version /opt/vyatta/etc/version | awk '{ print $3 }')
     grub_args="-u $version"
   fi
-  if /opt/vyatta/sbin/grub-setup $grub_args "$ROOT_PARTITION" "$grub_options" /mnt/rootfs >>$INSTALL_LOG
+  if /opt/vyatta/sbin/vyatta-grub-setup $grub_args "$ROOT_PARTITION" "$grub_options" /mnt/rootfs >>$INSTALL_LOG
   then
     echo "OK"
   else