diff options
| -rw-r--r-- | Makefile | 28 | ||||
| -rwxr-xr-x | rc.d/net-auto-wired (renamed from ifplugd/net-auto-wired) | 0 | ||||
| -rwxr-xr-x | rc.d/net-auto-wireless (renamed from wpa_actiond/net-auto-wireless) | 0 | ||||
| -rwxr-xr-x | rc.d/net-profiles (renamed from scripts/net-profiles) | 0 | ||||
| -rwxr-xr-x | rc.d/net-rename (renamed from scripts/net-rename) | 0 | ||||
| -rw-r--r-- | scripts/ifplugd.action (renamed from ifplugd/netcfg.action) | 0 | ||||
| -rwxr-xr-x | scripts/netcfg | 2 | ||||
| -rwxr-xr-x | scripts/netcfg-wpa_actiond (renamed from wpa_actiond/netcfg-wpa_actiond) | 0 | ||||
| -rwxr-xr-x | scripts/netcfg-wpa_actiond-action (renamed from wpa_actiond/netcfg-wpa_actiond-action) | 0 | ||||
| -rw-r--r-- | systemd/net-auto-wired.service (renamed from ifplugd/net-auto-wired.service) | 0 | ||||
| -rw-r--r-- | systemd/net-auto-wireless.service (renamed from wpa_actiond/net-auto-wireless.service) | 0 |
11 files changed, 21 insertions, 9 deletions
@@ -1,5 +1,5 @@ DESTDIR= -VERSION=2.6.8 +VERSION=2.7 VPATH = doc .PHONY: install docs @@ -24,16 +24,28 @@ install: # Hooks install -m755 src/hooks/* ${DESTDIR}/usr/lib/network/hooks/ # Scripts - install -Dm755 scripts/netcfg $(DESTDIR)/usr/bin/netcfg2 + install -d $(DESTDIR)/usr/bin + install -m755 scripts/netcfg $(DESTDIR)/usr/bin/netcfg2 ln -s netcfg2 $(DESTDIR)/usr/bin/netcfg - install -Dm755 scripts/netcfg-menu $(DESTDIR)/usr/bin/netcfg-menu - install -m755 wpa_actiond/netcfg-wpa_actiond{,-action} ifplugd/net-auto-wired $(DESTDIR)/usr/bin - install -Dm755 ifplugd/netcfg.action $(DESTDIR)/etc/ifplugd/netcfg.action + install -m755 \ + scripts/netcfg-menu \ + scripts/netcfg-wpa_actiond \ + scripts/netcfg-wpa_actiond-action \ + $(DESTDIR)/usr/bin + install -Dm755 scripts/ifplugd.action $(DESTDIR)/etc/ifplugd/netcfg.action # Daemons install -d $(DESTDIR)/etc/rc.d - install -m755 scripts/net-{profiles,rename} wpa_actiond/net-auto-wireless ifplugd/net-auto-wired $(DESTDIR)/etc/rc.d + install -m755 \ + rc.d/net-profiles \ + rc.d/net-rename \ + rc.d/net-auto-wireless \ + rc.d/net-auto-wired \ + $(DESTDIR)/etc/rc.d install -d $(DESTDIR)/lib/systemd/system - install -m644 wpa_actiond/net-auto-wireless.service ifplugd/net-auto-wired.service $(DESTDIR)/lib/systemd/system + install -m644 \ + systemd/net-auto-wireless.service \ + systemd/net-auto-wired.service \ + $(DESTDIR)/lib/systemd/system # Shell Completion install -Dm644 contrib/bash-completion $(DESTDIR)/etc/bash_completion.d/netcfg install -Dm644 contrib/zsh-completion $(DESTDIR)/usr/share/zsh/site-functions/_netcfg @@ -57,7 +69,7 @@ tarball: docs sed -i "s/NETCFG_VER=.*/NETCFG_VER=$(VERSION)/g" scripts/netcfg rm -rf netcfg-$(VERSION) mkdir -p netcfg-$(VERSION) - cp -r docs config src scripts src-wireless ifplugd wpa_actiond contrib Makefile LICENSE README netcfg-$(VERSION) + cp -r docs config rc.d src scripts src-wireless systemd contrib Makefile LICENSE README netcfg-$(VERSION) tar -zcvf netcfg-$(VERSION).tar.gz netcfg-$(VERSION) rm -rf netcfg-$(VERSION) diff --git a/ifplugd/net-auto-wired b/rc.d/net-auto-wired index 9af8505..9af8505 100755 --- a/ifplugd/net-auto-wired +++ b/rc.d/net-auto-wired diff --git a/wpa_actiond/net-auto-wireless b/rc.d/net-auto-wireless index d6a3c44..d6a3c44 100755 --- a/wpa_actiond/net-auto-wireless +++ b/rc.d/net-auto-wireless diff --git a/scripts/net-profiles b/rc.d/net-profiles index cbaea30..cbaea30 100755 --- a/scripts/net-profiles +++ b/rc.d/net-profiles diff --git a/scripts/net-rename b/rc.d/net-rename index 1a51ffe..1a51ffe 100755 --- a/scripts/net-rename +++ b/rc.d/net-rename diff --git a/ifplugd/netcfg.action b/scripts/ifplugd.action index 0c081df..0c081df 100644 --- a/ifplugd/netcfg.action +++ b/scripts/ifplugd.action diff --git a/scripts/netcfg b/scripts/netcfg index 82a9618..9d341e5 100755 --- a/scripts/netcfg +++ b/scripts/netcfg @@ -2,7 +2,7 @@ . /usr/lib/network/network -NETCFG_VER=2.6.8 +NETCFG_VER=2.7 version() { diff --git a/wpa_actiond/netcfg-wpa_actiond b/scripts/netcfg-wpa_actiond index bb144c3..bb144c3 100755 --- a/wpa_actiond/netcfg-wpa_actiond +++ b/scripts/netcfg-wpa_actiond diff --git a/wpa_actiond/netcfg-wpa_actiond-action b/scripts/netcfg-wpa_actiond-action index 3547fef..3547fef 100755 --- a/wpa_actiond/netcfg-wpa_actiond-action +++ b/scripts/netcfg-wpa_actiond-action diff --git a/ifplugd/net-auto-wired.service b/systemd/net-auto-wired.service index b356fef..b356fef 100644 --- a/ifplugd/net-auto-wired.service +++ b/systemd/net-auto-wired.service diff --git a/wpa_actiond/net-auto-wireless.service b/systemd/net-auto-wireless.service index 7075cb5..7075cb5 100644 --- a/wpa_actiond/net-auto-wireless.service +++ b/systemd/net-auto-wireless.service |