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

root.sh: Drop luks fixup

See merge request !192

root.sh

@@ -92,10 +92,6 @@ EOF
   # Hack up cryttab until askpass supports it
   sed -i 's%discard%discard,keyscript=/usr/share/initramfs-tools/scripts/osk-sdl-keyscript%' "${basedir}/etc/crypttab"
   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
 }