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

move luks header and keyfile handling to init

Browse Source
This commit is contained in:
illiliti 2020-03-08 04:46:43 +03:00
parent 5413ec2f38
commit 15457b48be
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tinyramfs
View File

@ -245,16 +245,12 @@ install_luks() {
install_library /usr/lib/libgcc_s.so.1 install_library /usr/lib/libgcc_s.so.1
# copy luks header # copy luks header
[ -f "$luks_header" ] && { [ -f "$luks_header" ] &&
install -m400 "$luks_header" "${workdir}/root/luks_header" install -m400 "$luks_header" "${workdir}/root/luks_header"
luks_args="--header=/root/luks_header $luks_args"
}
# copy luks keyfile # copy luks keyfile
[ -f "$luks_keyfile" ] && { [ -f "$luks_keyfile" ] &&
install -m400 "$luks_keyfile" "${workdir}/root/luks_keyfile" install -m400 "$luks_keyfile" "${workdir}/root/luks_keyfile"
luks_args="--key-file=/root/luks_keyfile $luks_args"
}
} }
install_driver() { install_driver() {

11
usr/share/tinyramfs/init
View File

@ -89,7 +89,9 @@ findfs_sh() {
} }
unlock_luks() { unlock_luks() {
[ "$luks_discard" = 1 ] && luks_args="--allow-discards $luks_args" [ "$luks_discard" = 1 ] && luks_args="--allow-discards $luks_args"
[ -f /root/luks_header ] && luks_args="--header=/root/luks_header $luks_args"
[ -f /root/luks_keyfile ] && luks_args="--key-file=/root/luks_keyfile $luks_args"
cryptsetup $luks_args \ cryptsetup $luks_args \
luksOpen \ luksOpen \
@ -127,9 +129,10 @@ cleanup() {
} }
boot_system() { boot_system() {
exec switch_root /mnt/root \ exec switch_root \
${init:-/sbin/init} || /mnt/root \
panic "failed to boot system" ${init:-/sbin/init} ||
panic "failed to boot system"
} }
/sbin/busybox --install -s /sbin/busybox --install -s