encrypt: recoverykey is now always slot #2

sysrich · sysrich · commit d013149dc0fe · 2024-07-31T14:29:58.000+02:00
diff --git a/usr/lib/tik/modules/post/15-encrypt b/usr/lib/tik/modules/post/15-encrypt
@@ -173,7 +173,7 @@ add_recoveryKey() {
     echo "# Adding recovery key to ${cryptpart}" > ${encrypt_pipe}
     log "[add_recoveryKey] adding recovery key to ${cryptpart}"
     prun /usr/sbin/cryptsetup luksAddKey --key-file=${tik_keyfile} --batch-mode --force-password "${cryptpart}" <<<"${key}"
-    echo '{"type":"systemd-recovery","keyslots":["1"]}' | prun /usr/sbin/cryptsetup token import "${cryptpart}"
+    echo '{"type":"systemd-recovery","keyslots":["2"]}' | prun /usr/sbin/cryptsetup token import "${cryptpart}"
     echo "100" > ${encrypt_pipe}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ add_recoveryKey() {`
`173`	`173`	`echo "# Adding recovery key to ${cryptpart}" > ${encrypt_pipe}`
`174`	`174`	`log "[add_recoveryKey] adding recovery key to ${cryptpart}"`
`175`	`175`	`prun /usr/sbin/cryptsetup luksAddKey --key-file=${tik_keyfile} --batch-mode --force-password "${cryptpart}" <<<"${key}"`
`176`		`- echo '{"type":"systemd-recovery","keyslots":["1"]}' \| prun /usr/sbin/cryptsetup token import "${cryptpart}"`
	`176`	`+ echo '{"type":"systemd-recovery","keyslots":["2"]}' \| prun /usr/sbin/cryptsetup token import "${cryptpart}"`
`177`	`177`	`echo "100" > ${encrypt_pipe}`
`178`	`178`	`}`
`179`	`179`