fix: echo - outputs -
This commit is contained in:
parent
e06284ca50
commit
5355b3eca2
4
config
4
config
@ -10,8 +10,8 @@ disk_passwd=cryptroot
|
||||
swapfile=1024 # MiB
|
||||
|
||||
username=ange
|
||||
user_passwd=ange
|
||||
root_passwd=root
|
||||
userpasswd=ange
|
||||
rootpasswd=root
|
||||
|
||||
shell=zsh
|
||||
|
||||
|
@ -11,4 +11,4 @@ locale-gen
|
||||
|
||||
echo "LANG=$lang.UTF-8" > /etc/locale.conf
|
||||
|
||||
echo - "$hostname" > /etc/hostname
|
||||
echo "$hostname" > /etc/hostname
|
||||
|
@ -4,5 +4,5 @@
|
||||
shell="$(sed -n "/$shell/{p;q}" /etc/shells)"
|
||||
useradd -mG wheel,video "$username" -s "${shell:-/bin/bash}"
|
||||
|
||||
echo "root:$root_passwd" | chpasswd
|
||||
echo - "$username:$user_passwd" | chpasswd
|
||||
echo "root:$rootpasswd" | chpasswd
|
||||
echo "$username:$userpasswd" | chpasswd
|
||||
|
@ -5,10 +5,10 @@ BOLD=$'\e[1m'
|
||||
GREEN=$'\e[32m'
|
||||
NORMAL=$'\e[0m'
|
||||
|
||||
echo -e "${BOLD}${GREEN}DONE. Umount? [Y/n]${NORMAL} " && read -r ANS
|
||||
echo "${BOLD}${GREEN}DONE. Umount? [Y/n]${NORMAL} " && read -r ANS
|
||||
|
||||
case "$ANS" in
|
||||
[Yy]*) ;;
|
||||
''|[Yy]*) ;;
|
||||
*) exit ;;
|
||||
esac
|
||||
|
||||
|
@ -10,7 +10,7 @@ boot=/dev/disk/by-partlabel/boot
|
||||
root=/dev/disk/by-partlabel/root
|
||||
|
||||
[ -n "$disk_passwd" ] && {
|
||||
echo -n - "$disk_passwd" | cryptsetup luksFormat "$root" -
|
||||
echo -n "$disk_passwd" | cryptsetup luksFormat "$root" -
|
||||
cryptsetup open "$root" cryptroot - <<< "$disk_passwd"
|
||||
root=/dev/mapper/cryptroot
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user