aboutsummaryrefslogtreecommitdiffstats
path: root/sysconfig
diff options
context:
space:
mode:
Diffstat (limited to 'sysconfig')
-rw-r--r--sysconfig/init2
-rw-r--r--sysconfig/init.s3904
-rwxr-xr-xsysconfig/network-scripts/ifup-ppp2
-rw-r--r--sysconfig/network-scripts/network-functions7
4 files changed, 6 insertions, 9 deletions
diff --git a/sysconfig/init b/sysconfig/init
index 1ffeaea6..a1b03f04 100644
--- a/sysconfig/init
+++ b/sysconfig/init
@@ -19,5 +19,3 @@ SETCOLOR_WARNING="echo -en \\033[0;33m"
SETCOLOR_NORMAL="echo -en \\033[0;39m"
# default kernel loglevel on boot (syslog will reset this)
LOGLEVEL=3
-# Set to anything other than 'no' to allow hotkey interactive startup...
-PROMPT=yes
diff --git a/sysconfig/init.s390 b/sysconfig/init.s390
index 79955f07..f3266798 100644
--- a/sysconfig/init.s390
+++ b/sysconfig/init.s390
@@ -2,6 +2,8 @@
# verbose => old-style bootup
# anything else => new style bootup without ANSI colors or positioning
BOOTUP=serial
+# Turn on graphical boot
+GRAPHICAL=no
# column to start "[ OK ]" label in
RES_COL=60
# terminal sequence to move to that column. You could change this
@@ -17,5 +19,3 @@ SETCOLOR_WARNING=
SETCOLOR_NORMAL=
# default kernel loglevel on boot (syslog will reset this)
LOGLEVEL=3
-# Set to anything other than 'no' to allow hotkey interactive startup...
-PROMPT=no
diff --git a/sysconfig/network-scripts/ifup-ppp b/sysconfig/network-scripts/ifup-ppp
index 3d26ebe8..2e7e8184 100755
--- a/sysconfig/network-scripts/ifup-ppp
+++ b/sysconfig/network-scripts/ifup-ppp
@@ -11,7 +11,7 @@ if [ "${1}" = daemon ] ; then
shift
else
# just in case a full path to the configuration file is passed in
- CONFIG=$(basename $1)
+ CONFIG=${1##*/} # CONFIG=$(basename $1)
[ -f "${CONFIG}" ] || CONFIG=ifcfg-${1}
source_config
# don't start ppp-watch by xDSL
diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions
index 249978a6..5b9429d2 100644
--- a/sysconfig/network-scripts/network-functions
+++ b/sysconfig/network-scripts/network-functions
@@ -32,11 +32,10 @@ need_config ()
source_config ()
{
- DEVNAME=`basename $CONFIG | sed 's/^ifcfg-//g'`
-
- if basename $CONFIG | grep -q '[^g]-' ; then
+ DEVNAME=${CONFIG##*/ifcfg-} #DEVNAME=`basename $CONFIG | sed 's/^ifcfg-//g'`
+ if echo ${CONFIG##*/} | grep -q '[^g]-' ; then
PARENTCONFIG=`echo $CONFIG | sed 's/-[^-]*$//g'`
- PARENTDEVNAME=`basename $PARENTCONFIG | sed 's/^ifcfg-//g'`
+ PARENTDEVNAME=${PARENTCONFIG##*/ifcfg-}
[ -f $PARENTCONFIG ] || {
echo $"Missing config file $PARENTCONFIG." >&2
exit 1