diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2015-02-08 23:49:44 +0100 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2015-02-09 02:42:21 +0100 |
| commit | 87e01d24830270c8c315f039de66d57c2b1a8c76 (patch) | |
| tree | d9d4da14141d1ebaf23e2a580742f515219b174c | |
| parent | 69e779e3c1893c3d08dee98781e6b8ce9bbb81c1 (diff) | |
| download | util-vserver-netns-87e01d24830270c8c315f039de66d57c2b1a8c76.tar.gz util-vserver-netns-87e01d24830270c8c315f039de66d57c2b1a8c76.tar.bz2 util-vserver-netns-87e01d24830270c8c315f039de66d57c2b1a8c76.zip | |
Add vshelper with netns support.
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | util-vserver-vars | 3 | ||||
| -rwxr-xr-x | vshelper.netns | 10 |
3 files changed, 20 insertions, 2 deletions
@@ -2,16 +2,21 @@ all: clean: -install: vserver.netns vnamespace.netns util-vserver-vars vserver.functions vserver-netns.sh vservers-default - install -d "$(DESTDIR)/usr/share/util-vserver/netns/" \ +install: vserver.netns vnamespace.netns vshelper.netns util-vserver-vars vserver.functions vserver-netns.sh vservers-default + install -d "$(DESTDIR)/sbin/" \ + "$(DESTDIR)/usr/share/util-vserver/netns/" \ + "$(DESTDIR)/usr/lib/x86_64-linux-gnu/util-vserver/" \ "$(DESTDIR)/usr/sbin/" \ "$(DESTDIR)/etc/profile.d/" \ "$(DESTDIR)/etc/default/" install vserver.netns "$(DESTDIR)/usr/sbin/" install vnamespace.netns "$(DESTDIR)/usr/sbin/" + install vshelper.netns "$(DESTDIR)/usr/lib/x86_64-linux-gnu/util-vserver/" install -m644 util-vserver-vars "$(DESTDIR)/usr/share/util-vserver/netns/" install -m644 vserver.functions "$(DESTDIR)/usr/share/util-vserver/netns/" install -m644 vserver-netns.sh "$(DESTDIR)/etc/profile.d/" install -m644 vservers-default "$(DESTDIR)/etc/default/" + + ln -s /usr/lib/x86_64-linux-gnu/util-vserver/vshelper.netns "$(DESTDIR)/sbin/" .PHONY: install diff --git a/util-vserver-vars b/util-vserver-vars index 4d23588..167d975 100644 --- a/util-vserver-vars +++ b/util-vserver-vars @@ -8,6 +8,7 @@ test -e "$REAL_UTIL_VSERVER_VARS" || { # save defaults _REAL_LIB_VSERVER_FUNCTIONS="${_LIB_VSERVER_FUNCTIONS}" _REAL_VSERVER="${_VSERVER}" +_REAL_VSHELPER="${_VSHELPER}" case "$0" in /usr/sbin/vserver*) @@ -23,3 +24,5 @@ case "$0" in ;; esac +# overwrite _VSHELPER for init script +_VSHELPER="$__PKGLIBEXECDIR/vshelper.netns" diff --git a/vshelper.netns b/vshelper.netns new file mode 100755 index 0000000..9e59636 --- /dev/null +++ b/vshelper.netns @@ -0,0 +1,10 @@ +#! /usr/lib/x86_64-linux-gnu/util-vserver/sigexec /bin/bash + +: ${UTIL_VSERVER_VARS:=/usr/share/util-vserver/netns/util-vserver-vars} +test -e "$UTIL_VSERVER_VARS" || { + echo $"Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2 + exit 1 +} + +export UTIL_VSERVER_VARS +exec $_REAL_VSHELPER "$@" |