From e2c4a6ceaf60f38c23d24cc96709b38d21914efa Mon Sep 17 00:00:00 2001 From: Joachim Nilsson Date: Thu, 13 Sep 2012 20:25:15 +0200 Subject: [PATCH] Remove optional --directisa call to hwclock, this is the default anyway. This is a followup to Olivier Blin's patch from 88ffb93 in that it applies the same patch to finit-mod.c that is already in finit.c, or finit-alt.c as it was called then. Also, the optional --directisa argument to hwclock is not necessary. The hwclock utility has a built-in fallback to use excplicit I/O over the /dev/rtc in case the latter does not exist. See the hwclock(8) man page for more information on this. Signed-off-by: Joachim Nilsson --- Makefile | 5 ----- contrib/Makefile.gdium | 5 ----- finit-mod.c | 14 ++------------ finit.c | 10 ++-------- 4 files changed, 4 insertions(+), 30 deletions(-) diff --git a/Makefile b/Makefile index 9e05060d..ef23f700 100644 --- a/Makefile +++ b/Makefile @@ -25,11 +25,6 @@ CFLAGS += -U_FORTIFY_SOURCE # Omit the first /sbin/hwclock if CONFIG_RTC_HCTOSYS is enabled in the kernel #CFLAGS += -DNO_HCTOSYS -# Append -directisa to /sbin/hwclock lines if the user has disabled -# CONFIG_GENRTC and enabled CONFIG_RTC but not enabled CONFIG_HPET_TIMER -# and CONFIG_HPET_RTC_IRQ. -#CFLAGS += -DDIRECTISA - # Use built-in run-parts instead of /bin/run-parts CFLAGS += -DBUILTIN_RUNPARTS diff --git a/contrib/Makefile.gdium b/contrib/Makefile.gdium index fc3ab9e9..451dd432 100644 --- a/contrib/Makefile.gdium +++ b/contrib/Makefile.gdium @@ -22,11 +22,6 @@ BINS = finit-mod finit finit-mdv #finit-exb # Omit the first /sbin/hwclock if CONFIG_RTC_HCTOSYS is enabled in the kernel CFLAGS += -DNO_HCTOSYS -# Append -directisa to /sbin/hwclock lines if the user has disabled -# CONFIG_GENRTC and enabled CONFIG_RTC but not enabled CONFIG_HPET_TIMER -# and CONFIG_HPET_RTC_IRQ. -#CFLAGS += -DDIRECTISA - # Use built-in run-parts instead of /bin/run-parts CFLAGS += -DBUILTIN_RUNPARTS diff --git a/finit-mod.c b/finit-mod.c index a2968d03..5d8f9060 100644 --- a/finit-mod.c +++ b/finit-mod.c @@ -64,12 +64,6 @@ Changelog from the original Eeepc fastinit: #include "helpers.h" -#ifdef DIRECTISA -#define HWCLOCK_DIRECTISA " --directisa" -#else -#define HWCLOCK_DIRECTISA -#endif - /* From sysvinit */ /* Set a signal handler. */ @@ -160,12 +154,8 @@ int main() /* * Time adjustments */ - if ((fd = open("/etc/adjtime", O_CREAT|O_WRONLY|O_TRUNC, 0644)) >= 0) { - write(fd, "0.0 0 0.0\n", 10); - close(fd); - } #ifndef NO_HCTOSYS - system("/sbin/hwclock --hctosys --localtime" HWCLOCK_DIRECTISA); + system("/sbin/hwclock --hctosys"); #endif /* @@ -291,7 +281,7 @@ void shutdown(int sig) sleep(2); system("/usr/sbin/alsactl store > /dev/null 2>&1"); - system("/sbin/hwclock --systohc --localtime" HWCLOCK_DIRECTISA); + system("/sbin/hwclock --systohc"); kill(-1, SIGKILL); diff --git a/finit.c b/finit.c index c6196daa..74ecccf2 100644 --- a/finit.c +++ b/finit.c @@ -77,12 +77,6 @@ THE SOFTWARE. #define USE_ETC_RESOLVCONF_RUN #endif -#ifdef DIRECTISA -#define HWCLOCK_DIRECTISA " --directisa" -#else -#define HWCLOCK_DIRECTISA -#endif - /* From sysvinit */ /* Set a signal handler. */ @@ -397,7 +391,7 @@ int main() */ _d("adjust clock"); #ifndef NO_HCTOSYS - system("/sbin/hwclock --hctosys" HWCLOCK_DIRECTISA); + system("/sbin/hwclock --hctosys"); #endif /* @@ -590,7 +584,7 @@ void shutdown(int sig) sleep(2); system("/usr/sbin/alsactl store > /dev/null 2>&1"); - system("/sbin/hwclock --systohc" HWCLOCK_DIRECTISA); + system("/sbin/hwclock --systohc"); kill(-1, SIGKILL);