summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2019-01-02 10:43:59 +0100
committerDaniil Baturin <daniil@baturin.org>2019-01-02 10:43:59 +0100
commit8a062ec84e9ec4a33a54a8dac020d05407ac1650 (patch)
tree4d76a4df6b1cf540af23dd3ec9843710261fe9fe
parent7e785e989dfdf304150cc4fc0fe7d86f2a956341 (diff)
downloadvyatta-cfg-system-8a062ec84e9ec4a33a54a8dac020d05407ac1650.tar.gz
vyatta-cfg-system-8a062ec84e9ec4a33a54a8dac020d05407ac1650.zip
T1146: do not modify the rc.local script, postconfig scripts are now run from vyos-router.
-rwxr-xr-xdebian/vyatta-cfg-system.postinst.in19
1 files changed, 0 insertions, 19 deletions
diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in
index be10fda4..896eb6c6 100755
--- a/debian/vyatta-cfg-system.postinst.in
+++ b/debian/vyatta-cfg-system.postinst.in
@@ -135,25 +135,6 @@ if [ ! -x /opt/vyatta/etc/config/scripts/vyatta-postconfig-bootup.script ]; then
EOF
fi
-# call vyatta-postconfig-bootup.script from /etc/rc.local
-if ! grep -q /opt/vyatta/etc/config/scripts/vyatta-postconfig-bootup.script \
- /etc/rc.local
-then
- cat <<EOF >>/etc/rc.local
-# Do not remove the following call to vyatta-postconfig-bootup.script.
-# Any boot time workarounds should be put in script below so that they
-# get preserved for the new image during image upgrade.
-POSTCONFIG_OLD=/opt/vyatta/etc/config/scripts/vyatta-postconfig-bootup.script
-POSTCONFIG_NEW=/config/scripts/vyos-postconfig-bootup.script
-[ -x \$POSTCONFIG_OLD ] && \$POSTCONFIG_OLD
-[ -x \$POSTCONFIG_NEW ] && \$POSTCONFIG_NEW
-EOF
- sh -c "sed -i -e '/exit 0/d' /etc/rc.local"
- cat <<EOF >>/etc/rc.local
-exit 0
-EOF
-fi
-
touch /etc/environment
if [ ! -f /etc/bash_completion ]; then