diff options
| author | Jouke Witteveen <j.witteveen@gmail.com> | 2012-04-10 18:23:30 +0200 |
|---|---|---|
| committer | Jouke Witteveen <j.witteveen@gmail.com> | 2012-04-10 18:23:30 +0200 |
| commit | bc66a6906c5a1a55c5c9adc7c69f2370327db139 (patch) | |
| tree | e000150a4ff3494defad61b69fc765b05e7852b9 | |
| parent | 5d322f9f0ba3c68e56edd400662eb1ef39e22e6f (diff) | |
| download | netctl-bc66a6906c5a1a55c5c9adc7c69f2370327db139.tar.gz netctl-bc66a6906c5a1a55c5c9adc7c69f2370327db139.tar.xz | |
Remove multi-version support
Having multiple versions of netcfg around is not supported.
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | contrib/bash-completion | 1 | ||||
| -rw-r--r-- | contrib/zsh-completion | 2 | ||||
| -rwxr-xr-x | rc.d/net-profiles | 8 |
4 files changed, 6 insertions, 8 deletions
@@ -16,9 +16,8 @@ install: install-docs install -m755 src/hooks/* ${DESTDIR}/usr/lib/network/hooks/ # Scripts install -d $(DESTDIR)/usr/bin - install -m755 scripts/netcfg $(DESTDIR)/usr/bin/netcfg2 - -ln -s netcfg2 $(DESTDIR)/usr/bin/netcfg install -m755 \ + scripts/netcfg \ scripts/netcfg-menu \ scripts/netcfg-wpa_actiond \ scripts/netcfg-wpa_actiond-action \ diff --git a/contrib/bash-completion b/contrib/bash-completion index f7273aa..dab52ea 100644 --- a/contrib/bash-completion +++ b/contrib/bash-completion @@ -47,4 +47,3 @@ _netcfg () } complete -F _netcfg netcfg -complete -F _netcfg netcfg2 diff --git a/contrib/zsh-completion b/contrib/zsh-completion index 8d05ee4..e05e183 100644 --- a/contrib/zsh-completion +++ b/contrib/zsh-completion @@ -1,4 +1,4 @@ -#compdef netcfg netcfg2=netcfg +#compdef netcfg local -a disp all_options() { diff --git a/rc.d/net-profiles b/rc.d/net-profiles index e8b8bc7..be77bac 100755 --- a/rc.d/net-profiles +++ b/rc.d/net-profiles @@ -29,7 +29,7 @@ case "$1" in exit 0 fi elif [[ -n "$NET" ]]; then - if /usr/bin/netcfg2 check-iface "$NET"; then + if /usr/bin/netcfg check-iface "$NET"; then echo "$NET" > "$STATE_DIR/net-profiles" # JP: user may want to disconnect profile by calling net-profiles stop add_daemon net-profiles exit 0 @@ -44,14 +44,14 @@ case "$1" in # No NET= passed at boot, go to NETWORKS=() for network in "${NETWORKS[@]}"; do if [[ "$network" = "${network#@}" ]]; then - if /usr/bin/netcfg2 check-iface "$network"; then + if /usr/bin/netcfg check-iface "$network"; then echo "$network" >> "$STATE_DIR/net-profiles" add_daemon net-profiles fi else # It is up to the user to make sure no backgrounded profile # uses an interface that is used by another active profile. - if /usr/bin/netcfg2 "${network#@}"; then + if /usr/bin/netcfg "${network#@}"; then echo "${network#@}" >> "$STATE_DIR/net-profiles" add_daemon net-profiles fi >/dev/null & @@ -71,7 +71,7 @@ case "$1" in # shutdown any profiles started by netcfg (or from NET_PROFILES in rc.conf) # JP: only attempt to disconnect the profiles _this daemon_ was told to control while read profile; do - /usr/bin/netcfg2 down "$profile" + /usr/bin/netcfg down "$profile" done < "$STATE_DIR/net-profiles" rm -f "$STATE_DIR/net-profiles" rm_daemon net-profiles |