From 020f2072eb740830873be85d98b421839ff3960c Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Tue, 23 May 2006 19:28:54 +0000
Subject: integrate s390 patch - just check for hwclock before running it

---
 initscripts-s390.patch | 24 ------------------------
 1 file changed, 24 deletions(-)
 delete mode 100644 initscripts-s390.patch

(limited to 'initscripts-s390.patch')

diff --git a/initscripts-s390.patch b/initscripts-s390.patch
deleted file mode 100644
index edc295f4..00000000
--- a/initscripts-s390.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- 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
- 
--action $"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`" /bin/true
-+# System date on S390 is always set correctly
-+action $"System date: `date` " /bin/true
- 
- if [ "$CONSOLETYPE" = "vt" ]; then
-  # Load keymap
-- 
cgit v1.2.1