diff options
| -rw-r--r-- | initscripts.spec | 6 | ||||
| -rwxr-xr-x | rc.d/rc.sysinit | 26 |
2 files changed, 12 insertions, 20 deletions
diff --git a/initscripts.spec b/initscripts.spec index a5f21206..631806ce 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -10,6 +10,9 @@ BuildRoot: /var/tmp/initbld Requires: mingetty, bash, /bin/awk, /bin/sed, mktemp, e2fsprogs >= 1.15, console-tools Requires: procps, modutils >= 2.1.85-3, sysklogd >= 1.3.31 Requires: setup >= 2.0.3, psmisc +%ifarch alpha +Requires: util-linux >= 2.9w-26 +%endif Conflicts: kernel <= 2.2, timeconfig < 3.0, pppd < 2.3.9, wvdial < 1.40-3 Conflicts: initscripts < 1.22.1-5 Obsoletes: rhsound @@ -195,6 +198,9 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Wed Oct 27 1999 Bill Nottingham <notting@redhat.com> +- we now ship hwclock on alpha. + * Mon Oct 25 1999 Jakub Jelinek <jakub@redhat.com> - fix check for serial console, don't use -C argument to fsck on serial console. diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index 2726d2a8..c528375b 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -74,18 +74,10 @@ fi if grep "system serial" /proc/cpuinfo | grep -q MILO ; then ARC=true -else - SRM=true fi CLOCKDEF="" -if [ -x /sbin/hwclock ]; then - CLOCKFLAGS="--hctosys" - CLOCK=/sbin/hwclock -else - CLOCKFLAGS="-a" - CLOCK=/sbin/clock -fi +CLOCKFLAGS="--hctosys" case "$UTC" in yes|true) @@ -94,26 +86,20 @@ case "$UTC" in ;; esac -if [ "$CLOCK" = "/sbin/clock" ]; then - case "$ARC" in +case "$ARC" in yes|true) CLOCKFLAGS="$CLOCKFLAGS -A"; CLOCKDEF="$CLOCKDEF (arc)"; ;; - esac - case "$SRM" in +esac +case "$SRM" in yes|true) CLOCKFLAGS="$CLOCKFLAGS -S"; CLOCKDEF="$CLOCKDEF (srm)"; ;; - esac - if grep -q "Jensen" /proc/cpuinfo >/dev/null 2>&1 ; then - CLOCKFLAGS="$CLOCKFLAGS -J"; - CLOCKDEF="$CLOCKDEF (jensen)"; - fi -fi +esac -$CLOCK $CLOCKFLAGS +/sbin/hwclock $CLOCKFLAGS action "Setting clock $CLOCKDEF: `date`" date |