Skip to content

Commit af5ed0a

Browse files
committed
[15-encrypt] Use correct variable, not
1 parent 2aa2581 commit af5ed0a

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

usr/lib/tik/modules/post/15-encrypt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ open_partition() {
7070
prun /usr/bin/mount -o compress=zstd:1,subvol=/@/.snapshots /dev/mapper/aeon_root ${encrypt_dir}/mnt/.snapshots
7171
prun /usr/bin/mount -o compress=zstd:1,subvol=/@/var /dev/mapper/aeon_root ${encrypt_dir}/mnt/var
7272
# Detect whether /etc is overlay else assume it's a T-U 5.0+ later bind mount
73-
if grep -qF 'overlay /etc' ${mig_dir}/mnt/etc/fstab ; then
74-
etcmountcmd=$(cat ${mig_dir}/mnt/etc/fstab | grep "overlay /etc" | sed 's/\/sysroot\//${mig_dir}\/mnt\//g' | sed 's/\/work-etc.*/\/work-etc ${mig_dir}\/mnt\/etc\//' | sed 's/overlay \/etc overlay/\/usr\/bin\/mount -t overlay overlay -o/')
73+
if grep -qF 'overlay /etc' ${encrypt_dir}/mnt/etc/fstab ; then
74+
etcmountcmd=$(cat ${encrypt_dir}/mnt/etc/fstab | grep "overlay /etc" | sed 's/\/sysroot\//${encrypt_dir}\/mnt\//g' | sed 's/\/work-etc.*/\/work-etc ${encrypt_dir}\/mnt\/etc\//' | sed 's/overlay \/etc overlay/\/usr\/bin\/mount -t overlay overlay -o/')
7575
eval prun "$etcmountcmd"
7676
else
77-
prun /usr/bin/mount -o bind ${mig_dir}/mnt/etc ${mig_dir}/mnt/etc
77+
prun /usr/bin/mount -o bind ${encrypt_dir}/mnt/etc ${encrypt_dir}/mnt/etc
7878
fi
7979
prun /usr/bin/mount ${esppart} ${encrypt_dir}/mnt/boot/efi
8080
prun /usr/bin/mount -t tmpfs tmpfs "${encrypt_dir}/mnt/run"

0 commit comments

Comments
 (0)