aboutsummaryrefslogtreecommitdiffstats
path: root/initscripts-s390.patch
diff options
context:
space:
mode:
authorFlorian La Roche <laroche@redhat.com>2001-08-11 10:40:03 +0000
committerFlorian La Roche <laroche@redhat.com>2001-08-11 10:40:03 +0000
commitc9eb848cc5a516e50842030d9778699f0b61d20a (patch)
tree618cc1ec364faae6d4f456b83db329b3cc7cc9b2 /initscripts-s390.patch
parentfe8bd8f45d62b6328d130be808f1de8c5a236357 (diff)
downloadinitscripts-c9eb848cc5a516e50842030d9778699f0b61d20a.tar
initscripts-c9eb848cc5a516e50842030d9778699f0b61d20a.tar.gz
initscripts-c9eb848cc5a516e50842030d9778699f0b61d20a.tar.bz2
initscripts-c9eb848cc5a516e50842030d9778699f0b61d20a.tar.xz
initscripts-c9eb848cc5a516e50842030d9778699f0b61d20a.zip
Forgot to do "cvs commit", so I have again incremented the version
number. 6.16 is still ok to build into the buildsystem, though.
Diffstat (limited to 'initscripts-s390.patch')
-rw-r--r--initscripts-s390.patch30
1 files changed, 9 insertions, 21 deletions
diff --git a/initscripts-s390.patch b/initscripts-s390.patch
index cad13c7c..08c503ab 100644
--- a/initscripts-s390.patch
+++ b/initscripts-s390.patch
@@ -65,37 +65,25 @@
# LVM initialization
if [ -e /proc/lvm -a -x /sbin/vgchange -a -f /etc/lvmtab ]; then
action $"Setting up LVM:" /sbin/vgscan && /sbin/vgchange -a y
-@@ -560,17 +585,25 @@
+@@ -576,21 +601,6 @@
if [ -x /usr/bin/passwd ]; then
/usr/bin/passwd root
fi
- if [ -x /usr/sbin/netconfig ]; then
- /usr/sbin/netconfig
-+
-+ # on S390 console we don't have newt
-+ if [ "`/bin/arch`" = "s390" ] ; then
-+ ARCH=".s390"
-+ else
-+ ARCH=""
-+ fi
-+
-+ if [ -x /usr/sbin/netconfig$ARCH ]; then
-+ /usr/sbin/netconfig$ARCH
- fi
+- fi
- if [ -x /usr/sbin/timeconfig ]; then
- /usr/sbin/timeconfig
-+ if [ -x /usr/sbin/timeconfig$ARCH ]; then
-+ /usr/sbin/timeconfig$ARCH
- fi
+- fi
+- if [ -x /usr/sbin/kbdconfig ]; then
+- /usr/sbin/kbdconfig
+- fi
- if [ -x /usr/sbin/authconfig ]; then
- /usr/sbin/authconfig --nostart
-+ if [ -x /usr/sbin/authconfig$ARCH ]; then
-+ /usr/sbin/authconfig$ARCH --nostart
- fi
+- fi
- if [ -x /usr/sbin/ntsysv ]; then
- /usr/sbin/ntsysv --level 35
-+ if [ -x /usr/sbin/ntsysv$ARCH ]; then
-+ /usr/sbin/ntsysv$ARCH --level 35
- fi
+- fi
# Reread in network configuration data.
+ if [ -f /etc/sysconfig/network ]; then