From 359dc6d0679ecb00063099f8915cd1b43a127d0a Mon Sep 17 00:00:00 2001 From: James Rayner Date: Sun, 31 Jan 2010 09:36:14 +1100 Subject: Add early checks for optional dependencies --- ifplugd/net-auto-wired | 5 +++++ src/netcfg-menu | 5 +++++ wpa_actiond/net-auto-wireless | 6 ++++++ 3 files changed, 16 insertions(+) diff --git a/ifplugd/net-auto-wired b/ifplugd/net-auto-wired index 12d1201..9af8505 100755 --- a/ifplugd/net-auto-wired +++ b/ifplugd/net-auto-wired @@ -3,6 +3,11 @@ . /etc/rc.conf . /etc/rc.d/functions +if [[ ! -x /usr/sbin/ifplugd ]]; then + echo "Please install 'ifplugd' to use net-auto-wired" + exit 1 +fi + CFG=/etc/ifplugd/ifplugd.conf ACTION=/etc/ifplugd/netcfg.action PIDFILE=/var/run/ifplugd.$WIRED_INTERFACE.pid diff --git a/src/netcfg-menu b/src/netcfg-menu index 505a91b..872d904 100644 --- a/src/netcfg-menu +++ b/src/netcfg-menu @@ -2,6 +2,11 @@ . /usr/lib/network/network +if [[ ! -x /usr/bin/dialog ]]; then + echo "Please install 'dialog' to use netcfg-menu" + exit 1 +fi + # JP: we'll use $STATE_DIR/menu to record what profile is being connected in this way rm -f "$STATE_DIR/menu" diff --git a/wpa_actiond/net-auto-wireless b/wpa_actiond/net-auto-wireless index 4f4c754..6dabde5 100755 --- a/wpa_actiond/net-auto-wireless +++ b/wpa_actiond/net-auto-wireless @@ -2,6 +2,12 @@ . /etc/rc.conf . /etc/rc.d/functions + +if [[ ! -x /usr/sbin/wpa_actiond ]]; then + echo "Please install 'wpa_actiond' to use net-auto-wireless" + exit 1 +fi + if [ -z "${WIRELESS_INTERFACE}" ]; then echo "No interface name set. Set it by adding WIRELESS_INTERFACE=\"your_interface\" to rc.conf" exit 1 -- cgit v1.2.3-24-g4f1b