Changeset 2478
- Timestamp:
- 01/27/07 12:10:09 (2 years ago)
- Files:
-
- trunk/contrib/manifest.dat.pathsubst (modified) (1 diff)
- trunk/distrib/Makefile.am (modified) (1 diff)
- trunk/distrib/misc/context.start (added)
- trunk/doc/configuration.xml (modified) (1 diff)
- trunk/scripts/vserver-setup.functions (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/contrib/manifest.dat.pathsubst
r2469 r2478 46 46 build @PKGLIBDIR@/defaults/fstab 47 47 build @PKGLIBDIR@/defaults/debootstrap.uri 48 build @PKGLIBDIR@/defaults/context.start 48 49 @ENSC_HAVE_C99_COMPILER_TRUE@build @PKGLIBDIR@/defaults/vunify-exclude 49 50 base @PKGLIBDIR@/capchroot trunk/distrib/Makefile.am
r2471 r2478 27 27 misc/vprocunhide-files \ 28 28 misc/vunify-exclude \ 29 misc/environment 29 misc/environment \ 30 misc/context.start 30 31 31 32 nobase_distrib_SCRIPTS = redhat/initpost \ trunk/doc/configuration.xml
r2474 r2478 77 77 </description> 78 78 </data> 79 80 <boolean name="context.dynamic"> 81 <description> 82 If this file exists, kernel-side dynamic contexts will be used by the "vserver 83 ... build" command. Otherwise a context will be generated, based on the 84 contents of <optionref>context.next</optionref>. 85 </description> 86 </boolean> 87 88 <scalar id="context.next" name="context.next"> 89 <description> 90 The context id to use for the next guest created by "vserver ... build". 91 </description> 92 </scalar> 79 93 80 94 <collection name="apps"> trunk/scripts/vserver-setup.functions
r2477 r2478 170 170 } 171 171 172 function _setup_generateContext 173 { 174 if test -z "$SETUP_CONTEXT" && test ! -e "$__CONFDIR/.defaults/context.dynamic"; then 175 if test -e "$__CONFDIR/.defaults/context.next"; then 176 SETUP_CONTEXT=`$_CAT "$__CONFDIR/.defaults/context.next"` 177 else 178 SETUP_CONTEXT=`$_CAT "$__PKGLIBDEFAULTDIR/context.start"` 179 fi 180 expr "$SETUP_CONTEXT" + 1 > "$__CONFDIR/.defaults/context.next" 181 fi 182 } 183 172 184 function setup_writeOption 173 185 { … … 177 189 178 190 mkdir -p "$cfgdir"/interfaces "$cfgdir"/apps/init "$cfgdir"/uts "$cfgdir"/cpuset 191 192 _setup_generateContext 179 193 180 194 _setup_writeSingleOption "$name" "$cfgdir"/name
