summaryrefslogtreecommitdiff
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:18:50 +0100
commita56f2a32589183effb8722420244e942b0afdd3d (patch)
tree00656955745429e0072b972e33493123d177500f
parent18fe96de5f9269cbb87cfb1c46d3baadf90eb59a (diff)
downloadvyatta-cfg-system-a56f2a32589183effb8722420244e942b0afdd3d.tar.gz
vyatta-cfg-system-a56f2a32589183effb8722420244e942b0afdd3d.zip
T1047: look for a saved config in the "real" config dir at install time
(i.e. not the bind-mounted /config).
-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 0ed6441d..2b23556d 100755
--- a/scripts/install/install-postinst-new
+++ b/scripts/install/install-postinst-new
@@ -49,8 +49,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