aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2016-03-12 11:13:32 -0300
committerSilvio Rhatto <rhatto@riseup.net>2016-03-12 11:13:32 -0300
commit08d4975f2027a4acef2e1e281b3e3a4f35676aad (patch)
tree1477852028994071ff7f7dda18e7e58266db347d
parent27c3ace7fbd868146681a6e99de778224034ba58 (diff)
downloadpuppet-nodo-08d4975f2027a4acef2e1e281b3e3a4f35676aad.tar.gz
puppet-nodo-08d4975f2027a4acef2e1e281b3e3a4f35676aad.tar.bz2
Cleanup rc.local: puppet and shorewall
-rw-r--r--files/etc/rc.local12
1 files changed, 3 insertions, 9 deletions
diff --git a/files/etc/rc.local b/files/etc/rc.local
index 124623d..775a383 100644
--- a/files/etc/rc.local
+++ b/files/etc/rc.local
@@ -19,21 +19,15 @@ fi
# Force the hostname
/bin/hostname `cat /etc/hostname`
-# Remove puppetd lock
-rm -f /var/lib/puppet/state/puppetdlock
-
-# Then restart puppet with the right hostname
-/etc/init.d/puppet restart
-
# Keep this mountpoint while ekeyd fact needs it
if [ -d "/proc/bus/usb" ]; then
/bin/mount -t usbfs usbfs /proc/bus/usb -onodev,noexec,nosuid
fi
# Restart shorewall to make sure it gets virtual interfaces
-if [ -f '/etc/init.d/shorewall' ]; then
- /etc/init.d/shorewall restart
-fi
+#if [ -f '/etc/init.d/shorewall' ]; then
+# /etc/init.d/shorewall restart
+#fi
# Start system-wide screen session
if [ -f "/etc/screenrc.startup" ]; then