diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2013-09-28 22:30:52 +0200 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2013-09-28 22:42:37 +0200 |
| commit | b5f218c4a6c141ce8208584b912fc6b052f1df8d (patch) | |
| tree | 3da972bda11a9d9f3d3bc411a79cb61ad8ca6928 | |
| parent | ccacceea90fed40b06636104722daca972f1bc60 (diff) | |
| download | util-vserver-netns-b5f218c4a6c141ce8208584b912fc6b052f1df8d.tar.gz util-vserver-netns-b5f218c4a6c141ce8208584b912fc6b052f1df8d.tar.bz2 util-vserver-netns-b5f218c4a6c141ce8208584b912fc6b052f1df8d.zip | |
vserver.functions: add missing s
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | util-vserver-vars | 2 | ||||
| -rw-r--r-- | vserver.functions (renamed from vserver.function) | 4 |
3 files changed, 5 insertions, 5 deletions
@@ -2,7 +2,7 @@ all: clean: -install: vserver.netns vnamespace.netns util-vserver-vars vserver.function vserver-netns.sh vservers-default +install: vserver.netns vnamespace.netns util-vserver-vars vserver.functions vserver-netns.sh vservers-default install -d "$(DESTDIR)/usr/lib/util-vserver/netns/" \ "$(DESTDIR)/usr/sbin/" \ "$(DESTDIR)/etc/profile.d/" \ @@ -11,7 +11,7 @@ install: vserver.netns vnamespace.netns util-vserver-vars vserver.function vserv install vserver.netns "$(DESTDIR)/usr/sbin/" install vnamespace.netns "$(DESTDIR)/usr/sbin/" install -m644 util-vserver-vars "$(DESTDIR)/usr/lib/util-vserver/netns/" - install -m644 vserver.function "$(DESTDIR)/usr/lib/util-vserver/netns/" + install -m644 vserver.functions "$(DESTDIR)/usr/lib/util-vserver/netns/" install -m644 vserver-netns.sh "$(DESTDIR)/etc/profile.d/" install -m644 vservers-default "$(DESTDIR)/etc/default/" .PHONY: install diff --git a/util-vserver-vars b/util-vserver-vars index 086e508..79cab05 100644 --- a/util-vserver-vars +++ b/util-vserver-vars @@ -10,7 +10,7 @@ __REAL_PKGLIBDIR="${__PKGLIBDIR}" _REAL_VSERVER="${_VSERVER}" case "$0" in - vserver) + /usr/sbin/vserver*) # we want to wrap a function from vserver.functions # so we want to wrap vserver.functions that will be include with: # . $__PKGLIBDIR/vserver.functions diff --git a/vserver.function b/vserver.functions index b8a890f..8a56d8b 100644 --- a/vserver.function +++ b/vserver.functions @@ -1,5 +1,5 @@ # source the real file -. ${__REAL_PKGLIBDIR}/vserver.function +. ${__REAL_PKGLIBDIR}/vserver.functions __PKGLIBDIR="${__REAL_PKGLIBDIR}" # @@ -55,7 +55,7 @@ function _netnsFilterNetnsUmount() { case $1 in --) shift; break;; -*) shift;; - net:*|/run/netns/*) return 0;; + net:*|/run/netns/*) return 0;; *) break;; esac done |