X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvserver-setup.functions;h=3996d68bf0cfee90a0faf632b3ffb4f6c77f3fe8;hb=ba315c9752a8b9b65d73563ced6bd74fcbd166f8;hp=cb484fdb934eec8a5f550b43a910ed3b3fae1837;hpb=754434fee29f02326853e656fbf0a6bea5c63ea4;p=util-vserver.git diff --git a/scripts/vserver-setup.functions b/scripts/vserver-setup.functions index cb484fd..3996d68 100644 --- a/scripts/vserver-setup.functions +++ b/scripts/vserver-setup.functions @@ -156,8 +156,10 @@ function _setup_writeInterface _setup_writeSingleOption "$mask" $d/mask _setup_writeSingleOption "$prefix" $d/prefix - test -n "$dev" -o -n "$SETUP_NETDEV" || \ - echo $"No device specified for interface '$idx'; do not forget to set the 'nodev' option" >&2 + test -n "$dev" -o -n "$SETUP_NETDEV" || { + echo $"No device specified for interface '$idx'; setting 'nodev'" >&2 + $_TOUCH $d/nodev + } } function setup_setDefaults @@ -167,6 +169,18 @@ function setup_setDefaults findFile SETUP_FSTAB "$__CONFDIR"/.defaults/fstab "$__PKGLIBDEFAULTDIR"/fstab } +function _setup_generateContext +{ + if test -z "$SETUP_CONTEXT" && test ! -e "$__CONFDIR/.defaults/context.dynamic"; then + if test -e "$__CONFDIR/.defaults/context.next"; then + SETUP_CONTEXT=`$_CAT "$__CONFDIR/.defaults/context.next"` + else + SETUP_CONTEXT=`$_CAT "$__PKGLIBDEFAULTDIR/context.start"` + fi + expr "$SETUP_CONTEXT" + 1 > "$__CONFDIR/.defaults/context.next" + fi +} + function setup_writeOption { local name=$1 @@ -175,6 +189,8 @@ function setup_writeOption mkdir -p "$cfgdir"/interfaces "$cfgdir"/apps/init "$cfgdir"/uts "$cfgdir"/cpuset + _setup_generateContext + _setup_writeSingleOption "$name" "$cfgdir"/name _setup_writeSingleOption "$SETUP_CONTEXT" "$cfgdir"/context _setup_writeSingleOption "$SETUP_HOSTNAME" "$cfgdir"/uts/nodename