Mailinglist Archive: opensuse-commit (1029 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package aaa_base for openSUSE:Factory
checked in at Wed Jul 27 09:39:17 CEST 2011.



--------
--- aaa_base/aaa_base.changes   2011-07-18 16:13:19.000000000 +0200
+++ /mounts/work_src_done/STABLE/aaa_base/aaa_base.changes      2011-07-26 
17:50:05.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Jul 26 15:49:50 UTC 2011 - werner@xxxxxxx
+
+- Add support for clicfs
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ aaa_base.spec ++++++
--- /var/tmp/diff_new_pack.JePzY2/_old  2011-07-27 09:26:51.000000000 +0200
+++ /var/tmp/diff_new_pack.JePzY2/_new  2011-07-27 09:26:51.000000000 +0200
@@ -21,7 +21,7 @@
 
 Name:           aaa_base
 Version:        12.1
-Release:        95
+Release:        97
 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-07-18 16:12:07.000000000 
+0200
+++ new/aaa_base/files/etc/init.d/boot.localfs  2011-07-26 17:49:10.000000000 
+0200
@@ -330,13 +330,12 @@
 
        ulist=
        rskip=
+       lskip=
 
        while read des fs type opts rest; do
            case "${des##*/}" in
                ""|\#*)    continue ;;
                swap)      continue ;;
-               loop*)     umount $mtab $fs
-                          loopdel $des ;;
            esac
            case ",$nomnt," in
                *,$type,*) continue ;;
@@ -344,10 +343,24 @@
            case ",$netfs," in
                *,$type,*) continue ;;
            esac
+           case "$type" in
+               fuse.clicfs)
+                   if test "$fs" = "/read-only"; then
+                          mount -nv -o remount,sync,ro "$fs"
+                          rskip="${rskip:+$rskip,}$fs"
+                          continue
+                   fi
+           esac
            case "$fs" in
-               /)         if test "$type" = aufs; then
-                              rskip="$(aufs ${opts//,/ })"
-                          fi
+               /)  if test "$type" = aufs; then
+                          rskip="${rskip:+$rskip,}$(aufs ${opts//,/ })"
+                   fi
+                   if [[ "${des##*/}" =~ ^loop* ]] ; then
+                          lskip="${des##*/}"
+                          tmp=$(losetup ${des} 2>/dev/null)
+                          tmp="${tmp##*(}"
+                          rskip="${rskip:+$rskip,}${tmp%/*})"
+                   fi 
                           continue ;;
                /dev*)     continue ;;
                /proc*)    continue ;;
@@ -359,6 +372,9 @@
                           continue ;;
                /var/lib/nfs/rpc_pipefs)
                           continue ;;
+               /read-write)
+                          mount -nv -o remount,sync,ro "$fs"
+                          rskip="${rskip:+$rskip,}$fs"
            esac
            case ",$rskip," in
                *,$fs,*)   continue ;;
@@ -373,12 +389,21 @@
                *,$type,*) umount $mtab -t $type $fs ;;
                *)         ulist="${ulist:+$ulist }$fs"
            esac
+           case "${des##*/}" in
+               loop*)     umount $mtab $fs
+                          loopdel $des ;;
+           esac
        done < ${rvtab}
 
        grep "loop" /proc/partitions | while read major minor blocks name ; do
+           test -n "$lskip" -a "$lskip" = "$name" && continue
            case "$name" in
-               loop*)     loopdel /dev/loop/${name#loop}
-                          loopdel /dev/$name ;;
+               loop*)
+                   if test -d /dev/loop ; then
+                          loopdel /dev/loop/${name#loop}
+                   else
+                          loopdel /dev/$name
+                   fi
            esac
        done
 


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx