diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2017-04-19 21:30:24 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2017-04-19 21:30:24 +0100 |
| commit | 26f67181f7dfdb4eec067ad0488ef65961b0b961 (patch) | |
| tree | 64fa313cbafe2ab7fb4935f3025576c31fa29bf8 | |
| parent | 9cc0c043132676c1803b017b8f77dba45c20c08e (diff) | |
| download | userv-utils-26f67181f7dfdb4eec067ad0488ef65961b0b961.tar.gz | |
ipif: ship and use ipif-access
| -rw-r--r-- | ipif/Makefile | 2 | ||||
| -rw-r--r-- | ipif/ipif | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/ipif/Makefile b/ipif/Makefile index fe6ec6e..289935e 100644 --- a/ipif/Makefile +++ b/ipif/Makefile @@ -39,6 +39,7 @@ PROGRAMS+= $(PROGRAM_TARGETS) DIRS+= $(libuserv) $(etcuserv) $(services) DIRS+= $(docdir)/userv-ipif +DIRS+= $(etcuserv)/ipif-access DIRS$(depr)+= $(bindir) $(varlibvpn) $(shareuserv) SHAREFILES$(depr)+= udptunnel-vpn-config.m4 udptunnel-vpn-defaults @@ -54,6 +55,7 @@ all: $(TARGETS) install: all mkdir -p $(DIRS) cp -b service $(libuserv)/ipif + cp -b service-wrap $(libuserv)/ipif-access set -e; for f in $(PROGRAMS); do cp -b $$f $(bindir)/.; done cp ipif $(services)/ipif:new set -e; cd $(services); test -f ipif || mv ipif:new ipif @@ -7,5 +7,5 @@ if ( grep calling-user-shell /etc/shells no-set-environment no-suppress-args no-disconnect-hup - execute /usr/lib/userv/ipif /etc/userv/ipif-networks -- + execute /usr/lib/userv/ipif-access /etc/userv/ipif-access /usr/lib/userv/ipif /etc/userv/ipif-networks -- fi |