Cleanup rc.local: puppet and shorewall

diff --git a/files/etc/rc.local b/files/etc/rc.local
index 124623db8625968c11344a1282581070c3d7d8ce..775a383b0ab488047db58a2c45a2e9b7f22f0799 100644 (file)
--- 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