19-define-os-ip #24

Merged
hygienic-books merged 23 commits from 19-define-os-ip into main 2023-11-12 03:26:37 +00:00
Showing only changes of commit d7d41eec5b - Show all commits

View File

@ -72,12 +72,12 @@ function setup_env_vars () {
echo
echo 'Do you want compressed datasets?'
select arg_compressed in "Compressed" "Uncompressed"; do
select arg_compressed in 'Compressed' 'Uncompressed'; do
case "${arg_compressed}" in
Compressed)
'Compressed')
break
;;
Uncompressed)
'Uncompressed')
ARCHZBM_ZFSPROPS_NO_COMPRESSION='true'
break
;;
@ -85,12 +85,12 @@ function setup_env_vars () {
done <&3 && echo
echo 'Do you want encrypted datasets?'
select arg_encrypted in "Encrypted" "Unencrypted"; do
select arg_encrypted in 'Encrypted' 'Unencrypted'; do
case "${arg_encrypted}" in
Encrypted)
'Encrypted')
break
;;
Unencrypted)
'Unencrypted')
ARCHZBM_ZFSPROPS_NO_ENCRYPTION='true'
break
;;
@ -99,13 +99,13 @@ function setup_env_vars () {
if [[ "${arg_encrypted}" = 'Encrypted' ]]; then
echo 'Do you want a custom dataset decryption password?'
select arg_custom_dataset_pw in "Yes" "No"; do
select arg_custom_dataset_pw in 'Yes' 'No (use '"'"'password'"'"')'; do
case "${arg_custom_dataset_pw}" in
Yes)
'Yes')
want_custom_dataset_pw='true'
break
;;
No)
'No (use '"'"'password'"'"')')
break
;;
esac
@ -119,13 +119,13 @@ function setup_env_vars () {
fi
echo 'Do you want a custom '"'"'root'"'"' user password?'
select arg_custom_root_pw in "Yes" "No"; do
select arg_custom_root_pw in 'Yes' 'No (use '"'"'password'"'"')'; do
case "${arg_custom_root_pw}" in
Yes)
'Yes')
want_custom_root_pw='true'
break
;;
No)
'No (use '"'"'password'"'"')')
break
;;
esac
@ -152,7 +152,7 @@ function setup_env_vars () {
if [[ "${want_ssh_in_zbm}" ]]; then
echo 'How do you want to assign an IP address in ZFSBootMenu?'
select arg_ip_autoconf_method in "Statically" "Dynamically, DHCP" "Dynamically, BOOTP" "Dynamically, RARP"; do
select arg_ip_autoconf_method in 'Statically' 'Dynamically, DHCP' 'Dynamically, BOOTP' 'Dynamically, RARP'; do
case "${arg_ip_autoconf_method}" in
'Statically')
ARCHZBM_NET_AUTOCONF='none'
@ -188,7 +188,7 @@ function setup_env_vars () {
fi
echo 'Do you want a custom SSH listening port?'
select arg_custom_ssh_port in "Yes (let me specify)" "No (keep port 22)"; do
select arg_custom_ssh_port in 'Yes (let me specify)' 'No (keep port 22)'; do
case "${arg_custom_ssh_port}" in
'Yes (let me specify)')
want_custom_ssh_port='true'
@ -206,7 +206,7 @@ function setup_env_vars () {
fi
echo 'Do you want the SSH daemon to use a custom keepalive send interval?'
select arg_custom_ssh_keepalive_intvl in "Yes (let me specify)" "No (keep 1)"; do
select arg_custom_ssh_keepalive_intvl in 'Yes (let me specify)' 'No (keep 1)'; do
case "${arg_custom_ssh_keepalive_intvl}" in
'Yes (let me specify)')
want_custom_keepalive_intvl='true'
@ -282,7 +282,7 @@ function setup_env_vars () {
fi
if [[ "${want_ssh_in_zbm}" ]]; then
echo 'Do you want to define OS root user'"'"'s SSH pub key?'
echo 'Do you want to define OS '"'"'root'"'"' user'"'"'s SSH pub key?'
select arg_root_pub_keys in 'Yes (let me specify)' 'Yes (use ZBM pub keys)' 'No (don'"'"'t enable sshd.service)'; do
case "${arg_root_pub_keys}" in
'Yes (let me specify)')