summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2018-10-01 16:15:08 +0200
committerDaniil Baturin <daniil@baturin.org>2018-10-01 16:15:08 +0200
commit09243416a6ff65a4a34a2c0d726cbf0611f201e6 (patch)
tree358905e4873bf15e29778e924ddff5d0b8826a8b
parent676f1820f762b8fa95f9ef72db40cd9816a45b0b (diff)
parent1f1175135c8b15322852319150c8ed12d99b7a92 (diff)
downloadvyatta-cfg-09243416a6ff65a4a34a2c0d726cbf0611f201e6.tar.gz
vyatta-cfg-09243416a6ff65a4a34a2c0d726cbf0611f201e6.zip
Merge branch 'current' into crux
-rwxr-xr-xetc/init.d/vyatta-router17
1 files changed, 17 insertions, 0 deletions
diff --git a/etc/init.d/vyatta-router b/etc/init.d/vyatta-router
index 530fe5c..c57387c 100755
--- a/etc/init.d/vyatta-router
+++ b/etc/init.d/vyatta-router
@@ -116,6 +116,21 @@ run_preconfig_script ()
fi
}
+run_postupgrade_script ()
+{
+ if [ -f /config/.upgraded ]; then
+ # Run the system script
+ /usr/libexec/vyos/system/post-upgrade
+
+ # Run user scripts
+ if [ -d /config/scripts/post-upgrade.d ]; then
+ run-parts /config/scripts/post-upgrade.d
+ fi
+
+ rm -f /config/.upgraded
+ fi
+}
+
#
# On image booted machines, we need to mount /boot from the image-specific
# boot directory so that kernel package installation will put the
@@ -181,6 +196,8 @@ start ()
run_preconfig_script
+ run_postupgrade_script
+
for s in ${subinit[@]} ; do
if ! disabled $s; then
log_progress_msg $s