[Pbuilder-maint] pbuilder CVS update: pbuilder ChangeLog pbuilder-modules

[pbuilder CVS Commit]

  User: lool    
  Date: 06/10/30 00:50:37

  Modified:    .        ChangeLog pbuilder-modules
  Log:
  * pbuilder-modules: umount selinux and bind mounts first.
  
  Revision  Changes    Path
  1.414     +2 -1      pbuilder/ChangeLog
  
  CVSWEB Options: -------------------
  
  CVSWeb: Annotate this file:            http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/ChangeLog?annotate=1.414&cvsroot=
  
  CVSWeb: View this file:             http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/ChangeLog?rev=1.414&content-type=text/x-cvsweb-markup&cvsroot=
  
  CVSWeb: Diff to previous version:   http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/ChangeLog.diff?r1=1.414&r2=1.413&cvsroot=
  
  -----------------------------------
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvsroot/pbuilder/pbuilder/ChangeLog,v
  retrieving revision 1.413
  retrieving revision 1.414
  diff -u -r1.413 -r1.414
  --- ChangeLog	29 Oct 2006 23:47:55 -0000	1.413
  +++ ChangeLog	29 Oct 2006 23:50:37 -0000	1.414
  @@ -4,6 +4,7 @@
   	umount errors of the type "umount: /foobar: not mounted" and "umount:
   	/foobar: not found" as retries will be useless anyway, and these
   	errors shouldn't cause data loss; fixes #391390.
  +	* pbuilder-modules: umount selinux and bind mounts first.
   
   2006-10-29  Junichi Uekawa  <dancer at debian.org>
   
  
  
  
  1.101     +12 -12    pbuilder/pbuilder-modules
  
  CVSWEB Options: -------------------
  
  CVSWeb: Annotate this file:            http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-modules?annotate=1.101&cvsroot=
  
  CVSWeb: View this file:             http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-modules?rev=1.101&content-type=text/x-cvsweb-markup&cvsroot=
  
  CVSWeb: Diff to previous version:   http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-modules.diff?r1=1.101&r2=1.100&cvsroot=
  
  -----------------------------------
  
  Index: pbuilder-modules
  ===================================================================
  RCS file: /cvsroot/pbuilder/pbuilder/pbuilder-modules,v
  retrieving revision 1.100
  retrieving revision 1.101
  diff -u -r1.100 -r1.101
  --- pbuilder-modules	29 Oct 2006 23:47:55 -0000	1.100
  +++ pbuilder-modules	29 Oct 2006 23:50:37 -0000	1.101
  @@ -170,6 +170,18 @@
   }
   
   function umountproc () {
  +    # push arguments on a stack to reverse direction.
  +    local reversed
  +    reversed=
  +    for mnt in $BINDMOUNTS; do
  +	reversed="$mnt $reversed"
  +    done
  +    for mnt in $reversed; do
  +	umount_one "$mnt"
  +    done
  +    if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
  +	umount_one "selinux"
  +    fi
       if [ "$USEDEVPTS" = "yes" ]; then
   	umount_one "dev/pts"
       fi
  @@ -182,18 +194,6 @@
   	fi
   	umount_one "proc"
       fi
  -    if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
  -	umount_one "selinux"
  -    fi
  -    # push arguments on a stack to reverse direction.
  -    local reversed
  -    reversed=
  -    for mnt in $BINDMOUNTS; do
  -	reversed="$mnt $reversed"
  -    done
  -    for mnt in $reversed; do
  -	umount_one "$mnt"
  -    done
   }