diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2015-02-09 02:44:20 +0100 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2015-02-09 02:44:20 +0100 |
| commit | 8c9b11aed2c2eb9ad3a77f821efeabb48f848e31 (patch) | |
| tree | e6c423e4046cb76c6a61dbc157d313dd7c5822a6 /Makefile | |
| parent | 29fc7eb1549de7622dc1f9fbbfe647b55adace17 (diff) | |
| parent | 40f8ecbf261c8b3319350e681a207ed4b42f424d (diff) | |
| download | util-vserver-netns-8c9b11aed2c2eb9ad3a77f821efeabb48f848e31.tar.gz util-vserver-netns-8c9b11aed2c2eb9ad3a77f821efeabb48f848e31.tar.bz2 util-vserver-netns-8c9b11aed2c2eb9ad3a77f821efeabb48f848e31.zip | |
Merge commit '2.3' into debian
* commit '2.3':
Add insserv config to define $util-vserver system facility.
Add util-vserver-netns initscript.
Use spline-netns folder, to not collidate with default netns handling.
Add vshelper with netns support.
Use nullglob for all globbings.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 15 |
1 files changed, 12 insertions, 3 deletions
@@ -2,16 +2,25 @@ 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 util-vserver-netns util-vserver + 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/" + "$(DESTDIR)/etc/default/" \ + "$(DESTDIR)/etc/init.d/" \ + "$(DESTDIR)/etc/insserv.conf.d/" 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 util-vserver-netns "$(DESTDIR)/etc/init.d/" 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/" + install -m644 util-vserver "$(DESTDIR)/etc/insserv.conf.d/" + + ln -s /usr/lib/x86_64-linux-gnu/util-vserver/vshelper.netns "$(DESTDIR)/sbin/" .PHONY: install |