small fixes
This commit is contained in:
parent
7d9ee2981c
commit
c8d81207e4
2
main.sh
2
main.sh
|
@ -42,6 +42,6 @@ for i in $(seq 1 "${users[amount]}"); do
|
|||
pw+=( "${users[pw$i]}" )
|
||||
done
|
||||
|
||||
chroot "${dest}" "/tmp/installer/run_in_chroot.sh" "${cfg[diskpw]}" "${pw[@]}"
|
||||
chroot "${dest}" "/tmp/installer/run_in_chroot.sh" "${pw[@]}" "${cfg[diskpw]}"
|
||||
|
||||
umounter "${dest}"
|
||||
|
|
|
@ -80,10 +80,10 @@ fi
|
|||
|
||||
target_partition="${target_partition_tmp}"
|
||||
if [[ ! "${cfg[fde_key_store]}" == "none" ]]; then
|
||||
#echo -n "${cfg[diskpw]}" | cryptsetup luksFormat --type luks1 "${target_partition}" -d -
|
||||
#echo -n "${cfg[diskpw]}" | cryptsetup luksOpen "${target_partition}" "voidluks-${diskid}" -d -
|
||||
echo -n "oem" | cryptsetup luksFormat --type luks1 "${target_partition}" -d -
|
||||
echo -n "oem" | cryptsetup luksOpen "${target_partition}" "voidluks-${diskid}" -d -
|
||||
echo -n "${cfg[diskpw]}" | cryptsetup luksFormat --type luks1 "${target_partition}" -d -
|
||||
echo -n "${cfg[diskpw]}" | cryptsetup luksOpen "${target_partition}" "voidluks-${diskid}" -d -
|
||||
#echo -n "oem" | cryptsetup luksFormat --type luks1 "${target_partition}" -d -
|
||||
#echo -n "oem" | cryptsetup luksOpen "${target_partition}" "voidluks-${diskid}" -d -
|
||||
target_partition="/dev/mapper/voidluks-${diskid}"
|
||||
fi
|
||||
|
||||
|
|
|
@ -12,8 +12,8 @@ for i in $(seq 1 "${users[amount]}"); do
|
|||
fi
|
||||
|
||||
echo password for "${users[name$i]}"
|
||||
#echo -e "${users[pw$i]}\n${users[pw$i]}" | passwd "${users[name$i]}"
|
||||
echo -e "oem\noem" | passwd "${users[name$i]}"
|
||||
echo -e "${users[pw$i]}\n${users[pw$i]}" | passwd "${users[name$i]}"
|
||||
#echo -e "oem\noem" | passwd "${users[name$i]}"
|
||||
else
|
||||
echo bereits in /etc/passwd vorhanden: "${users[name$i]}"
|
||||
echo ueberspinge..
|
||||
|
|
Loading…
Reference in New Issue
Block a user