summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorrbalocca <rbalocca@fugazi.vyatta.com>2007-11-27 12:32:14 -0800
committerrbalocca <rbalocca@fugazi.vyatta.com>2007-11-27 12:32:14 -0800
commit619cfac2cf37a21297dd1fb51116dc4ec30d4112 (patch)
treed29d98ac5a7da75cb44f88597d04c151c5f36588 /scripts
parent5d09a07e0fa9567559f2929f026cdf970a8015df (diff)
downloadvyatta-cfg-quagga-619cfac2cf37a21297dd1fb51116dc4ec30d4112.tar.gz
vyatta-cfg-quagga-619cfac2cf37a21297dd1fb51116dc4ec30d4112.zip
Fix bug in install-system that was preventing error reporting when installing isolinux
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/install-system.in4
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