X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=scripts%2Fvserver-setup.functions;fp=scripts%2Fvserver-setup.functions;h=127f42f8340d4dcb6b9741d70eb80507c90810b0;hb=2822ba293eb308225c50d346930c47bf98d9927b;hp=03c44d631018652fe7740dad97b5fccb301fd514;hpb=2894fc5a4c8335e4d7221311fed0556f33f8047c;p=util-vserver.git

diff --git a/scripts/vserver-setup.functions b/scripts/vserver-setup.functions
index 03c44d6..127f42f 100644
--- a/scripts/vserver-setup.functions
+++ b/scripts/vserver-setup.functions
@@ -1,6 +1,6 @@
-# $Id: vserver-setup.functions 2300 2006-09-12 12:16:53Z dhozac $	--*- sh -*--
+# $Id: vserver-setup.functions,v 1.18 2005/02/25 23:32:02 ensc Exp $	--*- sh -*--
 
-# Copyright (C) 2003,2004,2005,2006 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
+# Copyright (C) 2003 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
 #  
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -24,15 +24,11 @@ SETUP_LOCKFILE=
 SETUP_CONFDIR=
 SETUP_CONTEXT=
 SETUP_INITSTYLE=
-SETUP_CPUSET=
-SETUP_CPUSETCPUS=
-SETUP_CPUSETMEMS=
-SETUP_CPUSETVIRT=
 
 declare -a SETUP_INTERFACES=()
 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_OPTIONS="confdir:,lockfile:,hostname:,netdev:,netmask:,netprefix:,netbcast:,interface:,flags:,context:,initstyle:"
 declare -r SETUP_HELPMSG=$"
     --context   ...  the static context of the vserver [default: none; a dynamic
                      context will be assumed]
@@ -59,19 +55,6 @@ declare -r SETUP_HELPMSG=$"
 			    this becomes a per vserver limit)
 		     private: No other process can join this security context.
 		            Even root
-    --cpuset <name>
-                ...  declares the CPUSET this vserver will run in [default: none]
-    --cpusetcpus <number[-number][:<exclusive>]>
-                ...  sets which cpus belong to the CPUSET,
-                     exclusive is a flag (0|1) prohibiting any other cpuset from
-                     using those cpus
-    --cpusetmems <number[-number][:<exclusive>]>
-                ...  sets which memory pools belong to the CPUSET,
-                     exclusive is a flag (0|1) prohibiting any other cpuset from
-                     using those memory pools
-    --cpusetvirt
-                ...  virtualize cpuset (guest will see only CPUs defined in cpuset)
-                     Requires kernel patch from http://www.bullopensource.org/cpuset/
     --initstyle <style>
                 ...  configures the initstyle (e.g. minit,sysv,plain)
 "
@@ -88,23 +71,7 @@ function setup_setOption2
 	(--netprefix)	SETUP_NETPREFIX=$2;;
 	(--netbcast)	SETUP_NETBCAST=$2;;
 	(--interface)	SETUP_INTERFACES=( "${SETUP_INTERFACES[@]}" "$2" );;
-	(--initstyle)	SETUP_INITSTYLE=$2;;
-	(--cpuset)	SETUP_CPUSET=$2;;
-	(--cpusetcpus)	old_IFS=$IFS
-			IFS=:
-			set -- $2
-			SETUP_CPUSETCPUS=$1
-			SETUP_CPUSETCPUSEXCL=$2
-			IFS=$old_IFS
-			;;
-	(--cpusetmems)	old_IFS=$IFS
-			IFS=:
-			set -- $2
-			SETUP_CPUSETMEMS=$1
-			SETUP_CPUSETMEMSEXCL=$2
-			IFS=$old_IFS
-			;;
-	(--cpusetvirt)  SETUP_CPUSETVIRT=1;;
+	(--initstyle)   SETUP_INITSTYLE=$2;;
 	(--flags)	old_IFS=$IFS
 			IFS=,
 			set -- $2
@@ -173,7 +140,7 @@ function setup_writeOption
     local cfgdir=${SETUP_CONFDIR:?}
     local i
 
-    mkdir -p "$cfgdir"/interfaces "$cfgdir"/apps/init "$cfgdir"/uts "$cfgdir"/cpuset
+    mkdir -p "$cfgdir"/interfaces "$cfgdir"/apps/init "$cfgdir"/uts
 
     _setup_writeSingleOption "$name"            "$cfgdir"/name
     _setup_writeSingleOption "$SETUP_CONTEXT"   "$cfgdir"/context
@@ -183,12 +150,6 @@ function setup_writeOption
     _setup_writeSingleOption "$SETUP_NETPREFIX" "$cfgdir"/interfaces/prefix
     _setup_writeSingleOption "$SETUP_NETBCAST"  "$cfgdir"/interfaces/bcast
     _setup_writeSingleOption "$SETUP_INITSTYLE" "$cfgdir"/apps/init/style
-    _setup_writeSingleOption "$SETUP_CPUSET"    "$cfgdir"/cpuset/name
-    _setup_writeSingleOption "$SETUP_CPUSETCPUS"     "$cfgdir"/cpuset/cpus
-    _setup_writeSingleOption "$SETUP_CPUSETCPUSEXCL" "$cfgdir"/cpuset/cpus_exclusive
-    _setup_writeSingleOption "$SETUP_CPUSETMEMS"     "$cfgdir"/cpuset/mems
-    _setup_writeSingleOption "$SETUP_CPUSETMEMSEXCL" "$cfgdir"/cpuset/mem_exclusive
-    _setup_writeSingleOption "$SETUP_CPUSETVIRT"     "$cfgdir"/cpuset/virtualized
 
     local idx=0
     for i in "${SETUP_INTERFACES[@]}"; do