diff options
| author |   Christian Heim <phreak@gentoo.org> | 2006-08-15 15:28:26 +0000 |
|---|---|---|
| committer | Christian Heim <phreak@gentoo.org> | 2006-08-15 15:28:26 +0000 |
| commit | e8fd5dc6409ea6f618c6edcc04d563d5e30f8407 (patch) | |
| tree | c8c0821728405cd8d151d4587c58f968d16f2ae3 /util-vserver/patches | |
| parent | Adding daniel_hozac's patch for yum-2.6 (diff) | |
| download | misc-e8fd5dc6409ea6f618c6edcc04d563d5e30f8407.tar.gz misc-e8fd5dc6409ea6f618c6edcc04d563d5e30f8407.tar.bz2 misc-e8fd5dc6409ea6f618c6edcc04d563d5e30f8407.zip | |
Adding Bertl's patches for util-vserver (touching vserver.start and vserver.functions)
svn path=/; revision=412
Diffstat (limited to 'util-vserver/patches')
| -rw-r--r-- | util-vserver/patches/0.30.210-r18/util-vserver-0.30.210-context-mount.patch | 35 | ||||
| -rw-r--r-- | util-vserver/patches/0.30.210-r18/util-vserver-0.30.210-initialize.patch | 14 |
2 files changed, 49 insertions, 0 deletions
diff --git a/util-vserver/patches/0.30.210-r18/util-vserver-0.30.210-context-mount.patch b/util-vserver/patches/0.30.210-r18/util-vserver-0.30.210-context-mount.patch new file mode 100644 index 0000000..4957f00 --- /dev/null +++ b/util-vserver/patches/0.30.210-r18/util-vserver-0.30.210-context-mount.patch @@ -0,0 +1,35 @@ +diff -NurpP util-vserver-0.30.210.init/scripts/vserver.functions util-vserver-0.30.210.ctxm/scripts/vserver.functions +--- util-vserver-0.30.210.init/scripts/vserver.functions 2006-08-05 23:37:28.000000000 +0200 ++++ util-vserver-0.30.210.ctxm/scripts/vserver.functions 2006-08-05 23:43:39.000000000 +0200 +@@ -745,12 +745,14 @@ function _mountVserverInternal + test -e "$fstab" || return 0 + shift + ++ test -n "$_HAVE_CHCONTEXT_OPTIONS" || _generateChcontextOptions "$cfgdir" + pushd "$vdir" >/dev/null + # check whether / is mounted readonly or whether there is special + # magic regarding the mtab file; when etc/mtab can not be touched, + # add the '-n' flag to mount + test -w etc -o -w etc/mtab || xflag=-n +- "$@" $_SECURE_MOUNT -a $xflag --chroot --fstab "$fstab" --rootfs no ++ $_CHCONTEXT "${OPTS_VCONTEXT_CREATE[@]}" -- \ ++ "$@" $_SECURE_MOUNT -a $xflag --chroot --fstab "$fstab" --rootfs no + popd >/dev/null + } + +@@ -762,12 +764,14 @@ function mountRootFS + local xflag= + + test -e "$fstab" || return 0 ++ test -n "$_HAVE_CHCONTEXT_OPTIONS" || _generateChcontextOptions "$cfgdir" + pushd "$vdir" >/dev/null + # check whether / is mounted readonly or whether there is special + # magic regarding the mtab file; when etc/mtab can not be touched, + # add the '-n' flag to mount + test -w etc -o -w etc/mtab || xflag=-n +- $_SECURE_MOUNT -a $xflag --chroot --fstab "$fstab" --rootfs only -n ++ $_CHCONTEXT "${OPTS_VCONTEXT_CREATE[@]}" -- \ ++ $_SECURE_MOUNT -a $xflag --chroot --fstab "$fstab" --rootfs only -n + popd >/dev/null + } + diff --git a/util-vserver/patches/0.30.210-r18/util-vserver-0.30.210-initialize.patch b/util-vserver/patches/0.30.210-r18/util-vserver-0.30.210-initialize.patch new file mode 100644 index 0000000..96db7fa --- /dev/null +++ b/util-vserver/patches/0.30.210-r18/util-vserver-0.30.210-initialize.patch @@ -0,0 +1,14 @@ +diff -NurpP util-vserver-0.30.210.orig/scripts/vserver.start util-vserver-0.30.210.init/scripts/vserver.start +--- util-vserver-0.30.210.orig/scripts/vserver.start 2006-08-05 23:37:28.000000000 +0200 ++++ util-vserver-0.30.210.init/scripts/vserver.start 2006-08-05 23:39:18.000000000 +0200 +@@ -100,6 +100,10 @@ trap "cleanup" EXIT + + sanityCheck "$VSERVER_DIR" + ++pushd "$VSERVER_DIR" >/dev/null ++execScriptlets "$VSERVER_DIR" "$VSERVER_NAME" initialize ++popd >/dev/null ++ + mountRootFS "$VSERVER_DIR" + generateOptions "$VSERVER_DIR" + |