diff options
| author | John Southworth <john.southworth@vyatta.com> | 2011-12-12 16:32:33 -0800 |
|---|---|---|
| committer | John Southworth <john.southworth@vyatta.com> | 2011-12-12 16:32:33 -0800 |
| commit | 0b75c7e22f1a021326e2e0657354ffc4e87a4ff8 (patch) | |
| tree | f6aff59178f16b93c8f477e8cf6f39819314d603 | |
| parent | 8b224e177ef4b2889d3e44940196230a24bde392 (diff) | |
| parent | 67954d6216e66dc2908327a4c20913ac087a6737 (diff) | |
| download | vyatta-cfg-system-0b75c7e22f1a021326e2e0657354ffc4e87a4ff8.tar.gz vyatta-cfg-system-0b75c7e22f1a021326e2e0657354ffc4e87a4ff8.zip | |
Merge branch 'oxnard' of git.vyatta.com:/git/vyatta-cfg-system into oxnard
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rwxr-xr-x | etc/init.d/vyatta-config-reboot-params | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 52e08277..c4325e24 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +vyatta-cfg-system (0.19.145) unstable; urgency=low + + * Bug 7672: Don't execute check-params-on-reboot.d if config file + + -- Daniil Baturin <daniil.baturin@vyatta.com> Tue, 13 Dec 2011 03:13:00 +0700 + vyatta-cfg-system (0.19.144) unstable; urgency=low * sysctl: increase maximum allowed socket buffer diff --git a/etc/init.d/vyatta-config-reboot-params b/etc/init.d/vyatta-config-reboot-params index 93afed69..6ce48578 100755 --- a/etc/init.d/vyatta-config-reboot-params +++ b/etc/init.d/vyatta-config-reboot-params @@ -34,6 +34,11 @@ 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 |