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

fix udev

Browse Source
This commit is contained in:
illiliti 2020-02-13 23:16:36 +03:00
parent 34f5adb14c
commit bb2449cecd
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
init
View File

@ -50,10 +50,6 @@ use_mdevd() {
mdevd & mdevd &
# trigger uevents # trigger uevents
mdevd-coldplug mdevd-coldplug
# TODO investigate this
# avoid race condition
sleep 1.5
} }
# setup udev # setup udev
@ -89,19 +85,23 @@ findfs_sh() {
unlock_luks() { unlock_luks() {
# TODO investigate this # TODO investigate this
# avoid race condition # avoid race condition
[ "$devmgr" != "udev" ] && sleep 1.5 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"
} }
# manually trigger LVM # trigger LVM
trigger_lvm() { trigger_lvm() {
lvm vgchange --quiet --sysinit -a y > /dev/null lvm vgchange --quiet --sysinit -a y > /dev/null
} }
# mount rootfs to /mnt/root # mount rootfs to /mnt/root
mnt_rootfs() { mnt_rootfs() {
# TODO investigate this
# avoid race condition
sleep 1.5
mount $root_type $root_args $(findfs_sh "$root") /mnt/root || panic "failed to mount rootfs" mount $root_type $root_args $(findfs_sh "$root") /mnt/root || panic "failed to mount rootfs"
} }
@ -153,7 +153,7 @@ esac
# TODO handle situations when LUKS on LVM # TODO handle situations when LUKS on LVM
[ "$use_luks" = 1 ] && unlock_luks [ "$use_luks" = 1 ] && unlock_luks
[ "$use_lvm" = 1 ] && [ "$devmgr" != "udev" ] && trigger_lvm [ "$use_lvm" = 1 ] && trigger_lvm
mnt_rootfs mnt_rootfs
cleanup cleanup
boot_system boot_system