From: Serge L. <sma...@us...> - 2009-08-21 18:21:54
|
Update of /cvsroot/devil-linux/build/scripts/scripts In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3494 Modified Files: install-on-usb Log Message: - workaround for grub segmentation fault. bug #16 Index: install-on-usb =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/scripts/install-on-usb,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- install-on-usb 30 Jun 2009 04:03:50 -0000 1.32 +++ install-on-usb 21 Aug 2009 18:19:12 -0000 1.33 @@ -119,7 +119,16 @@ install_grub () { echo "Configuring Grub boot sector and menu..." - grub_shell=$TMPDIR/iso-mnt/sbin/grub + if [ -f "/DEVIL-LINUX" ]; then # we are in DL + grub_shell=$TMPDIR/iso-mnt/sbin/grub + else + grub_shell=$(which grub) + if $grub_shell --version | grep "GNU GRUB 0.9" > /dev/null 2>&1 ; then + echo "Using $grub_shell binary..." + else + echo "Probably unsupported Grub version. If the installation breaks, load DL as Live-CD and repeat installation" + fi + fi device_map=grub-tmp-map force_lba="" if [ "$INITRD_TYPE" != "INITRAMFS" ]; then |