CopterExpress/clover
1
0
Fork 0
mirror of https://github.com/CopterExpress/clover.git synced 2026-05-29 14:29:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

image_builder: debug

Browse Source
This commit is contained in:
Artem Smirnov
2018-09-24 17:13:26 +03:00
parent 469542416d
commit 18f973ce00
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
builder_docker/image-chroot.sh
View File

@@ -59,11 +59,10 @@ execute() {
echo_stamp "Mounting /proc in chroot... "
if [ ! -d ${MOUNT_POINT}/proc ]; then
mkdir -p ${MOUNT_POINT}/proc \
&& mount -t proc -o nosuid,noexec,nodev proc ${MOUNT_POINT}/proc
&& mount -t proc -o nosuid,noexec,nodev proc ${MOUNT_POINT}/proc \
&& echo_stamp "OK" "SUCCESS" \
|| (echo_stamp "Failed" "ERROR"; exit 1)
else echo_stamp "/sys already exist" "SUCCESS"
fi
else echo_stamp "/proc already exist" "SUCCESS"; fi
echo_stamp "Mounting /sys in chroot... "
if [ ! -d ${MOUNT_POINT}/sys ]; then
@@ -71,8 +70,7 @@ execute() {
&& mount -t sysfs -o nosuid,noexec,nodev sysfs ${MOUNT_POINT}/sys \
&& echo_stamp "OK" "SUCCESS" \
|| (echo_stamp "Failed" "ERROR"; exit 1)
else echo_stamp "/sys already exist" "SUCCESS"
fi
else echo_stamp "/sys already exist" "SUCCESS"; fi
echo_stamp "Mounting /dev/ and /dev/pts in chroot... " \
&& mkdir -p -m 755 ${MOUNT_POINT}/dev/pts \
@@ -126,7 +124,7 @@ umount_system() {
# Repeat 5 times
for i in {1..5}; do
umount -fR $1 \
&& (echo_stamp "OK" "SUCCESS"; umount_ok=true; break)
&& (echo_stamp "OK" "SUCCESS"; umount_ok=true; break) \
|| (echo_stamp "Failed #$i (try 5 times)" "ERROR"; sleep 2)
done
[[ "$umount_ok" == true ]] \