Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at Mon Apr 20 16:24:29 CEST 2009. -------- --- aaa_base/aaa_base.changes 2009-04-17 19:03:19.000000000 +0200 +++ /mounts/work_src_done/STABLE/aaa_base/aaa_base.changes 2009-04-20 15:44:54.001935000 +0200 @@ -1,0 +2,15 @@ +Mon Apr 20 15:44:25 CEST 2009 - coolo@suse.de + +- boot.ldconfig: remove most of the checks / run ldconfig way less +- boot.localfs: STOP preload during fsck calls + +------------------------------------------------------------------- +Mon Apr 20 14:50:34 CEST 2009 - werner@suse.de + +- boot.clock: make status argument work and add argument timezone +- boot.clock: for s390 make date command accurate as possible +- Rename mkinitrd script setup-rtc.sh to setup-clock.sh and + add boot-clock.sh, also check for including boot-rtc.sh the + existence of the rtc_cmos module to avoid fatal errors + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.G25728/_old 2009-04-20 16:23:36.000000000 +0200 +++ /var/tmp/diff_new_pack.G25728/_new 2009-04-20 16:23:36.000000000 +0200 @@ -28,7 +28,7 @@ PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/ls /bin/date /usr/bin/cmp /bin/fillup /sbin/insserv udev net-tools AutoReqProv: on Version: 11.2 -Release: 20 +Release: 21 Summary: SUSE Linux Base Package BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: aaa_base.tar.bz2 @@ -139,6 +139,15 @@ %defattr(-,root,root) %changelog +* Mon Apr 20 2009 coolo@suse.de +- boot.ldconfig: remove most of the checks / run ldconfig way less +- boot.localfs: STOP preload during fsck calls +* Mon Apr 20 2009 werner@suse.de +- boot.clock: make status argument work and add argument timezone +- boot.clock: for s390 make date command accurate as possible +- Rename mkinitrd script setup-rtc.sh to setup-clock.sh and + add boot-clock.sh, also check for including boot-rtc.sh the + existence of the rtc_cmos module to avoid fatal errors * Fri Apr 17 2009 werner@suse.de - boot.clock: write system time only back to HW clock if kernel time status shows that clocks are unsynchronized ++++++ aaa_base.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/init.d/boot.clock new/aaa_base/etc/init.d/boot.clock --- old/aaa_base/etc/init.d/boot.clock 2009-04-17 19:20:09.000000000 +0200 +++ new/aaa_base/etc/init.d/boot.clock 2009-04-20 14:47:11.000000000 +0200 @@ -45,8 +45,8 @@ # write system time back to HW clock, bug bnc#492921. # ELEVENMIN_MODE=no -typeset -i status=$(adjtimex --print | sed -rn '/^[[:space:]]*status:/{ s/.*([0-9]+)/\1/p; }') -test $((status & 65)) -eq 1 && ELEVENMIN_MODE=yes +typeset -i STA_CLOCK=$(adjtimex --print | sed -rn '/^[[:blank:]]*status:/{ s/[^[:digit:]]*([[:digit:]]+)/\1/p; }') +test $((STA_CLOCK & 65)) -eq 1 && ELEVENMIN_MODE=yes # # Without having rtc_cmos module loaded hwclock will fail on at least x86 @@ -89,7 +89,7 @@ rc_reset case "$1" in - start|restart) + start|restart|reload|force-reload) # # mkinitrd will set this variable if the system time was older than # the mkinitrd.rpm build time. @@ -98,11 +98,6 @@ rc_status -s rc_exit fi - if test "$ELEVENMIN_MODE" = yes ; then - echo "The System Time is in sync with Hardware Clock ${stat}${done}good${norm}" - rc_status - rc_exit - fi if test "$USE_HWCLOCK" != yes ; then echo -n Setting up the System Clock @@ -126,9 +121,11 @@ # settimeofday, and it only works as long as $0 is executed # exactly once, at boot. + unset TZ + case "$HWCLOCK" in *-l*) - date $(date -u +'%m%d%H%M%Y.%S') + date --set "$(date --utc +'%Y-%m-%d %H:%M:%S.%N')" rc_status ;; esac @@ -144,6 +141,11 @@ rc_status -v rc_exit fi + if test "$ELEVENMIN_MODE" = yes ; then + echo "The System Time is in sync with Hardware Clock ${stat}${done}good${norm}" + rc_status + rc_exit + fi # # Set and adjust the hardware clock # @@ -190,12 +192,21 @@ rc_status -v fi ;; + timezone) + echo -n "Set Hardware Clock to the current System Time" + if test "$USE_HWCLOCK" = yes ; then + /sbin/hwclock --systohc $HWCLOCK --noadjfile + else + rc_status -u + fi + ;; status) - rc_failed 4 - rc_status -v + echo -n "Current Hardware Clock: " + /sbin/hwclock --show + rc_status -v1 ;; *) - echo "Usage: $0 {start|stop|status|restart}" + echo "Usage: $0 {start|stop|status|restart|reload|force-reload|timezone}" exit 1 ;; esac diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/init.d/boot.ldconfig new/aaa_base/etc/init.d/boot.ldconfig --- old/aaa_base/etc/init.d/boot.ldconfig 2008-07-22 11:47:20.000000000 +0200 +++ new/aaa_base/etc/init.d/boot.ldconfig 2009-04-20 15:40:47.000000000 +0200 @@ -30,29 +30,6 @@ LDCONFIG_NEEDED=false test -s /etc/ld.so.cache || LDCONFIG_NEEDED=true test "$run_ldconfig" = true && LDCONFIG_NEEDED=true - test -x /usr/bin/find -a "$LDCONFIG_NEEDED" = false && { - for DUMMY in `/usr/bin/find /etc/ld.so.cache -mtime +30` ; do - LDCONFIG_NEEDED=true - done - } - LIBDIRS="/lib /usr/lib /usr/local/lib" - test -s /etc/ld.so.conf && { - for DIR in `cat /etc/ld.so.conf` ; do - case $DIR in - /*) - test -d "$DIR" && LIBDIRS="$LIBDIRS $DIR" - ;; - esac - done - } - for DIR in $LIBDIRS ; do - test $DIR -nt /etc/ld.so.cache && { - LDCONFIG_NEEDED=true - break - } - done - # cache is corrupt? - /sbin/ldconfig -p > /dev/null 2>&1 || LDCONFIG_NEEDED=true test -x /sbin/ldconfig -a "$LDCONFIG_NEEDED" = true && { echo -n "Setting up linker cache (/etc/ld.so.cache) using ldconfig" { /sbin/ldconfig -X 2>/dev/null || \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/init.d/boot.localfs new/aaa_base/etc/init.d/boot.localfs --- old/aaa_base/etc/init.d/boot.localfs 2008-12-10 14:21:30.000000000 +0100 +++ new/aaa_base/etc/init.d/boot.localfs 2009-04-20 15:44:01.000000000 +0200 @@ -161,12 +161,15 @@ else FSCK_OPTS="$FSCK_OPTS -V" fi + preload=$(pidof preload) + test -n "$preload" && kill -STOP $preload echo "Checking file systems..." fsck $FSCK_OPTS # A return code of 1 indicates that file system errors # were corrected, but that the boot may proceed. # A return code of 2 or larger indicates failure. FSCK_RETURN=$? + test -n "$preload" && kill -CONT $preload test $FSCK_RETURN -lt 4 rc_status -v1 -r if test $FSCK_RETURN -gt 1 -a $FSCK_RETURN -lt 4 ; then diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/lib/mkinitrd/scripts/boot-clock.sh new/aaa_base/lib/mkinitrd/scripts/boot-clock.sh --- old/aaa_base/lib/mkinitrd/scripts/boot-clock.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/aaa_base/lib/mkinitrd/scripts/boot-clock.sh 2009-04-20 14:26:49.000000000 +0200 @@ -0,0 +1,22 @@ +#!/bin/bash +# +#%stage: boot +#%depends: start rtc +#%provides: clock +#%programs: /bin/date +#%dontshow + +if test -e /etc/sysconfig/clock +then + . /etc/sysconfig/clock + case "$HWCLOCK" in + *-l*) + date --set "$(date --utc +'%Y-%m-%d %H:%M:%S.%N')" > /dev/null + ;; + esac +fi +if test -e /etc/localtime +then + echo -n 'System time: ' + date --rfc-822 +fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/lib/mkinitrd/scripts/boot-rtc.sh new/aaa_base/lib/mkinitrd/scripts/boot-rtc.sh --- old/aaa_base/lib/mkinitrd/scripts/boot-rtc.sh 2009-04-17 18:51:14.000000000 +0200 +++ new/aaa_base/lib/mkinitrd/scripts/boot-rtc.sh 2009-04-20 14:32:07.000000000 +0200 @@ -4,10 +4,11 @@ #%depends: start #%modules: rtc_cmos #%provides: rtc -#%programs: /bin/date /bin/ln /bin/mknod /sbin/modprobe /bin/usleep +#%programs: /bin/ln /bin/mknod /sbin/modprobe /bin/usleep +#%if: -n "$(modprobe -C /dev/null --set-version $kernel_version --ignore-install --show-depends rtc_cmos 2>/dev/null)" #%dontshow -if test -n "$(modprobe -C /dev/null --ignore-install --show-depends rtc_cmos 2>/dev/null)" -a ! -e /sys/class/rtc/rtc0 +if test ! -e /sys/class/rtc/rtc0 then load_modules typeset -i rtccount=300 @@ -20,9 +21,4 @@ mknod -m 0644 /dev/rtc0 c 250 0 ln -sf rtc0 /dev/rtc fi - if test -e /etc/localtime - then - echo -n 'System time: ' - date --rfc-822 - fi fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/lib/mkinitrd/scripts/setup-clock.sh new/aaa_base/lib/mkinitrd/scripts/setup-clock.sh --- old/aaa_base/lib/mkinitrd/scripts/setup-clock.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/aaa_base/lib/mkinitrd/scripts/setup-clock.sh 2009-04-20 14:24:20.000000000 +0200 @@ -0,0 +1,20 @@ +#!/bin/bash +#%stage: boot +#%depends: prepare + +if test -e /etc/localtime +then + mkdir -m 0755 -p $tmp_mnt/etc + cp -p /etc/localtime $tmp_mnt/etc/ +fi +if test -e /usr/share/zoneinfo/UTC +then + mkdir -m 0755 -p $tmp_mnt/usr/share/zoneinfo + cp -p /usr/share/zoneinfo/UTC $tmp_mnt/usr/share/zoneinfo/ +fi +if test -e /etc/sysconfig/clock +then + . /etc/sysconfig/clock + mkdir -m 0755 -p $tmp_mnt/etc/sysconfig + echo HWCLOCK='"'"$HWCLOCK"'"' > $tmp_mnt/etc/sysconfig/clock +fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/lib/mkinitrd/scripts/setup-rtc.sh new/aaa_base/lib/mkinitrd/scripts/setup-rtc.sh --- old/aaa_base/lib/mkinitrd/scripts/setup-rtc.sh 2009-04-17 18:55:25.000000000 +0200 +++ new/aaa_base/lib/mkinitrd/scripts/setup-rtc.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ -#!/bin/bash -#%stage: boot -#%depends: prepare - -if test -e /etc/localtime -then - mkdir -m 0755 -p $tmp_mnt/etc - cp -p /etc/localtime $tmp_mnt/etc/ -fi -if test -e /usr/share/zoneinfo/UTC -then - mkdir -m 0755 -p $tmp_mnt/usr/share/zoneinfo - cp -p /usr/share/zoneinfo/UTC $tmp_mnt/usr/share/zoneinfo/ -fi ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org