(f) touch "$dst"
chmod $4 "$dst"
;;
+ (l) ln -s "$4" "$dst"
+ ;;
(*) echo "Unknown dev-entry mode '$3'" >&2
false
;;
findAndCopy "$VDIR"/etc/hosts "$__CONFDIR"/.defaults/files/hosts "$__CONFDIR/.distributions/$DISTRIBUTION"/files/hosts \
"$__DISTRIBDIR/$DISTRIBUTION"/files/hosts "$__DISTRIBDIR"/defaults/files/hosts ""
- for i in nsswitch.conf krb5.conf krb.conf krb.realms ldap.conf localtime resolv.conf; do
+ for i in nsswitch.conf krb5.conf krb.conf krb.realms ldap.conf localtime; do
findAndCopy "$VDIR"/etc/$i "$__CONFDIR/.defaults/files/$i" "$__CONFDIR/.distributions/$DISTRIBUTION/files/$i" ""
done
+ findAndCopy "$VDIR"/etc/resolv.conf "$__CONFDIR/.defaults/files/resolv.conf" \
+ "$__CONFDIR/.distributions/$DISTRIBUTION/files/resolv.conf" /etc/resolv.conf ""
}
function base._initVariables
findFile BUILD_INITPOST "$__CONFDIR/.distributions/$DISTRIBUTION/initpost" "$__DISTRIBDIR/$DISTRIBUTION/initpost" ""
}
+declare -a __BASE_CLEANUP
+function base.pushCleanup
+{
+ __BASE_CLEANUP=( "${__BASE_CLEANUP[@]}" "$*" )
+}
+
+function base.popCleanup
+{
+ unset __BASE_CLEANUP[$((${#__BASE_CLEANUP[@]} - 1))]
+}
+
function base.__cleanup
{
- test -z "$OPTION_KEEP" || return 0
- test -z "$__BASE_SUCCESS" || return 0
+ for cmd in "${__BASE_CLEANUP[@]}"; do
+ $cmd
+ done
+ test -z "$__BASE_SUCCESS" || return 0
+ test -z "$OPTION_KEEP" || return 0
rm -rf "${__BASE_GENERATED_FILES[@]}"
}
function startSleepingGuest
{
local guest="$1"
- local timeout="$2"
+ local timeout="${2:-15}"
$_VSERVER "$guest" start --rescue --rescue-init bash -c "
exec > /dev/null
exec 2> /dev/null
function stopSleepingGuest
{
local guest="$1"
- $_VKILL --xid "$guest" -s INT -- 1
+ $_VSERVER "$guest" stop --rescue-init
}