summaryrefslogtreecommitdiffstats
path: root/initscripts-s390.patch
blob: a0f68e5f6702c69de8ba72f114e093f17d7ac017 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
--- initscripts-6.40/rc.d/init.d/halt.s390init	Wed Sep  5 05:18:34 2001
+++ initscripts-6.40/rc.d/init.d/halt	Fri Sep 14 17:36:28 2001
@@ -115,7 +115,6 @@
      ;;
 esac
 
-runcmd $"Syncing hardware clock to system time" /sbin/hwclock $CLOCKFLAGS
 
 # Turn off swap, then unmount file systems.
 SWAPS=`awk '! /^Filename/ { print $1 }' /proc/swaps`
--- initscripts-6.40/rc.d/rc.sysinit.s390init	Sun Sep  9 09:00:54 2001
+++ initscripts-6.40/rc.d/rc.sysinit	Fri Sep 14 17:39:17 2001
@@ -105,9 +105,8 @@
      ;;
 esac
 
-/sbin/hwclock $CLOCKFLAGS
-
-action $"Setting clock $CLOCKDEF: `date`" date
+# System date on S390 is always set correctly
+action $"System date: `date` " date
 
 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.