diff options
| author | rbalocca <rbalocca@fugazi.vyatta.com> | 2007-11-27 12:47:06 -0800 |
|---|---|---|
| committer | rbalocca <rbalocca@fugazi.vyatta.com> | 2007-11-27 12:47:06 -0800 |
| commit | b1fd90f10917c28e25cca0eba1ec7d6200679bdc (patch) | |
| tree | 539038bc351833126839f8e4ca9a275505e1c8c3 /scripts/install-system.in | |
| parent | c095fa715a6fae2f6b36a8a27ad24e9f24788f5b (diff) | |
| parent | 619cfac2cf37a21297dd1fb51116dc4ec30d4112 (diff) | |
| download | vyatta-cfg-quagga-b1fd90f10917c28e25cca0eba1ec7d6200679bdc.tar.gz vyatta-cfg-quagga-b1fd90f10917c28e25cca0eba1ec7d6200679bdc.zip | |
Merge branch 'master' into glendale
Conflicts:
scripts/install-system.in
Diffstat (limited to 'scripts/install-system.in')
| -rwxr-xr-x | scripts/install-system.in | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/install-system.in b/scripts/install-system.in index 90a142b7..fc5ad7c4 100755 --- a/scripts/install-system.in +++ b/scripts/install-system.in @@ -460,7 +460,9 @@ install_root_filesystem () { output=$(cp -pR /boot/* $rootfsdir/boot/) output+=$(cp /live/image/live/initrd*.img* $rootfsdir/boot/initrd.img) status=$? - if [ "$status" != 0 ]; then + output+=$(cp /live/image/live/initrd.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.\ncp /boot/initrd.img $rootfsdir/boot/\n$output" >> $INSTALL_LOG |