Subversion Repositories livecd

Rev

Rev 220 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 220 Rev 225
Line 516... Line 516...
516
    if [ $FLOPPY ]; then
516
    if [ $FLOPPY ]; then
517
        grub-install --root-directory=$NEW $MBR_DEV 2>/dev/null || GRUB_FAILED="yes"
517
        grub-install --root-directory=$NEW $MBR_DEV 2>/dev/null || GRUB_FAILED="yes"
518
    else
518
    else
519
        grub-install --no-floppy --root-directory=$NEW $MBR_DEV 2>/dev/null || GRUB_FAILED="yes"
519
        grub-install --no-floppy --root-directory=$NEW $MBR_DEV 2>/dev/null || GRUB_FAILED="yes"
520
    fi
520
    fi
-
 
521
    if [ $GRUB_FAILED ]; then
-
 
522
	echo "grub installation failed. grub-install will run again at the end."
-
 
523
    else
521
    echo "done."; echo
524
	echo "done."
522
 
525
    fi
-
 
526
    echo
523
 
527
 
524
    ### check for device.map file 
528
    ### check for device.map file 
525
    ### -----------------------------------------------------------
529
    ### -----------------------------------------------------------
526
    DEVICE_MAP=$NEW/boot/grub/device.map
530
    DEVICE_MAP=$NEW/boot/grub/device.map
527
    if [ ! -e $NEW/boot/grub/device.map ]; then
531
    if [ ! -e $NEW/boot/grub/device.map ]; then
Line 812... Line 816...
812
    fi
816
    fi
813
fi
817
fi
814
 
818
 
815
 
819
 
816
### install grub for the 2. time, if it failed before 
820
### install grub for the 2. time, if it failed before 
817
### (happens on xfs filesystem)
821
### (happens on xfs filesystem), to be sure run it twice.
818
### -----------------------------------------------------------
822
### -----------------------------------------------------------
819
if [ ! $NOGRUB ] && [ $GRUB_FAILED ]; then
823
if [ ! $NOGRUB ] && [ $GRUB_FAILED ]; then
820
 
824
 
821
    echo "Run grub-install for the 2. time ... "
825
    echo "Run grub-install once more ... "
822
    mkdir -p $NEW/boot/grub
826
    mkdir -p $NEW/boot/grub
823
    if [ $FLOPPY ]; then
827
    if [ $FLOPPY ]; then
-
 
828
        grub-install --root-directory=$NEW $MBR_DEV >/dev/null 2>&1
824
        grub-install --root-directory=$NEW $MBR_DEV
829
        grub-install --root-directory=$NEW $MBR_DEV	
825
    else
830
    else
-
 
831
        grub-install --no-floppy --root-directory=$NEW $MBR_DEV >/dev/null 2>&1
826
        grub-install --no-floppy --root-directory=$NEW $MBR_DEV
832
        grub-install --no-floppy --root-directory=$NEW $MBR_DEV
827
    fi
833
    fi
828
    echo "done."; echo
834
    echo "done."; echo
829
 
835
 
830
fi
836
fi