- Arch-projects - lists.archlinux.org

[arch-projects] [PATCH] Make hwclock --adjust as well as --systohc optional (FS#13684)
by Kurt J. Bosch 28 Mar '11

28 Mar '11

This turns all hardware clock write access (setting and adjusting) the into an optional daemon. (FS#13684) Should fix issues when using ntpd (kernel 11-minute-mode) and also in case of dual-boot. Further more the out of box HARDWARECLOCK setting is changed to "UTC" and "localtime" is discouraged because it can really mess up things especially with 'hwclock --adjust'. For previous discussion see https://bugs.archlinux.org/task/13684 From 39d86d1d831210aca9f592eed5555389b2216d7c Mon Sep 17 00:00:00 2001 From: Kurt J. Bosch <kjb-temp-2009(a)alpenjodel.de> Date: Mon, 28 Mar 2011 15:01:43 +0200 Subject: [PATCH] Make hwclock --adjust as well as --systohc optional (FS#13684) --- adjtime.cron | 2 +- hwclock | 39 +++++++++++++++++++++++++++++++++++++++ install.sh | 2 +- rc.conf | 8 ++++++-- rc.shutdown | 13 ++----------- rc.sysinit | 27 +++------------------------ 6 files changed, 52 insertions(+), 39 deletions(-) create mode 100644 hwclock diff --git a/adjtime.cron b/adjtime.cron index a876506..7691aa5 100755 --- a/adjtime.cron +++ b/adjtime.cron @@ -10,6 +10,6 @@ case $HARDWARECLOCK in *) HWCLOCK_PARAMS="";; esac -if [[ $HWCLOCK_PARAMS ]]; then +if [[ $HWCLOCK_PARAMS && -f /var/daemons/hwclock ]]; then /sbin/hwclock $HWCLOCK_PARAMS fi diff --git a/hwclock b/hwclock new file mode 100644 index 0000000..d584276 --- /dev/null +++ b/hwclock @@ -0,0 +1,39 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case $HARDWARECLOCK in + UTC) HWCLOCK_PARAMS="--utc";; + localtime) HWCLOCK_PARAMS="--localtime";; + *) HWCLOCK_PARAMS="";; +esac + +case "$1" in + start) + if [[ $HWCLOCK_PARAMS ]]; then + status "Adjusting Hardware Clock" \ + /sbin/hwclock --adjust + stat_busy "Setting System Clock" + /sbin/hwclock --hctosys $HWCLOCK_PARAMS || stat_die + stat_done + # Note: This also enables /etc/cron.hourly/adjtime + add_daemon clock + fi + ;; + stop) + if [[ $HWCLOCK_PARAMS ]]; then + stat_busy "Saving System Clock" + /sbin/hwclock --systohc $HWCLOCK_PARAMS || stat_die + stat_done + fi + rm_daemon clock + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac diff --git a/install.sh b/install.sh index 2b2cbbc..8e6c3d7 100755 --- a/install.sh +++ b/install.sh @@ -15,7 +15,7 @@ done install -D -m755 adjtime.cron ${DESTDIR}/etc/cron.hourly/adjtime install -D -m644 functions ${DESTDIR}/etc/rc.d/functions || exit 1 -for i in network netfs; do +for i in hwclock network netfs; do install -D -m755 $i ${DESTDIR}/etc/rc.d/$i || exit 1 done diff --git a/rc.conf b/rc.conf index d2b0517..02bb1d7 100644 --- a/rc.conf +++ b/rc.conf @@ -11,6 +11,7 @@ # process. If set to 'no', the C locale will be used. # HARDWARECLOCK: set to "UTC" or "localtime", any other value will result # in the hardware clock being left untouched (useful for virtualization) +# Note: Using "localtime" is discouraged. # TIMEZONE: timezones are found in /usr/share/zoneinfo # KEYMAP: keymaps are found in /usr/share/kbd/keymaps # CONSOLEFONT: found in /usr/share/kbd/consolefonts (only needed for non-US) @@ -19,7 +20,7 @@ # LOCALE="en_US.UTF-8" DAEMON_LOCALE="no" -HARDWARECLOCK="localtime" +HARDWARECLOCK="UTC" TIMEZONE="Canada/Pacific" KEYMAP="us" CONSOLEFONT= @@ -105,4 +106,7 @@ NETWORK_PERSIST="no" # - prefix a daemon with a ! to disable it # - prefix a daemon with a @ to start it up in the background # -DAEMONS=(syslog-ng network netfs crond) +# If something other takes care of your hardware clock (ntpd, dual-boot...) +# you should disable 'hwclock' here. +# +DAEMONS=(hwclock syslog-ng network netfs crond) diff --git a/rc.shutdown b/rc.shutdown index 0acca49..fef1117 100755 --- a/rc.shutdown +++ b/rc.shutdown @@ -35,21 +35,12 @@ fi /bin/dd if=/dev/urandom of=$RANDOM_SEED count=1 bs=$POOL_SIZE &> /dev/null stat_done -stat_busy "Saving System Clock" if [[ $TIMEZONE && -e /usr/share/zoneinfo/$TIMEZONE ]]; then /bin/rm -f /etc/localtime - /bin/cp "/usr/share/zoneinfo/$TIMEZONE" /etc/localtime + status "Saving Time Zone" \ + /bin/cp "/usr/share/zoneinfo/$TIMEZONE" /etc/localtime fi -HWCLOCK_PARAMS="--systohc" -case $HARDWARECLOCK in - UTC) HWCLOCK_PARAMS="$HWCLOCK_PARAMS --utc";; - localtime) HWCLOCK_PARAMS="$HWCLOCK_PARAMS --localtime";; - *) HWCLOCK_PARAMS="";; -esac -[[ $HWCLOCK_PARAMS ]] && /sbin/hwclock $HWCLOCK_PARAMS -stat_done - # removing psmouse module to fix some reboot issues on newer laptops /sbin/modprobe -r psmouse >/dev/null 2>&1 diff --git a/rc.sysinit b/rc.sysinit index 9797611..e949180 100755 --- a/rc.sysinit +++ b/rc.sysinit @@ -66,7 +66,7 @@ if [[ $HWCLOCK_PARAMS ]]; then # configured timezone. Any new timezone put in rc.conf is copied over at # a later time. # This does *NOT* take into account a time adjustment file as /var may not be - # mounted yet. A second set occurs later to match rc.conf. + # mounted yet. A second set may occur in rc.d/hwclock to match rc.conf. if [[ -f /etc/localtime ]]; then /sbin/hwclock $HWCLOCK_PARAMS --noadjfile fi @@ -304,28 +304,12 @@ status "Retrying failed UDev events" /sbin/udevadm trigger --action=add --type=f status "Activating Swap" /sbin/swapon -a -stat_busy "Configuring System Clock" if [[ $TIMEZONE && -e /usr/share/zoneinfo/$TIMEZONE ]]; then /bin/rm -f /etc/localtime - /bin/cp "/usr/share/zoneinfo/$TIMEZONE" /etc/localtime + status "Configuring Time Zone" \ + /bin/cp "/usr/share/zoneinfo/$TIMEZONE" /etc/localtime fi -clock_pid="" -if [[ $HWCLOCK_PARAMS ]]; then - # This time, we set the clock for real. Use the adjustment file now that - # /var will definitely be available, and then set the system clock once - # the hardware clock has been adjusted accordingly. The backgrounding magic - # is due to the fact that the second call to hwclock will almost always - # take ~1 second because of the clock granularity, and we might as well - # stay busy. - ( - /sbin/hwclock --adjust - /sbin/hwclock $HWCLOCK_PARAMS - ) & - clock_pid=$! -fi -stat_done - RANDOM_SEED=/var/lib/misc/random-seed if [[ -f $RANDOM_SEED ]]; then stat_busy "Initializing Random Seed" @@ -398,11 +382,6 @@ set_consolefont /bin/dmesg >| /var/log/dmesg.log -# final hwclock setting needs to be done at this point -if [[ $clock_pid ]]; then - wait $clock_pid -fi - run_hook sysinit_end # End of file -- 1.7.0.3

3 6

[arch-projects] Dear arch-projects@archlinux.org June 83% 0FF
by VIAGRA � Official Site 29 Jun '08

29 Jun '08

1 0

[arch-projects] December 77% OFF
by VIAGRA � Official Site 05 Dec '07

05 Dec '07

1 0

[arch-projects] November 71% OFF
by VIAGRA � Official Site 04 Nov '07

04 Nov '07

2 1

[arch-projects] Modified projects.archlinux.org git repo
by Simo Leone 31 Oct '07

31 Oct '07

I deleted the "origin" branch, as this doesn't belong in a repo such as this one (and it was a subset of master anyway, no loss). Just a heads up. Also, I'm wondering about what the different branches in there are intended for. There are master, testing, and stable. Most git projects are set up where master is what would be considered 'stable', that's why I'm wondering. -- Simo Leone Arch Linux Developer

7 15

[arch-projects] [AUR] More AUR Progress
by tardo 29 Oct '07

29 Oct '07

In between the wee hours of the night, a few us has been patching the current AUR feverishly.. ok enough with the introductions, you know how we do this =] For those interested, a very unhelpful log of changes: http://git.nagi-fanboi.net/?p=aur.git;a=shortlog;h=testing The major and minor changes: - [Almost] complete separation of code and markup - XHTML validation on all [almost] pages - CSS validation on all pages - Completely re-written packages.php, pkgfuncs.inc, new pkgdetails.php - packages.php now ONLY serves as a search page - pkgdetails.php is ONLY used for pkgdetails. -- pkgdetails accepts two paramters, ID for the db pkg id, and name, an explicit way to search for a specific package -- e.g. aur/pkgdetails.php?ID=2501, or aur/pkgdetails.php?name=amarok-svn - pkgfuncs.inc has been heavily modified to include common functions from both - Universal login and search boxes - Annoying timeout problem [partially] fixed... now it just drops you to the home page without being logged in - Lots and lots of tiny bug fixes and cosmetic changes - My old (or new) pkgbuild parsing script still lives Here's a test site for the few, the chosen, the brave: http://aur.nagi-fanboi.net/ I'd write more, but I'll let you guys give the feedback. - tardo

4 9

[arch-projects] [AUR] Querying package ID from main repo
by tardo 26 Oct '07

26 Oct '07

I'd really like to be able to pull package ID numbers from the main site DB and put that in the AUR. From what I see, it seems like a simple SELECT statement (prefixed by a db_connect() or select_db() if on the same host). It's pretty trivial, and since handing out dumps of the main repo db just seems to be a no-no, how about someone look through the main site's code and finding that statement and throwing it in? For the record, I don't care about searching for packages on the search page, just being able to pull the ID of the package so I can provide a good link to the dependencies is enough (current method just searches, seems kinda half-assed). If I had a db dump/site code, here's sort of what I'd implement: db_connect( ... ); $q = "SELECT ID FROM Packages WHERE Name = 'pkgname'"; // table/columns may differ db_query($q); that should give a numerical result which I can link directly to on the package page, eg http://archlinux.org/packages/13418 If anyone can pull out the package ID, i can show what to change in the AUR (trivial really). - tardo

3 4

Re: [arch-projects] [tur-users] Mailing list name change/modifications
by Loui 24 Oct '07

24 Oct '07

Has someone complained about traffic on arch-projects? I think we should still keep arch-projects for general archlinux projects, especially for those projects which aren't 'hot' like AUR is right now. I'd be kind of annoying to have 1001 low-traffic MLs. I think. I guess renaming tur-users would make sense since 'trusted user repositories' don't really exist any more other than [community]

1 0

[arch-projects] fyi: moved my aur repo
by eliott 23 Oct '07

23 Oct '07

For those tracking my repo.... I moved it to my domain. git://code.cactuswax.net/aur.git/ I don't have gitweb up yet.

1 0

[arch-projects] AurJSON code.
by eliott 20 Oct '07

20 Oct '07

I finally got around to buttoning up my AurJSON code, and pused it to my master repo. I updated the 'example' clients that I had slapped together a little bit too. http://archlinux.org/~eliott/zomgstuff/rpc_examples.tar.gz Check it out. http://projects.archlinux.org/git/?p=aur-eliott.git;a=commit;h=7042f10a7b23… Let me know what you think.

3 4