From 607e54669166783de341fd9d4ddba3c8e7c8947c Mon Sep 17 00:00:00 2001 From: "Alex Xu (Hello71)" Date: Wed, 16 Dec 2020 11:36:47 -0500 Subject: simplify autologin, don't use UUID --- init | 7 ++----- unlock | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/init b/init index acf0406..70fb4e3 100644 --- a/init +++ b/init @@ -24,8 +24,7 @@ udhcpc -i eth0 dropbear -p 2222 ) >/dev/null 2>&1 & -root=$(findfs UUID=ec8fb072-1200-4275-9494-f6f869187806) || exit -if cryptsetup open --tries 65535 --allow-discards --perf-no_read_workqueue --perf-no_write_workqueue "$root" root; then +if cryptsetup open --tries 65535 /dev/nvme0n1p2 root; then autologin=1 fi [ -e /dev/mapper/root ] || exit @@ -37,9 +36,7 @@ kill -9 -1 cd /mnt || exit if [ -n "$autologin" ]; then mount -t tmpfs -o mode=755,nodev,nosuid,strictatime tmpfs run || exit - mkdir -p run/systemd/system/getty.target.wants || exit - ln -s /dev/null run/systemd/system/getty.target.wants/getty@tty1.service || exit - ln -s /etc/systemd/system/getty-autologin.service run/systemd/system/getty.target.wants/ || exit + touch run/autologin || exit fi umount -n /dev/pts /dev /proc exec switch_root . /usr/lib/systemd/systemd diff --git a/unlock b/unlock index a5aaa70..d034674 100644 --- a/unlock +++ b/unlock @@ -1,3 +1,3 @@ #!/bin/sh -root=$(findfs UUID=ec8fb072-1200-4275-9494-f6f869187806) && cryptsetup open --allow-discards "$root" root && pkill cryptsetup +cryptsetup open /dev/nvme0n1p2 root && pkill cryptsetup -- cgit v1.2.3-54-g00ecf