Subversion Repositories livecd

Rev

Rev 225 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 225 Rev 226
Line 435... Line 435...
435 
    [ -L /$dir ] && do_not_copy="yes"
 435 
    [ -L /$dir ] && do_not_copy="yes"
436 
 
 436 
 
437 
    fail=""
 437 
    fail=""
438 
    if [ ! $do_not_copy ]; then
 438 
    if [ ! $do_not_copy ]; then
439 
        echo -n "  * Copy  /$dir ... "
 439 
        echo -n "  * Copy  /$dir ... "
- 
 
 440 
	# first delete $dir on hardisk
- 
 
 441 
	rm -rf $NEW/$dir
440 
        cp -a -f /$dir $NEW || fail=true
 442 
        cp -a -f /$dir $NEW || fail=true
441 
        echo "done."
 443 
        echo "done."
442 
    fi
 444 
    fi
443 
    fail=""
 445 
    fail=""
444 
done
 446 
done
Line 511... Line 513...
511 
 
 513 
 
512 
    ### install grub
 514 
    ### install grub
513 
    ### -----------------------------------------------------------
 515 
    ### -----------------------------------------------------------
514 
    echo "Run grub-install ... "
 516 
    echo "Run grub-install ... "
515 
    mkdir -p $NEW/boot/grub
 517 
    mkdir -p $NEW/boot/grub
516 
    if [ $FLOPPY ]; then
 518 
    [ ! $FLOPPY ] && NO_FLOPPY_OPT="--no-floppy"
517 
        grub-install --root-directory=$NEW $MBR_DEV 2>/dev/null || GRUB_FAILED="yes"
 - 
 
518 
    else
 - 
 
519 
        grub-install --no-floppy --root-directory=$NEW $MBR_DEV 2>/dev/null || GRUB_FAILED="yes"
 519 
    grub-install $NO_FLOPPY_OPT --root-directory=$NEW $MBR_DEV 2>/dev/null || GRUB_FAILED="yes"
520 
    fi
 520 
 
521 
    if [ $GRUB_FAILED ]; then
 521 
    if [ $GRUB_FAILED ]; then
522 
	echo "grub installation failed. grub-install will run again at the end."
 522 
	echo "grub installation failed. grub-install will run again at the end."
523 
    else
 523 
    else
524 
	echo "done."
 524 
	echo "done."
525 
    fi
 525 
    fi
Line 821... Line 821...
821 
### (happens on xfs filesystem), to be sure run it twice.
 821 
### (happens on xfs filesystem), to be sure run it twice.
822 
### -----------------------------------------------------------
 822 
### -----------------------------------------------------------
823 
if [ ! $NOGRUB ] && [ $GRUB_FAILED ]; then
 823 
if [ ! $NOGRUB ] && [ $GRUB_FAILED ]; then
824 
 
 824 
 
825 
    echo "Run grub-install once more ... "
 825 
    echo "Run grub-install once more ... "
- 
 
 826 
 
826 
    mkdir -p $NEW/boot/grub
 827 
    [ ! $FLOPPY ] && NO_FLOPPY_OPT="--no-floppy"
- 
 
 828 
 
827 
    if [ $FLOPPY ]; then
 829 
    # remount partition
828 
        grub-install --root-directory=$NEW $MBR_DEV >/dev/null 2>&1
 - 
 
829 
        grub-install --root-directory=$NEW $MBR_DEV
830 
    if [ $MOUNTED = "0" ]; then
830 
    else
 831 
	umount $NEW
831 
        grub-install --no-floppy --root-directory=$NEW $MBR_DEV >/dev/null 2>&1
 - 
 
832 
        grub-install --no-floppy --root-directory=$NEW $MBR_DEV
 832 
	mount $INSTALL_PART $NEW
833 
    fi
 833 
    fi
- 
 
 834 
    grub-install $NO_FLOPPY_OPT --root-directory=$NEW $MBR_DEV >/dev/null 2>&1
- 
 
 835 
 
- 
 
 836 
    # remount partition
- 
 
 837 
    if [ $MOUNTED = "0" ]; then
- 
 
 838 
	umount $NEW
- 
 
 839 
	mount $INSTALL_PART $NEW
- 
 
 840 
    fi
- 
 
 841 
    grub-install $NO_FLOPPY_OPT --root-directory=$NEW $MBR_DEV >/dev/null 2>&1
- 
 
 842 
 
834 
    echo "done."; echo
 843 
    echo "done."; echo
835 
 
 844 
 
836 
fi
 845 
fi
837 
 
 846 
 
838 
### umount $INSTALL_PART
 847 
### umount $INSTALL_PART