Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at Fri May 1 01:54:06 CEST 2009. -------- --- aaa_base/aaa_base.changes 2009-04-28 17:06:53.000000000 +0200 +++ aaa_base/aaa_base.changes 2009-04-30 15:32:37.065902509 +0200 @@ -1,0 +2,6 @@ +Thu Apr 30 15:30:52 CEST 2009 - werner@suse.de + +- First try to support root fs with type aufs (bnc#491890) +- Use usleep to wait on udev + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.c21079/_old 2009-05-01 01:38:23.000000000 +0200 +++ /var/tmp/diff_new_pack.c21079/_new 2009-05-01 01:38:23.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: 23 +Release: 24 Summary: SUSE Linux Base Package BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: aaa_base.tar.bz2 @@ -139,6 +139,9 @@ %defattr(-,root,root) %changelog +* Thu Apr 30 2009 werner@suse.de +- First try to support root fs with type aufs (bnc#491890) +- Use usleep to wait on udev * Tue Apr 28 2009 werner@suse.de - Disable blogd on fastboot or quiet boot - Move mkinitrd scripts to mkinitrd ++++++ aaa_base.tar.bz2 ++++++ 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 2009-04-24 18:21:31.000000000 +0200 +++ new/aaa_base/etc/init.d/boot.localfs 2009-04-29 17:26:35.000000000 +0200 @@ -98,14 +98,14 @@ wait_for_udev () { local dev - local -i timeout=30 + local -i timeout=1200 local missing=$(list_missed) test -n "$missing" || return 0 echo -n "Waiting for $missing " while test $timeout -gt 0 ; do - sleep 1 - echo -n "." + usleep 25000 + ((timeout % 40 == 1)) && echo -n "." still_missing="" for dev in $missing; do if test ! -b $dev ; then @@ -126,6 +126,38 @@ test $timeout -eq 0 && echo " timeout! " } +# +# Return the shadow mount points of an AuFS +# +aufs () +{ + local IFS pos dir list + + IFS='=:' + for pos + do + case "$pos" in + xino*) + dir=${pos#xino=} + while test -e "$dir" ; do + if mountpoint -q ${dir} ; then + list=${list:+$list,}$dir + break + fi + dir=${dir%/*} + done + ;; + br*|dir*) + for dir in ${pos} ; do + test -z "${dir##/*}" || continue + mountpoint -q ${dir} || continue + list=${list:+$list,}$dir + done + esac + done + echo -n $list +} + rc_reset case "$1" in @@ -274,8 +306,9 @@ fi ulist= + rskip= - while read des fs type rest; do + while read des fs type opts rest; do case "${des##*/}" in ""|\#*) continue ;; swap) continue ;; @@ -289,13 +322,19 @@ *,$type,*) continue ;; esac case "$fs" in - /) continue ;; + /) if test "$type" = aufs; then + rskip="$(aufs ${opts//,/ })" + fi + continue ;; /dev*) continue ;; /proc*) continue ;; /sys*) continue ;; /var/lib/nfs/rpc_pipefs) continue ;; esac + case ",$rskip," in + *,$fs,*) continue ;; + esac ulist="${ulist:+$ulist }$fs" case "$fs" in /tmp) continue ;; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org