Hello community, here is the log from the commit of package aaa_base checked in at Fri Aug 8 17:15:53 CEST 2008. -------- --- aaa_base/aaa_base.changes 2008-08-07 16:03:59.000000000 +0200 +++ /mounts/work_src_done/STABLE/aaa_base/aaa_base.changes 2008-08-08 15:12:16.695370000 +0200 @@ -1,0 +2,5 @@ +Fri Aug 8 15:11:23 CEST 2008 - werner@suse.de + +- In boot.localfs: generate list of virtual fs on the fly + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.dv4634/_old 2008-08-08 17:14:31.000000000 +0200 +++ /var/tmp/diff_new_pack.dv4634/_new 2008-08-08 17:14:31.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.0.42 -Release: 25 +Release: 26 Summary: SUSE Linux Base Package BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: aaa_base.tar.bz2 @@ -150,6 +150,8 @@ %defattr(-,root,root) %changelog +* Fri Aug 08 2008 werner@suse.de +- In boot.localfs: generate list of virtual fs on the fly * Thu Aug 07 2008 werner@suse.de - In halt script: use option -r of umount - In boot.localfs: be sure that / is not busy by using the new -w ++++++ 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 2008-08-07 15:55:40.000000000 +0200 +++ new/aaa_base/etc/init.d/boot.localfs 2008-08-08 15:08:34.000000000 +0200 @@ -31,11 +31,25 @@ # # Special file systems (memory and network based) # -typeset -r tmpfs=tmpfs,ramfs -typeset -r memfs=nfsd,devpts,proc,usbfs,sysfs,securityfs,debugfs,fusectl,rpc_pipefs -typeset -r netfs=nfs,nfs4,smbfs,cifs +typeset -r nomnt=autofs,bdev,rootfs,sockfs,pipefs,anon_inodefs,inotifyfs,eventpollfs,futexfs +typeset -r tmpfs=tmpfs,ramfs,hugetlbfs,mqueue +typeset -r netfs=nfs,nfs4,smbfs,cifs,afs,ncpfs + +tmp="" +while read tag name rest ; do + test "$tag" = "nodev" || continue + [[ "$name" =~ ^(${nomnt//,/|})$ ]] && continue + [[ "$name" =~ ^(${tmpfs//,/|})$ ]] && continue + [[ "$name" =~ ^(${netfs//,/|})$ ]] && continue + tmp=${tmp:+$tmp,}$name +done < /proc/filesystems + +typeset -r memfs=$tmp +typeset -r mntfs=$tmpfs,$memfs typeset -r nofs=no${netfs//,/,no},no${memfs//,/,no} +unset tmp name rest + # # Helper shell function for reading files reverse, note # that /proc and /sys files are not seekable, therefore @@ -244,25 +258,29 @@ reverse < $mounts | \ while read des fs type rest; do - case "${des##*/}" in + case "${des##*/}" in ""|\#*) continue ;; swap) continue ;; - rootfs) continue ;; loop*) umount $mtab $fs loopdel $des ;; esac - case "$type}" in - autofs) continue ;; + case ",$nomnt," in + *,$type,*) continue ;; esac - case "$fs" in + case ",$netfs," in + *,$type,*) continue ;; + esac + case "$fs" in /) continue ;; /dev*) continue ;; /proc*) continue ;; /sys*) continue ;; /tmp) continue ;; /var/tmp) continue ;; + /var/lib/nfs/rpc_pipefs) + continue ;; esac - case ",$tmpfs,$memfs," in + case ",$mntfs," in *,$type,*) umount $mtab -t $type $fs ;; esac done @@ -305,9 +323,12 @@ case ",$opts," in *,ro,*) continue ;; # Already done esac - case ",$tmpfs,$memfs," in + case ",$mntfs," in *,$type,*) continue ;; # Most of them are required esac + case ",$nomnt," in + *,$type,*) continue ;; # Not mountable + esac case ",$netfs," in *,$type,*) continue ;; # Avoid hanging reboot/halt esac ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org