diff options
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rwxr-xr-x | debian/vyatta-cfg-system.postinst.in | 3 | ||||
| -rw-r--r-- | debian/vyatta-cfg-system.postrm | 1 | ||||
| -rwxr-xr-x | etc/init.d/vyatta-config-reboot-params | 44 | ||||
| -rw-r--r-- | scripts/check-params-on-reboot.d/README | 6 | ||||
| -rwxr-xr-x | scripts/check-params-on-reboot.d/ipv6_disable_blacklist | 24 |
6 files changed, 0 insertions, 84 deletions
diff --git a/Makefile.am b/Makefile.am index fe279797..bbe6f879 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,12 +11,6 @@ initd_SCRIPTS = bin_sudo_users_SCRIPTS = checkparamsonreboot_SCRIPTS = -checkparamsonreboot_DATA = -checkparamsonreboot_DATA += scripts/check-params-on-reboot.d/README - -initd_SCRIPTS += etc/init.d/vyatta-config-reboot-params -checkparamsonreboot_SCRIPTS += scripts/check-params-on-reboot.d/ipv6_disable_blacklist - bin_SCRIPTS += scripts/progress-indicator bin_SCRIPTS += scripts/restricted-shell diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in index 6f5b2c33..ce11379c 100755 --- a/debian/vyatta-cfg-system.postinst.in +++ b/debian/vyatta-cfg-system.postinst.in @@ -89,9 +89,6 @@ fi # this logs unnecessary messages trying to start ddclient rm -f /etc/ppp/ip-up.d/ddclient -# add vyatta-config-reboot-params to start at boot up -update-rc.d vyatta-config-reboot-params start 20 S - # Local Variables: # mode: shell-script # sh-indentation: 4 diff --git a/debian/vyatta-cfg-system.postrm b/debian/vyatta-cfg-system.postrm index 752265e2..caf50d3c 100644 --- a/debian/vyatta-cfg-system.postrm +++ b/debian/vyatta-cfg-system.postrm @@ -2,7 +2,6 @@ if [ "$1" = "purge" ]; then sed -i -e 'g/^password/d' /etc/pam.d/password - update-rc.d vyatta-config-reboot-params remove fi # Local Variables: diff --git a/etc/init.d/vyatta-config-reboot-params b/etc/init.d/vyatta-config-reboot-params deleted file mode 100755 index 6ce48578..00000000 --- a/etc/init.d/vyatta-config-reboot-params +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: vyatta-config-reboot-params -# Required-Start: $local_fs -# Required-Stop: -# X-Start-Before: module-init-tools -# Default-Start: S -# Default-Stop: -# Short-Description: Change system config parameters based on Vyatta configuration -# Description: Provide a way for changing system settings that can only -# be changed on reboot from Vyatta configuration. -### END INIT INFO - -# This script runs very early in the boot process so that parameters -# requiring a reboot get set to the same value as in the config file. -# -# To show how the underlying value can be different than the parameter -# in config file, let's take the case of 'firewall conntrack-hash-size' -# which requires a reboot after it is changed to a different value: user -# sets conntrack-hash-size but doesn't save config; then on reboot -# conntrack module loads with a different value of conntrack-hash-size -# than parameter in config file. When config file loads at a later -# stage, underlying value for conntrack-hash-size gets set to parameter -# in config file but for that to take affect another reboot is required. - -: ${vyatta_env:=/etc/default/vyatta} -source $vyatta_env - -case "$1" in - start) ;; - stop|restart|force-reload|status) exit 0 ;; - *) echo "Usage: $0 {start|stop|restart|force-reload}" >&2; exit 1 ;; -esac - -declare -x BOOTFILE=$vyatta_sysconfdir/config/config.boot - -# Check if config file exists, exit otherwise -if [ ! -f $BOOTFILE ]; then - exit 0 -fi - -# Execute all subordinate scripts in -# /opt/vyatta/bin/sudo-users/check-params-on-reboot.d -run-parts -a $BOOTFILE /opt/vyatta/bin/sudo-users/check-params-on-reboot.d diff --git a/scripts/check-params-on-reboot.d/README b/scripts/check-params-on-reboot.d/README deleted file mode 100644 index d54ec338..00000000 --- a/scripts/check-params-on-reboot.d/README +++ /dev/null @@ -1,6 +0,0 @@ -# /etc/init.d/vyatta-config-reboot-params script executes scripts placed in -# this directory when system boots during 'runlevel S'. Scripts placed in this -# directory are responsible for making sure that the underlying system value of -# config parameters which require a reboot match when the system boots. All -# scripts placed in this directory are passed the configuration boot file as -# an argument. More info in /etc/init.d/vyatta-config-reboot-params diff --git a/scripts/check-params-on-reboot.d/ipv6_disable_blacklist b/scripts/check-params-on-reboot.d/ipv6_disable_blacklist deleted file mode 100755 index 2fcb762a..00000000 --- a/scripts/check-params-on-reboot.d/ipv6_disable_blacklist +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# -# fix IPv6 disable/blacklist on reboot -# - -BOOTFILE=$1 - -cli-shell-api cfExists $BOOTFILE system ipv6 disable -ipv6_disable_cfg=`echo $?` -if [ "$ipv6_disable_cfg" == "0" ]; then - sudo sh -c "echo options ipv6 disable_ipv6=1 > \ - /etc/modprobe.d/vyatta_disable_ipv6.conf" -else - sudo sh -c "rm -f /etc/modprobe.d/vyatta_disable_ipv6.conf" -fi - -cli-shell-api cfExists $BOOTFILE system ipv6 blacklist -ipv6_blacklist_cfg=`echo $?` -if [ "$ipv6_blacklist_cfg" == "0" ]; then - sudo sh -c "echo blacklist ipv6 > \ - /etc/modprobe.d/vyatta_blacklist_ipv6.conf" -else - sudo sh -c "rm -f /etc/modprobe.d/vyatta_blacklist_ipv6.conf" -fi |