summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog6
-rwxr-xr-xetc/init.d/vyatta-config-reboot-params5
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