diff options
| author | rbalocca <rbalocca@fugazi.vyatta.com> | 2007-11-30 16:39:47 -0800 |
|---|---|---|
| committer | rbalocca <rbalocca@fugazi.vyatta.com> | 2007-11-30 16:39:47 -0800 |
| commit | 6043afabb34aa2a63c862363679e91b2696468f3 (patch) | |
| tree | f5564587a14b0f9e4172a43d6e5c83f2e73742e0 | |
| parent | 9ddd0d9ed6eb972ea985be386eb91b85fc029c93 (diff) | |
| download | vyatta-cfg-quagga-6043afabb34aa2a63c862363679e91b2696468f3.tar.gz vyatta-cfg-quagga-6043afabb34aa2a63c862363679e91b2696468f3.zip | |
Fix bad merge in install-system.in
| -rwxr-xr-x | scripts/install-system.in | 6 |
1 files changed, 2 insertions, 4 deletions
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 |