aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--files/etc/rc.local5
-rw-r--r--manifests/utils/bundle/standard.pp6
2 files changed, 8 insertions, 3 deletions
diff --git a/files/etc/rc.local b/files/etc/rc.local
index 8d93e07..fd951eb 100644
--- a/files/etc/rc.local
+++ b/files/etc/rc.local
@@ -19,6 +19,11 @@ fi
# Force the hostname
/bin/hostname `cat /etc/hostname`
+# Remove puppetd lock, then restart puppet with the right hostname
+# Not using this anymore since we moved to a masterless setup.
+#rm -f /var/lib/puppet/state/puppetdlock
+#/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
diff --git a/manifests/utils/bundle/standard.pp b/manifests/utils/bundle/standard.pp
index ff33e87..6d67991 100644
--- a/manifests/utils/bundle/standard.pp
+++ b/manifests/utils/bundle/standard.pp
@@ -3,9 +3,9 @@ class nodo::utils::bundle::standard {
include nodo::utils::office::gui
include nodo::utils::printer
include nodo::utils::network
- include nodo::utils::network::xmpp
+ #include nodo::utils::network::xmpp
include nodo::utils::web::gui
- include nodo::utils::desktop::gnome
+ #include nodo::utils::desktop::gnome
include nodo::utils::desktop::cinnamon
- include nodo::utils::multimedia::downloaders
+ #include nodo::utils::multimedia::downloaders
}