Advertisement
Guest User

Untitled

a guest
May 7th, 2011
76
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.08 KB | None | 0 0
  1. diff -r f5b9af99dcb8 tazdev/tazdev
  2. --- a/tazdev/tazdev Sat May 07 08:28:39 2011 +0000
  3. +++ b/tazdev/tazdev Sat May 07 10:28:41 2011 +0000
  4. @@ -111,15 +111,12 @@
  5. fi
  6. # Mount source so they can be shared between cooking/stable/undigest.
  7. # But do it only if it's a slitaz developement chroot.
  8. - fs=$rootfs/home/slitaz
  9. + fs=${rootfs}${slitaz}
  10. if [ -d "$slitaz" ]; then
  11. - mkdir -p $SLITAZ/src $fs/src
  12. - mount -o bind $SLITAZ/src $fs/src
  13. - # Now mount package dir so they are in /home/slitaz/$version
  14. - # We may not mount cache wok or others it has no point and if
  15. - # one want to use a shared wok he can bind it manually.
  16. - mkdir -p $slitaz/packages $fs/packages
  17. - mount -o bind $slitaz/packages $fs/packages
  18. + for i in packages src cache wok-hg wok logs cache; do
  19. + mkdir -p $slitaz/$i $fs/$i
  20. + mount -o bind $slitaz/$i $fs/$i
  21. + done
  22. fi
  23. }
  24.  
  25. @@ -128,14 +125,15 @@
  26. umount_chroot()
  27. {
  28. [ "$1" ] && ROOTF=$1
  29. - fs=$rootfs/home/slitaz
  30. + fs=${rootfs}${slitaz}
  31. echo -ne "\nUnmounting virtual filesystems..."
  32. - umount $rootfs/dev/shm
  33. - umount $rootfs/dev/pts
  34. - umount $rootfs/sys
  35. - umount $rootfs/proc
  36. - umount $fs/src
  37. - umount $fs/packages
  38. + umount -l $rootfs/dev/shm
  39. + umount -l $rootfs/dev/pts
  40. + umount -l $rootfs/sys
  41. + umount -l $rootfs/proc
  42. + for i in packages src cache wok-hg wok logs cache; do
  43. + [ -d $fs/$i ] && umount -l $fs/$i
  44. + done
  45. status && echo ""
  46. #echo -e "\nProcess: $ps\n"
  47. #ps | grep `basename $0` | grep -v grep
  48. @@ -148,7 +146,7 @@
  49. echo -e "\nGenerating new chroot in : $rootfs"
  50. separator
  51. mkdir -p $rootfs
  52. - if [ "$ROOTFS_PKG" == "yes" ]; then
  53. + if [ "$ROOTFS_PKG" = "yes" ]; then
  54. for pkg in $CHROOT_PKGS
  55. do
  56. tazpkg get-install $pkg --root=$rootfs
  57. diff -r f5b9af99dcb8 tazdev/tazdev.conf
  58. --- a/tazdev/tazdev.conf Sat May 07 08:28:39 2011 +0000
  59. +++ b/tazdev/tazdev.conf Sat May 07 10:28:41 2011 +0000
  60. @@ -11,7 +11,7 @@
  61. PROJECTS="$HOME/Projects"
  62.  
  63. # Install chroot with packages
  64. -ROOTFS_PKG="no"
  65. +ROOTFS_PKG="yes"
  66.  
  67. # Packages for chroot
  68. CHROOT_PKGS="busybox libtaz tazwok tazchroot tazpkg slitaz-base-files"
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement