talexander/docker_in_freebsd
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove force unmount because I think its corrupting the filesystem with unclean dismount.

Browse Source
This commit is contained in:
Tom Alexander 2022-02-26 19:36:06 -05:00
parent 70b4cca0c1
commit 8e2eac5865
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/build_image/build_alpine.bash
View File

@ -18,7 +18,7 @@ function cleanup {
done done
for (( idx=${#mountedfolders[@]}-1 ; idx>=0 ; idx-- )) ; do for (( idx=${#mountedfolders[@]}-1 ; idx>=0 ; idx-- )) ; do
>&2 echo "Unmounting folder ${mountedfolders[idx]}" >&2 echo "Unmounting folder ${mountedfolders[idx]}"
umount -f "${mountedfolders[idx]}" umount "${mountedfolders[idx]}"
done done
for f in "${memorydevices[@]}"; do for f in "${memorydevices[@]}"; do
>&2 echo "Removing memory device $f" >&2 echo "Removing memory device $f"

4
scripts/launch_bhyve.bash
View File

@ -34,7 +34,7 @@ ifconfig bridge0 addm tap1
# -s virtual PCI slots # -s virtual PCI slots
# -P force guest CPU to exit when PAUSE instruction detected # -P force guest CPU to exit when PAUSE instruction detected
set +e set +e
disk_image=$(readlink -f ../scripts/build_image/dib.img) disk_image=$(readlink -f "$DIR/../scripts/build_image/dib.img")
bhyve \ bhyve \
-c 1 \ -c 1 \
-m 1024M \ -m 1024M \
@ -45,7 +45,7 @@ bhyve \
-u \ -u \
-s 0,hostbridge \ -s 0,hostbridge \
-s 31,lpc \ -s 31,lpc \
-s 4:0,virtio-blk,$disk_image \ -s "4:0,virtio-blk,$disk_image" \
-s 5:0,virtio-net,tap1,mac=58:9c:fc:09:c3:ba \ -s 5:0,virtio-net,tap1,mac=58:9c:fc:09:c3:ba \
-s 6:0,virtio-rnd \ -s 6:0,virtio-rnd \
-s "7:0,virtio-9p,docker=$DOCKERDIR" \ -s "7:0,virtio-9p,docker=$DOCKERDIR" \