Browse Source

updated vbuilder.sh.in: arranged some procedures to mount /proc and unionfs_dir

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

+ 6 - 2
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.39
+%define version 0.0.40
 
 Summary: bootstrap scripts to create a basic Vine Linux system
 Summary(ja): Vine Linux の基本システムを作成するためのスクリプト
@@ -80,7 +80,11 @@ vbuilder は vbootstrap を利用して chroot 環境の構築し、
 
 
 %changelog
-* Xxx Xxx XX 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.0.39-1
+* Sun Mar 20 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.0.40-1
+- updated vbuilder.sh.in
+  - arranged some procedures to mount /proc and unionfs_dir
+
+* Sun Feb 27 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()

+ 9 - 9
vbuilder.sh.in

@@ -543,9 +543,9 @@ Clean(){
     mount-chroot --umount /tmp
     mount-chroot --umount /dev/shm
     mount-chroot --umount /dev/pts
+    mount-chroot --umount /proc
     mount-chroot --umount archives_dir
     mount-chroot --umount unionfs_dir
-    mount-chroot --umount /proc
     apt-get-update --host
 
     ## We remark that we first remove /, and secondly remove /. 
@@ -677,9 +677,9 @@ Show-Info(){
 
 RPM_Remove(){
     setup-vbootstrap-rpm || return 1
-    mount-chroot /proc
     mount-chroot unionfs_dir
     mount-chroot archives_dir
+    mount-chroot /proc
     mount-chroot /dev/pts
     mount-chroot /dev/shm
     apt-get-update --chroot
@@ -692,9 +692,9 @@ RPM_Remove(){
 
     mount-chroot --umount /dev/shm
     mount-chroot --umount /dev/pts
+    mount-chroot --umount /proc
     mount-chroot --umount archives_dir
     mount-chroot --umount unionfs_dir
-    mount-chroot --umount /proc
     apt-get-update --host
 
     return 0
@@ -702,9 +702,9 @@ RPM_Remove(){
 
 RPM_Install(){
     setup-vbootstrap-rpm || return 1
-    mount-chroot /proc
     mount-chroot unionfs_dir
     mount-chroot archives_dir
+    mount-chroot /proc
     mount-chroot /dev/pts
     mount-chroot /dev/shm
 
@@ -716,9 +716,9 @@ RPM_Install(){
 
     mount-chroot --umount /dev/shm
     mount-chroot --umount /dev/pts
+    mount-chroot --umount /proc
     mount-chroot --umount archives_dir
     mount-chroot --umount unionfs_dir
-    mount-chroot --umount /proc
     apt-get-update --host
 
     return 0
@@ -726,9 +726,9 @@ RPM_Install(){
 
 RPM_Build(){
     setup-vbootstrap-rpm || return 1
-    mount-chroot /proc
     mount-chroot unionfs_dir
     mount-chroot archives_dir
+    mount-chroot /proc
     mount-chroot /dev/pts
     mount-chroot /dev/shm
     apt-get-update --chroot
@@ -773,9 +773,9 @@ RPM_Build(){
 
     mount-chroot --umount /dev/shm
     mount-chroot --umount /dev/pts
+    mount-chroot --umount /proc
     mount-chroot --umount archives_dir
     mount-chroot --umount unionfs_dir
-    mount-chroot --umount /proc
     apt-get-update --host
 
     echo $"done."
@@ -820,9 +820,9 @@ Login_Chroot(){
 	__chroot="/usr/sbin/chroot ${BUILD_ROOT} setarch ${VARCH}"
 
 
-    mount-chroot /proc
     mount-chroot unionfs_dir
     mount-chroot archives_dir
+    mount-chroot /proc
     mount-chroot /dev/pts
     mount-chroot /dev/shm
     mount-chroot /tmp
@@ -842,9 +842,9 @@ Login_Chroot(){
     mount-chroot  --umount /tmp
     mount-chroot --umount /dev/shm
     mount-chroot --umount /dev/pts
+    mount-chroot --umount /proc
     mount-chroot --umount archives_dir
     mount-chroot --umount unionfs_dir
-    mount-chroot --umount /proc
     apt-get-update --host
 
     return 0