Browse Source

fix unmounting aufs

git-svn-id: http://trac.vinelinux.org/repos/projects/vbootstrap/trunk@5513 ec354946-7b23-47d6-9f5a-488ba84defc7
daisuke 12 years ago
parent
commit
9a6ce62101
3 changed files with 8 additions and 5 deletions
  1. 2 2
      libvbuilder.sh.in
  2. 4 1
      vbootstrap-vl.spec
  3. 2 2
      vbuilder.sh.in

+ 2 - 2
libvbuilder.sh.in

@@ -390,9 +390,9 @@ mount-chroot-umount(){
 	    ;;
 	unionfs_dir)
 	    [ -d ${BUILD_ROOT} ] || return 1
-	    [ -z "$(mount | grep ${BUILD_ROOT} | grep unionfs)" ] || \
+	    [ -z "$(mount | grep ${BUILD_ROOT} | egrep '(unionfs|aufs)')" ] || \
 		umount ${BUILD_ROOT}
-	    if [ ! -z "$(mount | grep ${BUILD_ROOT} | grep unionfs)" ]; then
+	    if [ ! -z "$(mount | grep ${BUILD_ROOT} | egrep '(unionfs|aufs)')" ]; then
 		echo $"Retry lazy unmount ${BUILD_ROOT} ... "
 		umount -l ${BUILD_ROOT}
 		echo $"done."

+ 4 - 1
vbootstrap-vl.spec

@@ -1,7 +1,7 @@
 # This package is maintained on trac svn repository. Please do not change on local.
 # If you find a BUG, please report to Vine@vinelinux.org or mailing list or BTS.
 
-%define version 0.0.52
+%define version 0.0.53
 
 Summary: bootstrap scripts to create a basic Vine Linux system
 Summary(ja): Vine Linux の基本システムを作成するためのスクリプト
@@ -88,6 +88,9 @@ vbuilder は vbootstrap を利用して chroot 環境の構築し、
 
 
 %changelog
+* Sat Jan 28 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 0.0.53-1
+- fix unmounting aufs
+
 * Fri Jan 27 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 0.0.52-1
 - update vbuilder.sh.in
   - add "--no-build-essential" option

+ 2 - 2
vbuilder.sh.in

@@ -457,9 +457,9 @@ mount-chroot-umount(){
 	    ;;
 	unionfs_dir)
 	    [ -d ${BUILD_ROOT} ] || return 1
-	    [ -z "$(mount | grep ${BUILD_ROOT} | grep unionfs)" ] || \
+	    [ -z "$(mount | grep ${BUILD_ROOT} | egrep '(unionfs|aufs)')" ] || \
 		umount ${BUILD_ROOT}
-	    if [ ! -z "$(mount | grep ${BUILD_ROOT} | grep unionfs)" ]; then
+	    if [ ! -z "$(mount | grep ${BUILD_ROOT} | egrep '(unionfs|aufs)')" ]; then
 		echo $"Retry lazy unmount ${BUILD_ROOT} ... "
 		umount -l ${BUILD_ROOT}
 		echo $"done."