Commit 2c2325b4 authored by Guido Gunther's avatar Guido Gunther
Browse files

Merge branch 'drop-luks-fixup' into 'master'

root.sh: Drop luks fixup

See merge request !192
parents db1e1c4b 22b94840
Pipeline #68137 passed with stage
in 8 seconds
...@@ -92,10 +92,6 @@ EOF ...@@ -92,10 +92,6 @@ EOF
# Hack up cryttab until askpass supports it # Hack up cryttab until askpass supports it
sed -i 's%discard%discard,keyscript=/usr/share/initramfs-tools/scripts/osk-sdl-keyscript%' "${basedir}/etc/crypttab" sed -i 's%discard%discard,keyscript=/usr/share/initramfs-tools/scripts/osk-sdl-keyscript%' "${basedir}/etc/crypttab"
chroot "${basedir}" update-initramfs -u chroot "${basedir}" update-initramfs -u
# Work around https://source.puri.sm/Librem5/librem5-devkit-tools/-/issues/32
BLKID=$(sudo blkid -c /dev/null -o value -s 'UUID' /dev/mapper/crypt_root)
sed -i "s%root=[^\"]\\+%root=UUID=${BLKID}%" "${basedir}/etc/flash-kernel/ubootenv.d/root"
chroot "${basedir}" flash-kernel chroot "${basedir}" flash-kernel
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment