Merge remote-tracking branch 'steven/master'

This commit is contained in:
Nico Schottelius 2011-11-18 15:46:46 +01:00
commit f557229fae
5 changed files with 5 additions and 5 deletions

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -49,4 +49,4 @@ for property in $(ls .); do
fi
done
require="$__self" __package_$type "$@"
require="$__object_name" __package_$type "$@"

View file

@ -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