Browse Source

updated vbuilder.sh.in: improved Clean()

git-svn-id: http://trac.vinelinux.org/repos/projects/vbootstrap/trunk@2769 ec354946-7b23-47d6-9f5a-488ba84defc7
munepi 13 years ago
parent
commit
49ae665a5c
2 changed files with 6 additions and 0 deletions
  1. 1 0
      vbootstrap-vl.spec
  2. 5 0
      vbuilder.sh.in

+ 1 - 0
vbootstrap-vl.spec

@@ -83,6 +83,7 @@ vbuilder は vbootstrap を利用して chroot 環境の構築し、
 * Xxx Xxx XX 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.0.39-1
 - updated vbuilder.sh.in
   - fixed "unionfs_dir" in mount-chroot-mount() (Thanks to Takemikaduchi-san)
+  - improved Clean()
 
 * Fri Feb 18 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.0.38-1
 - updated vbuilder.sh.in

+ 5 - 0
vbuilder.sh.in

@@ -548,15 +548,20 @@ Clean(){
     mount-chroot --umount /proc
     apt-get-update --host
 
+    ## We remark that we first remove /lib*, and secondly remove /. 
+    ## If we directly remove /, we obtained some non-empty directories: 
+    ##   /dev/.udev/rules.d. 
     if [ $with_unionfs -eq 1 ]; then
 	if [ -d ${UNIONFS_ROOT} ]; then
 	    echo -n $"Cleaning build root ${UNIONFS_ROOT} via unionfs ... "
+	    rm -rf ${UNIONFS_ROOT}/lib*
 	    rm -rf ${UNIONFS_ROOT}
 	    echo $"done."
 	fi
     else
 	if [ -d ${BUILD_ROOT} ]; then
 	    echo -n $"Cleaning build root ${BUILD_ROOT} ... "
+	    rm -rf ${UNIONFS_ROOT}/lib*
 	    rm -rf ${BUILD_ROOT}
 	    echo $"done."
 	fi