summaryrefslogtreecommitdiff
path: root/scripts/install
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2018-12-03 02:17:58 +0100
committerDaniil Baturin <daniil@baturin.org>2018-12-03 02:17:58 +0100
commit84f1d678220de624c5f184d9166693208434a31b (patch)
tree3980d28629dad80f8f8616f7db62ee070f7707c9 /scripts/install
parent4b9e5466e8200215cc24fb2f5a24eca3cb291a53 (diff)
downloadvyatta-cfg-system-84f1d678220de624c5f184d9166693208434a31b.tar.gz
vyatta-cfg-system-84f1d678220de624c5f184d9166693208434a31b.zip
T1047: look for a saved config in the "real" config dir at install time
(i.e. not the bind-mounted /config).
Diffstat (limited to 'scripts/install')
-rwxr-xr-xscripts/install/install-postinst-new4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/install/install-postinst-new b/scripts/install/install-postinst-new
index 4e387c0d..ae723627 100755
--- a/scripts/install/install-postinst-new
+++ b/scripts/install/install-postinst-new
@@ -47,8 +47,8 @@ copy_config () {
# that this will include any changes made and saved by the user,
# as well as changes such as interface MAC addresses automatically
# generated by the user. So it is the first choice.
- if [ -f "${VYATTA_NEW_CFG_DIR}/config.boot" ]; then
- config=${VYATTA_NEW_CFG_DIR}/config.boot
+ if [ -f "${VYATTA_CFG_DIR}/config.boot" ]; then
+ config=${VYATTA_CFG_DIR}/config.boot
fi
# Third candidate: The default config file