Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at Wed Apr 27 09:03:41 CEST 2011.
-------- --- aaa_base/aaa_base.changes 2011-04-21 11:14:28.000000000 +0200 +++ /mounts/work_src_done/STABLE/aaa_base/aaa_base.changes 2011-04-26 18:32:58.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Apr 26 16:32:18 UTC 2011 - [email protected] + +- Mount memory based file systems found in /etc/fstab (bnc#675542) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.MbVZAa/_old 2011-04-27 09:00:43.000000000 +0200 +++ /var/tmp/diff_new_pack.MbVZAa/_new 2011-04-27 09:00:43.000000000 +0200 @@ -21,7 +21,7 @@ Name: aaa_base Version: 11.5 -Release: 69 +Release: 71 License: GPLv2+ Group: System/Fhs Url: http://gitorious.org/opensuse/aaa_base ++++++ aaa_base.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/files/etc/init.d/boot.localfs new/aaa_base/files/etc/init.d/boot.localfs --- old/aaa_base/files/etc/init.d/boot.localfs 2011-04-21 11:05:12.000000000 +0200 +++ new/aaa_base/files/etc/init.d/boot.localfs 2011-04-26 18:30:50.000000000 +0200 @@ -102,6 +102,23 @@ test $timeout -eq 0 && echo " timeout! " } +memfs_nonudev () +{ + local none on mnt tag type opts + mount -afnv -t $mntfs -O no_netdev -O nonofail 2> /dev/null | \ + while read none on mnt tag type opts ; do + test "$mnt" = already && continue + case "$type" in + proc) [[ $mnt =~ /proc* ]] && continue ;; + sysfs) [[ $mnt =~ /sys* ]] && continue ;; + dev*) [[ $mnt =~ /dev* ]] && continue ;; + cgroup*) [[ $mnt =~ /sys* ]] && continue ;; + cpuset*) [[ $mnt =~ /sys* ]] && continue ;; + esac + mount $mnt + done +} + # # Return the shadow mount points of an AuFS # @@ -242,23 +259,41 @@ if ! test -L /etc/mtab; then mount -fv -t proc proc /proc mount -fv -t sysfs sysfs /sys - # - HAVE_DEBUGFS=0 DEVTMPFS=tmpfs - while read dev type ; do - test "$type" = "debugfs" && HAVE_DEBUGFS=1 - test "$type" = "devtmpfs" && DEVTMPFS=devtmpfs - done < /proc/filesystems - - if test -d /sys/kernel/debug -a "$HAVE_DEBUGFS" = "1" ; then - mount -fv -t debugfs debugfs /sys/kernel/debug - fi + case "$memfs" in + *,devtmpfs,*) DEVTMPFS=devtmpfs + esac mount -fv -t $DEVTMPFS -o mode=0755 $DEVTMPFS /dev rc_status mount -fv -t tmpfs -o mode=1777 tmpfs /dev/shm mount -fv -t devpts -o mode=0620,gid=5 devpts /dev/pts rc_status fi + if test -d /sys/kernel/debug -a "$(stat -fc '%T' /sys/kernel/debug)" != debugfs ; then + case "$memfs" in + *,debugfs,*) + mount -t debugfs debugfs /sys/kernel/debug + esac + fi + if test -d /sys/kernel/security -a "$(stat -fc '%T' /sys/kernel/security)" != securityfs ; then + case "$memfs" in + *,securityfs,*) + mount -t securityfs securityfs /sys/kernel/security + esac + fi + if test -d /sys/fs/cgroup -a "$(stat -fc '%T' /sys/fs/cgroup)" != tmpfs ; then + case "$memfs" in + *,cgroup,*) + mount -t tmpfs -o nosuid,nodev,noexec,mode=755 tmpfs /sys/fs/cgroup && \ + mkdir /sys/fs/cgroup/systemd && \ + mount -t cgroup -o nosuid,nodev,noexec,none,name=systemd cgroup /sys/fs/cgroup/systemd + esac + case "$memfs" in + *,cpuset,*) + mkdir /sys/fs/cgroup/cpuset && \ + mount -t cgroup -o nosuid,nodev,noexec,cpuset cpuset /sys/fs/cgroup/cpuset + esac + fi # remount to make sure options from fstab are honoured mount -oremount /proc mount -oremount /sys @@ -269,6 +304,9 @@ # mount the rest mount -av -t $nofs -O no_netdev rc_status -v1 -r + + # now handle uncommon mount points + memfs_nonudev ;; stop) mounts=/etc/fstab @@ -328,19 +366,24 @@ /proc*) continue ;; /sys*) continue ;; /cgroup*) continue ;; + /sys/fs/*) continue ;; + /sys/kernel/*) + continue ;; /var/lib/nfs/rpc_pipefs) continue ;; esac case ",$rskip," in *,$fs,*) continue ;; esac - ulist="${ulist:+$ulist }$fs" case "$fs" in - /tmp) continue ;; - /var/tmp) continue ;; + /tmp) ulist="${ulist:+$ulist }$fs" + continue ;; + /var/tmp) ulist="${ulist:+$ulist }$fs" + continue ;; esac case ",$mntfs," in *,$type,*) umount $mtab -t $type $fs ;; + *) ulist="${ulist:+$ulist }$fs" esac done < ${rvtab} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
