X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvserver-setup.functions;h=b535203fadc19b0d353a4564830ceb9f54403079;hb=83d02d0cb8f5a1025457bc2bfcdeffc001bfa941;hp=61740e842cda0c871546d3391b4fd939ec69cb30;hpb=8c0fb6c0836e6c5101d4a307487e3b2505a7919c;p=util-vserver.git diff --git a/scripts/vserver-setup.functions b/scripts/vserver-setup.functions index 61740e8..b535203 100644 --- a/scripts/vserver-setup.functions +++ b/scripts/vserver-setup.functions @@ -34,8 +34,8 @@ declare -a SETUP_FLAGS=() declare -r SETUP_OPTIONS="confdir:,lockfile:,hostname:,netdev:,netmask:,netprefix:,netbcast:,interface:,flags:,context:,initstyle:,cpuset:,cpusetcpus:,cpusetmems:,cpusetvirt" declare -r SETUP_HELPMSG=$" - --context ... the static context of the vserver [default: none; a dynamic - context will be assumed] + --context ... the static context of the vserver [default: none; one will + be generated for you] --confdir ... [default: $__CONFDIR/] --lockfile ... [default: $__RUNDIR/] @@ -135,12 +135,12 @@ function _setup_writeInterface local dev=${tmp%%:*} local nodev= test "$dev" != "$tmp" || dev= + + tmp=${tmp##${dev}:} test "$dev" != "nodev" || { dev= nodev=1 } - - tmp=${tmp##${dev}:} local mask=${tmp##*/} test "$mask" != "$tmp" || mask= @@ -220,7 +220,7 @@ function setup_writeOption test -z "$SETUP_FLAGS" || for i in "${SETUP_FLAGS[@]}"; do echo "$i" - done >"$cfgdir"/flags + done >"$cfgdir"/cflags ln -s "$SETUP_LOCKFILE" "$cfgdir"/run }