From 6043afabb34aa2a63c862363679e91b2696468f3 Mon Sep 17 00:00:00 2001 From: rbalocca Date: Fri, 30 Nov 2007 16:39:47 -0800 Subject: Fix bad merge in install-system.in --- scripts/install-system.in | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'scripts') diff --git a/scripts/install-system.in b/scripts/install-system.in index fc5ad7c4..4c31b2ad 100755 --- a/scripts/install-system.in +++ b/scripts/install-system.in @@ -458,13 +458,11 @@ install_root_filesystem () { # make the dir for the boot files and copy em' over mkdir -p $rootfsdir/boot output=$(cp -pR /boot/* $rootfsdir/boot/) - output+=$(cp /live/image/live/initrd*.img* $rootfsdir/boot/initrd.img) status=$? - output+=$(cp /live/image/live/initrd.img-* $rootfsdir/boot/initrd.img) + output+=$(cp /live/image/live/initrd1.img $rootfsdir/boot/initrd.img) status=$status$? if [ "$status" -ne 0 ]; then - echo -e "Error trying to copy the bootfiles.\nPlease see install log for more details.\nExiting. -.." + echo -e "Error trying to copy the bootfiles.\nPlease see install log for more details.\nExiting..." echo -e "Error trying to copy the bootfiles.\ncp /boot/initrd.img $rootfsdir/boot/\n$output" >> $INSTALL_LOG exit 1 fi -- cgit v1.2.3