diff options
| author | Stig Thormodsrud <stig@vyatta.com> | 2007-11-27 13:47:04 -0800 |
|---|---|---|
| committer | Stig Thormodsrud <stig@vyatta.com> | 2007-11-27 13:47:04 -0800 |
| commit | 3b95ed69d8e9a82430877bed94698a11ea94b94a (patch) | |
| tree | 8939d2822aaa7dbe76359ee72f194199288061e3 | |
| parent | 7e0cd1281925ab017eeb08877be528d46ae23257 (diff) | |
| parent | 619cfac2cf37a21297dd1fb51116dc4ec30d4112 (diff) | |
| download | vyatta-cfg-system-3b95ed69d8e9a82430877bed94698a11ea94b94a.tar.gz vyatta-cfg-system-3b95ed69d8e9a82430877bed94698a11ea94b94a.zip | |
Merge branch 'master' of http://phuket.vyatta.com/vyatta-cfg-system
| -rwxr-xr-x | scripts/install-system.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/install-system.in b/scripts/install-system.in index cf7ff263..49634a03 100755 --- a/scripts/install-system.in +++ b/scripts/install-system.in @@ -461,8 +461,8 @@ install_root_filesystem () { output+=$(cp /live/image/live/vmlinuz-* $rootfsdir/boot/) status=$? output+=$(cp /live/image/live/initrd.img-* $rootfsdir/boot/initrd.img) - status=$status || $? - if [ "$status" != 0 ]; then + 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 |