From 6b0935c2074cd4b4a3f8901735499901de87e381 Mon Sep 17 00:00:00 2001
From: Steven Armstrong <steven@icarus.ethz.ch>
Date: Fri, 18 Nov 2011 15:43:06 +0100
Subject: [PATCH] /__self/__object_name/

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
---
 conf/type/__apt_ppa/manifest         | 2 +-
 conf/type/__autofs_map/manifest      | 2 +-
 conf/type/__autofs_master/manifest   | 2 +-
 conf/type/__package/manifest         | 2 +-
 conf/type/__partition_msdos/manifest | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/conf/type/__apt_ppa/manifest b/conf/type/__apt_ppa/manifest
index 5aa84931..04c66ce0 100755
--- a/conf/type/__apt_ppa/manifest
+++ b/conf/type/__apt_ppa/manifest
@@ -27,4 +27,4 @@ require="__package/python-software-properties" \
    --source "$__type/files/remove-apt-repository" \
    --mode 0755
 
-require="$__self" __apt_update_index
+require="$__object_name" __apt_update_index
diff --git a/conf/type/__autofs_map/manifest b/conf/type/__autofs_map/manifest
index 74672e46..d86ea799 100755
--- a/conf/type/__autofs_map/manifest
+++ b/conf/type/__autofs_map/manifest
@@ -38,5 +38,5 @@ if [ -f "$__object/parameter/comment" ]; then
 fi
 echo "$entry" >> "$__object/parameter/entry"
 
-require="$__self" __autofs_master
+require="$__object_name" __autofs_master
 
diff --git a/conf/type/__autofs_master/manifest b/conf/type/__autofs_master/manifest
index e37a5d34..e429842e 100755
--- a/conf/type/__autofs_master/manifest
+++ b/conf/type/__autofs_master/manifest
@@ -24,7 +24,7 @@ if [ ! -f "$__object/parameter/header" ]; then
 fi
 
 [ -d "$__object/files" ] || mkdir "$__object/files"
-require="$__self" __file /etc/auto.master --source "$__object/files/auto.master" \
+require="$__object_name" __file /etc/auto.master --source "$__object/files/auto.master" \
    --mode 644 \
    --owner root \
    --group root
diff --git a/conf/type/__package/manifest b/conf/type/__package/manifest
index b331d32d..765ece36 100755
--- a/conf/type/__package/manifest
+++ b/conf/type/__package/manifest
@@ -49,4 +49,4 @@ for property in $(ls .); do
    fi
 done
 
-require="$__self" __package_$type "$@"
+require="$__object_name" __package_$type "$@"
diff --git a/conf/type/__partition_msdos/manifest b/conf/type/__partition_msdos/manifest
index 0d73c405..21e43856 100755
--- a/conf/type/__partition_msdos/manifest
+++ b/conf/type/__partition_msdos/manifest
@@ -38,4 +38,4 @@ if [ ! -f "$__object/parameter/size" ]; then
 fi
 
 # pull in the type that actually does something with the above parameters
-require="$__self" __partition_msdos_apply
+require="$__object_name" __partition_msdos_apply