summaryrefslogtreecommitdiffstats
path: root/src/netcfg-menu
diff options
context:
space:
mode:
authorJim Pryor <profjim@jimpryor.net>2009-08-11 14:04:52 +0200
committerJames Rayner <james@archlinux.org>2009-08-15 04:28:26 +0200
commitc0b4b19486aaa6e277c3344c40419225e085bd69 (patch)
tree22af58137e0ade6080f880340f853cb251f1fd57 /src/netcfg-menu
parente4271e46d3ddfe0a3dbaef66d51157bfd88ca2ff (diff)
downloadnetctl-c0b4b19486aaa6e277c3344c40419225e085bd69.tar.gz
netctl-c0b4b19486aaa6e277c3344c40419225e085bd69.tar.xz
Everyone use i/o functions from globals/hooks
Signed-off-by: Jim Pryor <profjim@jimpryor.net>
Diffstat (limited to 'src/netcfg-menu')
-rw-r--r--src/netcfg-menu7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/netcfg-menu b/src/netcfg-menu
index 8c58edc..3c800a1 100644
--- a/src/netcfg-menu
+++ b/src/netcfg-menu
@@ -1,7 +1,5 @@
#! /bin/bash
-. /etc/rc.conf
-. /etc/rc.d/functions
. /usr/lib/network/network
@@ -19,8 +17,7 @@ for prof in `find -L $PROFILE_DIR -maxdepth 1 -type f -printf "%f\n"|sort`; do
done
if [ ${#profiles} -eq 0 ]; then
- echo "No profiles were found in $PROFILE_DIR"
- return 1
+ exit_err "No profiles were found in $PROFILE_DIR"
fi
# if no default yet, use the first entry
@@ -52,7 +49,7 @@ case $ret in
netcfg2 $(cat $ANSWER)
;;
*) # Shouldnt happen
- echo "Abnormal ret code from dialog: $ret"
+ exit_err "Abnormal ret code from dialog: $ret"
;;
esac
rm $ANSWER