aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--initscripts-s390.patch10
-rw-r--r--initscripts.spec4
-rw-r--r--inittab.s3901
3 files changed, 4 insertions, 11 deletions
diff --git a/initscripts-s390.patch b/initscripts-s390.patch
index a0f68e5f..e9a46146 100644
--- a/initscripts-s390.patch
+++ b/initscripts-s390.patch
@@ -22,13 +22,3 @@
if [ "`/sbin/consoletype`" = "vt" ]; then
# Load keymap
-@@ -321,6 +326,9 @@
- else
- action $"Skipping ISA PNP configuration at users request: " /bin/true
- fi
-+else
-+ # No /sbin/isapnp => no PNP
-+ PNP=
- fi
-
- # Remount the root filesystem read-write.
diff --git a/initscripts.spec b/initscripts.spec
index e30807c6..a1819096 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -246,6 +246,10 @@ rm -rf $RPM_BUILD_ROOT
%ghost %attr(0664,root,utmp) /var/run/utmp
%changelog
+* Mon Apr 21 2003 Florian La Roche <Florian.LaRoche@redhat.de>
+- initscripts-s390.patch: remove not needed parts about PNP=
+- inittab.390: sync with normal version
+
* Fri Apr 18 2003 Florian La Roche <Florian.LaRoche@redhat.de>
- sysconfig/init.s390: set LOGLEVEL=3 as for other archs
- rc.d/init.d/network, rc.d/rc: change confirmation mode to
diff --git a/inittab.s390 b/inittab.s390
index d011477f..6c0a7ee1 100644
--- a/inittab.s390
+++ b/inittab.s390
@@ -45,5 +45,4 @@ pr:12345:powerokwait:/sbin/shutdown -c "Power Restored; Shutdown Cancelled"
1:2345:respawn:/sbin/mingetty console --noclear
# Run xdm in runlevel 5
-# xdm is now a separate service
x:5:respawn:/etc/X11/prefdm -nodaemon