|
@@ -313,7 +313,7 @@ apt-get-update(){
|
|
|
|
|
|
## mount-chroot {|--umount} [file system|name]
|
|
|
## support file systems: /home /tmp /sys /proc /dev/shm /dev/pts /dev
|
|
|
-## support name: vfs archives_dir
|
|
|
+## support names: vfs archives_dir
|
|
|
## NOTE: /tmp needs for applications which use X
|
|
|
## vfs is virtual file systems
|
|
|
## archives_dir uses to mount ${EXTERNAL_ARCHIVES_DIR} to ${ARCHIVES_DIR}
|
|
@@ -335,14 +335,19 @@ mount-chroot-umount(){
|
|
|
[ -d ${BUILD_ROOT}${fs} ] || return 1
|
|
|
[ -z "$(mount | grep ${BUILD_ROOT}${fs})" ] || \
|
|
|
umount ${BUILD_ROOT}${fs}
|
|
|
+ if [ ! -z "$(mount | grep ${BUILD_ROOT}${fs})" ]; then
|
|
|
+ echo $"Retry lazy unmount ${BUILD_ROOT}${fs} ... "
|
|
|
+ umount -l ${BUILD_ROOT}${fs}
|
|
|
+ echo $"done."
|
|
|
+ fi
|
|
|
;;
|
|
|
vfs)
|
|
|
- # for dir in /sys /proc /dev/shm /dev/pts /dev; do
|
|
|
- # mount-chroot-umount ${dir} || return 1
|
|
|
- # done
|
|
|
- [ -d ${BUILD_ROOT}/proc ] || return 1
|
|
|
- [ -z "$(mount | grep ${BUILD_ROOT}/proc)" ] || \
|
|
|
- umount ${BUILD_ROOT}/proc
|
|
|
+ for dir in /sys /proc /dev/shm /dev/pts /dev; do
|
|
|
+ mount-chroot-umount ${dir} || return 1
|
|
|
+ done
|
|
|
+ # [ -d ${BUILD_ROOT}/proc ] || return 1
|
|
|
+ # [ -z "$(mount | grep ${BUILD_ROOT}/proc)" ] || \
|
|
|
+ # umount ${BUILD_ROOT}/proc
|
|
|
;;
|
|
|
archives_dir)
|
|
|
[ -d ${ARCHIVES_DIR} ] || return 1
|
|
@@ -354,7 +359,7 @@ mount-chroot-umount(){
|
|
|
[ -z "$(mount | grep ${BUILD_ROOT} | grep unionfs)" ] || \
|
|
|
umount ${BUILD_ROOT}
|
|
|
if [ ! -z "$(mount | grep ${BUILD_ROOT} | grep unionfs)" ]; then
|
|
|
- echo $"Retry lazy unmount ... "
|
|
|
+ echo $"Retry lazy unmount ${BUILD_ROOT} ... "
|
|
|
umount -l ${BUILD_ROOT}
|
|
|
echo $"done."
|
|
|
fi
|
|
@@ -374,10 +379,10 @@ mount-chroot-mount(){
|
|
|
|
|
|
case $fs in
|
|
|
/home)
|
|
|
- mnt_opts="-o rbind"
|
|
|
+ mnt_opts="-o _netdev,rbind"
|
|
|
;;
|
|
|
*)
|
|
|
- mnt_opts="--bind"
|
|
|
+ mnt_opts="--bind -o _netdev"
|
|
|
;;
|
|
|
esac
|
|
|
|
|
@@ -388,10 +393,10 @@ mount-chroot-mount(){
|
|
|
mount ${mnt_opts} ${fs} ${BUILD_ROOT}${fs}
|
|
|
;;
|
|
|
vfs)
|
|
|
- # for dir in /dev /dev/pts /dev/shm /proc /sys; do
|
|
|
- # mount-chroot-mount ${dir} || return 1
|
|
|
- # done
|
|
|
- mount-chroot-mount /proc || return 1
|
|
|
+ for dir in /dev /dev/pts /dev/shm /proc /sys; do
|
|
|
+ mount-chroot-mount ${dir} || return 1
|
|
|
+ done
|
|
|
+ # mount-chroot-mount /proc || return 1
|
|
|
;;
|
|
|
archives_dir)
|
|
|
[ -d ${EXTERNAL_ARCHIVES_DIR} ] || mkdir -p ${EXTERNAL_ARCHIVES_DIR}
|
|
@@ -549,11 +554,11 @@ Build(){
|
|
|
|
|
|
$__chroot_sh 'apt-get -qq -y install etcskel shadow-utils'
|
|
|
|
|
|
- $__chroot_sh 'cd /dev && /sbin/MAKEDEV console'
|
|
|
- $__chroot_sh 'cd /dev && /sbin/MAKEDEV null'
|
|
|
- $__chroot_sh 'cd /dev && /sbin/MAKEDEV zero'
|
|
|
- $__chroot_sh 'cd /dev && /sbin/MAKEDEV random'
|
|
|
- $__chroot_sh 'cd /dev && /sbin/MAKEDEV urandom'
|
|
|
+ #$__chroot_sh 'cd /dev && /sbin/MAKEDEV console'
|
|
|
+ #$__chroot_sh 'cd /dev && /sbin/MAKEDEV null'
|
|
|
+ #$__chroot_sh 'cd /dev && /sbin/MAKEDEV zero'
|
|
|
+ #$__chroot_sh 'cd /dev && /sbin/MAKEDEV random'
|
|
|
+ #$__chroot_sh 'cd /dev && /sbin/MAKEDEV urandom'
|
|
|
|
|
|
$__chroot_sh '/usr/sbin/pwconv'
|
|
|
$__chroot_sh "/usr/sbin/useradd ${BUILD_USER}"
|