aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2006-05-23 19:28:54 +0000
committerBill Nottingham <notting@redhat.com>2006-05-23 19:28:54 +0000
commit020f2072eb740830873be85d98b421839ff3960c (patch)
tree699e266819c18a2ce41be5e36d9c552199325f33
parent9706e39ef0c1da41b351d4a59fed7f409874eb4c (diff)
downloadinitscripts-020f2072eb740830873be85d98b421839ff3960c.tar
initscripts-020f2072eb740830873be85d98b421839ff3960c.tar.gz
initscripts-020f2072eb740830873be85d98b421839ff3960c.tar.bz2
initscripts-020f2072eb740830873be85d98b421839ff3960c.tar.xz
initscripts-020f2072eb740830873be85d98b421839ff3960c.zip
integrate s390 patch - just check for hwclock before running it
-rw-r--r--initscripts-s390.patch24
-rw-r--r--initscripts.spec4
-rwxr-xr-xrc.d/init.d/halt2
-rwxr-xr-xrc.d/rc.sysinit2
4 files changed, 2 insertions, 30 deletions
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
diff --git a/initscripts.spec b/initscripts.spec
index da72bc22..19ad5105 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -6,7 +6,6 @@ Group: System Environment/Base
Release: 1
Source: initscripts-%{version}.tar.bz2
URL: http://fedora.redhat.com/projects/additional-projects/initscripts/
-Patch0: initscripts-s390.patch
BuildRoot: /%{_tmppath}/%{name}-%{version}-%{release}-root
Requires: mingetty, /bin/awk, /bin/sed, mktemp, e2fsprogs >= 1.15
Requires: /sbin/sysctl, syslog
@@ -37,9 +36,6 @@ deactivate most network interfaces.
%prep
%setup -q
-%ifarch s390 s390x
-%patch0 -p1 -b .s390init
-%endif
%build
make
diff --git a/rc.d/init.d/halt b/rc.d/init.d/halt
index d1ff19bf..60485da7 100755
--- a/rc.d/init.d/halt
+++ b/rc.d/init.d/halt
@@ -111,7 +111,7 @@ case "$SRM" in
;;
esac
-action $"Syncing hardware clock to system time" /sbin/hwclock $CLOCKFLAGS
+[ -x /sbin/hwclock ] && action $"Syncing hardware clock to system time" /sbin/hwclock $CLOCKFLAGS
# Try to unmount tmpfs filesystems to avoid swapping them in. Ignore failures.
tmpfs=$(awk '$2 ~ /^\/($|proc|dev)/ { next; }
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index c5278f0b..9e73cc27 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -140,7 +140,7 @@ case "$SRM" in
CLOCKDEF="$CLOCKDEF (srm)" ;;
esac
-/sbin/hwclock $CLOCKFLAGS
+[ -x /sbin/hwclock ] && /sbin/hwclock $CLOCKFLAGS
action $"Setting clock $CLOCKDEF: `date`" /bin/true