summaryrefslogtreecommitdiff
path: root/scripts/install/install-image
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2018-11-12 16:46:31 +0100
committerDaniil Baturin <daniil@baturin.org>2018-11-12 16:46:31 +0100
commitf7b182fa0f007dfac0202d9ae9017185c110f2f4 (patch)
treec6fbfabbcf7296f0866e5bfec3db10c2cb1e46e9 /scripts/install/install-image
parent299cb670e76bcb364c410e5df69ddd95c4cb12be (diff)
parentf68dda9d619ea74bed266122ac86604284e1a9e4 (diff)
downloadvyatta-cfg-system-f7b182fa0f007dfac0202d9ae9017185c110f2f4.tar.gz
vyatta-cfg-system-f7b182fa0f007dfac0202d9ae9017185c110f2f4.zip
Merge branch 'current' of https://github.com/vyos/vyatta-cfg-system into current
Diffstat (limited to 'scripts/install/install-image')
-rwxr-xr-xscripts/install/install-image4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/install/install-image b/scripts/install/install-image
index 1b482a19..dbdd5901 100755
--- a/scripts/install/install-image
+++ b/scripts/install/install-image
@@ -214,7 +214,7 @@ install_new ()
# postinst operations
if ! /opt/vyatta/sbin/install-postinst-new \
- "$inst_drv" "$root_part" union; then
+ "$inst_drv" "$root_part" union; then
exit 1
fi
}
@@ -297,7 +297,7 @@ rm -f $PART_FILE >&/dev/null
# handle different types
case "$root_part_type" in
new)
- install_new "$root_part" "$inst_drv"
+ install_new "$root_part" "$inst_drv"
exit 0
;;
union|old)