Merge branch 'dev'

2 files changed, 22 insertions, 0 deletions

diff --git a/modules/base_installation/files/scripts/puppet_lock b/modules/base_installation/files/scripts/puppet_lock
new file mode 100644
index 0000000..cf5c429
--- /dev/null
+++ b/modules/base_installation/files/scripts/puppet_lock
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+lockfile=/var/run/puppet-apply.lock
+path=`dirname $0`
+path=`cd $path/..; pwd`
+
+if [ $(id -u) -gt 0 ]; then
+  echo "You must be root to run this script." >&2
+  exit 2
+fi
+
+if [ "$1" = "off" ]; then
+  rm -f "$lockfile"
+else
+  touch "$lockfile"
+fi
diff --git a/modules/base_installation/manifests/puppet.pp b/modules/base_installation/manifests/puppet.pp
index c64ddfd..fa2db69 100644
--- a/modules/base_installation/manifests/puppet.pp
+++ b/modules/base_installation/manifests/puppet.pp
@@ -27,6 +27,12 @@ class base_installation::puppet (
   }
   ###
 
+  file { '/usr/local/sbin/i_puppet_lock':
+    mode   => "0755",
+    ensure => present,
+    source => "puppet:///modules/base_installation/scripts/puppet_lock"
+  }
+
   file { '/usr/local/sbin/i_puppet_reset_and_apply':
     mode   => "0755",
     ensure => present,