Merge branch 'master' into __jail

conf/type/__file/gencode-local

@@ -23,6 +23,9 @@
 
 destination="/$__object_id"
 state_should="$(cat "$__object/parameter/state")"
+exists="$(cat "$__object/explorer/exists")"
+
+[ "$state_should" = "exists" -a "$exists" = "yes" ] && exit 0 # nothing to do
 
 if [ "$state_should" = "present" ]; then
    if [ -f "$__object/parameter/source" ]; then

conf/type/__file/man.text

@@ -21,7 +21,11 @@ None.
 OPTIONAL PARAMETERS
 -------------------
 state::
-   'present' or 'absent', defaults to 'present'
+   'present', 'absent' or 'exists', defaults to 'present'
+   where:
+      present: the file is exactly the one from source
+      absent: the file does not exist
+      exists: the file from source but only if it doesn't already exist
 
 group::
    Group to chgrp to.
@@ -55,6 +59,11 @@ __file /etc/issue --source "$__type/files/archlinux" --state present
 __file /etc/shadow --source "$__type/files/shadow" \
    --owner root --group shadow --mode 0640 \
    --state present
+
+# Provide a default file, but let the user change it
+__file /home/frodo/.bashrc --source "/etc/skel/.bashrc" \
+   --state exists \
+   --owner frodo --mode 0600
 --------------------------------------------------------------------------------
 
 

conf/type/__package_yum/gencode-remote

@@ -22,7 +22,7 @@
 #
 
 if [ -f "$__object/parameter/name" ]; then
-   name="$__object/parameter/name"
+   name="$(cat "$__object/parameter/name")"
 else
    name="$__object_id"
 fi

conf/type/__start_on_boot/gencode-remote

@@ -32,7 +32,7 @@ case "$state_should" in
     present)
         case "$os" in
             archlinux)
-                echo "sed -i /etc/rc.conf \'s/^\\(DAEMONS=.*\\))/\\1 $name)/\'"
+                echo "sed -i 's/^\\(DAEMONS=.*\\))/\\1 $name)/' /etc/rc.conf"
             ;;
             debian|ubuntu)
                 echo "update-rc.d \"$name\" defaults >/dev/null"