747fc5d5f
Mike Frysinger
2005-09-28
Subject
allow people to adjtime location
SOURCE BUG
This commit was genuinely broken at the time (not related to our build system): scripts/config/mkconfigs.c (2005-08-01 - 2006-10-05 arasi) uretilen bbconfigopts.h icine .config satirlarini kacissiz, ham newline'larla gömüyordu - gecerli C degildi, busybox'un kendi bb_mkdep araci bile parse edemiyordu (7d219aab7 ile duzeltildi, mkconfigs shell scripte cevrildi)
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
util-linux/Config.in+12 -0
| @@ -208,6 +208,18 @@ config CONFIG_FEATURE_HWCLOCK_LONGOPTIONS | |
| are overly fond of its long options, such as --hctosys, --utc, etc) | |
| then enable this option. | |
| + | config CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS |
| + | bool " Use FHS /var/lib/hwclock/adjtime" |
| + | default y |
| + | depends on CONFIG_HWCLOCK |
| + | help |
| + | Starting with FHS 2.3, the adjtime state file is supposed to exist |
| + | at /var/lib/hwclock/adjtime instead of /etc/adjtime. If you wish |
| + | to use the FHS behavior, answer Y here, otherwise answer N for the |
| + | classic /etc/adjtime path. |
| + | |
| + | http://www.pathname.com/fhs/pub/fhs-2.3.html#VARLIBHWCLOCKSTATEDIRECTORYFORHWCLO |
| + | |
| config CONFIG_IPCRM | |
| bool "ipcrm" | |
| default n | |
util-linux/hwclock.c+6 -2
| @@ -155,11 +155,15 @@ static int from_sys_clock(int utc) | |
| return 0; | |
| } | |
| - | |
| + | #ifdef CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS |
| + | # define ADJTIME_PATH "/var/lib/hwclock/adjtime" |
| + | #else |
| + | # define ADJTIME_PATH "/etc/adjtime" |
| + | #endif |
| static int check_utc(void) | |
| { | |
| int utc = 0; | |
| - | FILE *f = fopen ( "/var/lib/hwclock/adjtime", "r" ); |
| + | FILE *f = fopen ( ADJTIME_PATH, "r" ); |
| if ( f ) { | |
| char buffer [128]; | |