Changeset 2460
- Timestamp:
- 01/18/07 17:35:03 (2 years ago)
- Files:
-
- trunk/scripts/util-vserver-vars.pathsubst (modified) (1 diff)
- trunk/scripts/vserver.functions (modified) (1 diff)
- trunk/sysv/util-vserver (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/scripts/util-vserver-vars.pathsubst
r2458 r2460 74 74 _VATTRIBUTE="$__SBINDIR/vattribute" 75 75 _VCONTEXT="$__SBINDIR/vcontext" 76 _VDEVMAP="$__SBINDIR/vdevmap" 76 77 _VDLIMIT="$__SBINDIR/vdlimit" 77 78 _VDU="$__SBINDIR/vdu" trunk/scripts/vserver.functions
r2456 r2460 1227 1227 } 1228 1228 1229 function loadDeviceMap 1230 { 1231 local xid="$1" 1232 local dir="$2" 1233 local flags device target 1234 1235 test -d "$dir" || return 0 1236 1237 for i in "$dir"/*; do 1238 test -d "$i" || continue 1239 1240 local -a vdevmap_opts=() 1241 test -e "$i/create" && vdevmap_opts=( "${vdevmap_opts[@]}" --create ) 1242 test -e "$i/open" && vdevmap_opts=( "${vdevmap_opts[@]}" --open ) 1243 test -e "$i/remap" && vdevmap_opts=( "${vdevmap_opts[@]}" --remap ) 1244 1245 getFileValue flags "$i/flags" || : 1246 getFileValue device "$i/device" || : 1247 getFileValue target "$i/target" || : 1248 vdevmap_opts=( "${vdevmap_opts[@]}" ${flags:+--flags "$flags"} \ 1249 ${device:+--device "$device"} ${target:+--target "$target"} ) 1250 1251 $_VDEVMAP --xid "$xid" "${vdevmap_opts[@]}" || return $? 1252 done 1253 } trunk/sysv/util-vserver
r2445 r2460 15 15 LOCKFILE=util-vserver 16 16 . "$_LIB_VSERVER_INIT_FUNCTIONS" 17 . "$_LIB_FUNCTIONS" 18 . "$__PKGLIBDIR/vserver.functions" 17 19 18 20 … … 52 54 _endResult $? 53 55 local retval=$? 56 _beginResult $"Loading default device map" 57 loadDeviceMap 0 "$__CONFDIR/.defaults/apps/vdevmap" 58 _endResult $? 54 59 test "$retval" -ne 0 || touch "$lockfile" 55 60 return $retval … … 62 67 $_START_VSERVERS -j 1 --all --stop 63 68 _endResult $? 64 local retval=$?65 69 _beginResult $"Killing all running contexts" 66 70 kill_contexts 67 71 _endResult $? 72 local retval=$? 68 73 $_RM -f "$lockfile" 74 return $retval 69 75 } 70 76
