emo/tinyramfs
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

fix race conditions

Browse Source
This commit is contained in:
illiliti 2020-02-15 22:33:13 +03:00
parent 65b4beadb8
commit 423297501b
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
init
View File

@ -64,29 +64,30 @@ setup_udev() {
findfs_sh() { findfs_sh() {
case "${1%%=*}" in case "${1%%=*}" in
LABEL) LABEL)
printf "/dev/disk/by-label/%s\n" "${1##*=}" device="/dev/disk/by-label/${1##*=}"
;; ;;
UUID) UUID)
printf "/dev/disk/by-uuid/%s\n" "${1##*=}" device="/dev/disk/by-uuid/${1##*=}"
;; ;;
PARTUUID) PARTUUID)
printf "/dev/disk/by-partuuid/%s\n" "${1##*=}" device="/dev/disk/by-partuuid/${1##*=}"
;; ;;
/dev/*) /dev/*)
printf "%s\n" "$1" device="$1"
;; ;;
*) *)
panic "findfs option broken" panic "findfs option broken"
;; ;;
esac esac
# avoid race condition
until [ -e "$device" ]; do sleep 0.5; done
printf "%s\n" "$device"
} }
# unlock LUKS container # unlock LUKS container
unlock_luks() { unlock_luks() {
# TODO investigate this
# avoid race condition
sleep 1.5
# TODO improve mapper name ( crypttab or config option ) # TODO improve mapper name ( crypttab or config option )
cryptsetup $luks_args luksOpen $(findfs_sh "$luks_root") luks_root || panic "failed to unlock luks container" cryptsetup $luks_args luksOpen $(findfs_sh "$luks_root") luks_root || panic "failed to unlock luks container"
} }
@ -98,11 +99,7 @@ trigger_lvm() {
# mount rootfs to /mnt/root # mount rootfs to /mnt/root
mnt_rootfs() { mnt_rootfs() {
# TODO investigate this mount ${root_type:+-t $root_type} $root_args $(findfs_sh "$root") /mnt/root || panic "failed to mount rootfs"
# avoid race condition
sleep 1.5
mount $root_type $root_args $(findfs_sh "$root") /mnt/root || panic "failed to mount rootfs"
} }
# kill and unmount # kill and unmount