X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvserver.functions;h=260bd6e474637fca92969f25c1d3da00b3056122;hb=69c048e18d1630eea2d5c55f7c5acbdcacba846e;hp=edda60a68865a4e1fed834648bc0607968ba87eb;hpb=60e7abd16144869d483db5ec516a7b9ea842727c;p=util-vserver.git diff --git a/scripts/vserver.functions b/scripts/vserver.functions index edda60a..260bd6e 100644 --- a/scripts/vserver.functions +++ b/scripts/vserver.functions @@ -103,7 +103,7 @@ function _generateChbindOptions getFileValue nid "$vdir/ncontext" "$vdir/context" - CHBIND_OPTS=( $SILENT_OPT ${nid:+--nid "$nid"} ${bcast:+--bcast "$bcast"} ) + CHBIND_OPTS=( $SILENT_OPT --secure ${nid:+--nid "$nid"} ${bcast:+--bcast "$bcast"} ) for i in "${INTERFACES[@]}"; do CHBIND_OPTS=( "${CHBIND_OPTS[@]}" --ip "$i" ) @@ -250,7 +250,7 @@ function _generateInitOptions CHCONTEXT_INIT_OPTS=() - test -n "$INITSTYLE" || \ + test x"$INITSTYLE" = xrescue || \ getFileValue INITSTYLE "$cfgdir"/style getFileValue RUNLEVEL_START "$cfgdir"/runlevel getFileValue RUNLEVEL_START "$cfgdir"/runlevel.start @@ -1199,7 +1199,7 @@ function _namespaceCleanup # these are things that have to be accessible post-cleanup for tmp in "$root" "$__SBINDIR" "$__PKGLIBDIR" "$vdir" \ - "$__PKGSTATEDIR" "${skip[@]}"; do + "$__PKGSTATEDIR" "`pwd`" "${skip[@]}"; do while test -n "$tmp"; do list=( "${list[@]}" "$tmp" ) tmp="${tmp%/*}"