Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at Mon Dec 15 11:56:06 CET 2008. -------- --- aaa_base/aaa_base.changes 2008-12-08 02:07:14.000000000 +0100 +++ /mounts/work_src_done/STABLE/aaa_base/aaa_base.changes 2008-12-11 17:40:42.857986000 +0100 @@ -1,0 +2,18 @@ +Thu Dec 11 17:40:11 CET 2008 - ro@suse.de + +- only mount /proc and /sys if not mounted already + (bnc#457984) + +------------------------------------------------------------------- +Wed Dec 10 16:03:54 CET 2008 - bwalle@suse.de + +- Make /sbin/get_kernel_version a bit more tolerant: Accept + '2.6.27.private-ppc64' as version string. (bnc #441821) + +------------------------------------------------------------------- +Wed Dec 10 14:18:38 CET 2008 - werner@suse.de + +- Do not set CMOS HW clock on XEN systems (bnc#422010) +- use mkill(8) instead of fuser + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.ZgA386/_old 2008-12-15 11:54:30.000000000 +0100 +++ /var/tmp/diff_new_pack.ZgA386/_new 2008-12-15 11:54:30.000000000 +0100 @@ -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.1 -Release: 10009 +Release: 10010 Summary: SUSE Linux Base Package BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: aaa_base.tar.bz2 @@ -139,6 +139,15 @@ %defattr(-,root,root) %changelog +* Thu Dec 11 2008 ro@suse.de +- only mount /proc and /sys if not mounted already + (bnc#457984) +* Wed Dec 10 2008 bwalle@suse.de +- Make /sbin/get_kernel_version a bit more tolerant: Accept + '2.6.27.private-ppc64' as version string. (bnc #441821) +* Wed Dec 10 2008 werner@suse.de +- Do not set CMOS HW clock on XEN systems (bnc#422010) +- use mkill(8) instead of fuser * Mon Dec 08 2008 ro@suse.de - updated list of settings for DEFAULT_WM (from control.xml) (bnc#445646) ++++++ aaa_base.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/init.d/boot new/aaa_base/etc/init.d/boot --- old/aaa_base/etc/init.d/boot 2008-10-15 12:56:15.000000000 +0200 +++ new/aaa_base/etc/init.d/boot 2008-12-11 17:39:07.000000000 +0100 @@ -71,13 +71,17 @@ # # Start of e.g. blogd, requires /proc and /dev/pts. # -echo -n "Mounting procfs at /proc" -mount -n -t proc proc /proc -rc_status -v -r +if test ! -d /proc/1 ; then + echo -n "Mounting procfs at /proc" + mount -n -t proc proc /proc + rc_status -v -r +fi -echo -n "Mounting sysfs at /sys" -mount -n -t sysfs sysfs /sys -rc_status -v -r +if test ! -d /sys/kernel ; then + echo -n "Mounting sysfs at /sys" + mount -n -t sysfs sysfs /sys + rc_status -v -r +fi if test -d /sys/kernel/debug ; then while read dev type ; do 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 2008-11-20 17:16:57.000000000 +0100 +++ new/aaa_base/etc/init.d/boot.clock 2008-12-10 14:16:26.000000000 +0100 @@ -30,6 +30,15 @@ esac test "$USE_ADJFILE" = no && HWCLOCK="$HWCLOCK --noadjfile" +# +# Don't use hwclock if not valid +# +USE_HWCLOCK=yes +case "$(uname -i)" in +s390*) USE_HWCLOCK=no ;; +esac +test -e /proc/sys/xen/independent_wallclock && USE_HWCLOCK=no + rc_reset case "$1" in @@ -44,7 +53,7 @@ fi # Set and adjust the hardware clock # - if test "$HOSTTYPE" = "s390" -o "$HOSTTYPE" = "s390x" ; then + if test "$USE_HWCLOCK" != "yes" ; then echo -n Setting up the system clock 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-05 12:43:46.000000000 +0100 +++ new/aaa_base/etc/init.d/boot.localfs 2008-12-10 14:21:30.000000000 +0100 @@ -315,11 +315,8 @@ rc_exit fi - # if /var is on a different filesystem than / make sure we can umount - if test $(stat -c "%i" -f /) != $(stat -c "%i" -f /var) ; then - echo "/var is an extra partition, killing all processes accessing it" - fuser -skm /var - fi + # If e.g. /var is on a different filesystem than / make sure we can umount + mkill -TERM $ulist UMOUNT_FAILED=false umount -rv $mtab -t no${tmpfs//,/,no},$nofs -O no_netdev $ulist || { ++++++ get_kernel_version.c ++++++ --- /var/tmp/diff_new_pack.ZgA386/_old 2008-12-15 11:54:30.000000000 +0100 +++ /var/tmp/diff_new_pack.ZgA386/_new 2008-12-15 11:54:30.000000000 +0100 @@ -102,20 +102,23 @@ { int j = i+14; int invalid_char = 0; - int in_number_range = 1; + int number_dots = 0; /* check if we really found a version */ for (j = j+1; buffer[j] != ' '; j++) { char c = buffer[j]; - if (c == '-') - in_number_range = 0; + if (c == '.') { + number_dots++; + continue; + } - if ((in_number_range && !isdigit(c) && c != '.') || - (!in_number_range && !my_is_alnum_punct(c))) + if (((number_dots < 2) && !isdigit(c)) || + ((number_dots >= 2) && !my_is_alnum_punct(c))) { - invalid_char = 1; + //invalid_char = 1; + printf("invalid=1 for %c\n", c); break; } } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org