11 Commits

5 changed files with 41 additions and 16 deletions

View File

@@ -54,6 +54,7 @@ openssh-{client,server} \
popularity-contest \ popularity-contest \
printer-driver-all \ printer-driver-all \
rsync \ rsync \
sudo \
systemd-timesyncd \ systemd-timesyncd \
tasksel \ tasksel \
zfs-initramfs \ zfs-initramfs \

28
mount.sh Executable file
View File

@@ -0,0 +1,28 @@
#!/bin/bash
set -euo pipefail
mount \
--types proc \
proc \
/mnt/proc
mount \
--types sysfs \
sys \
/mnt/sys
mount \
--bind \
/dev \
/mnt/dev
mount \
--types devpts \
pts \
/mnt/dev/pts
mount \
--types efivarfs \
efivarfs \
/mnt/sys/firmware/efi/efivars

View File

@@ -84,7 +84,7 @@ elif [[ "${ID}" == 'debian' ]]; then
"${baseDir}/debian.sh" --sources "${baseDir}/debian.sh" --sources
fi fi
"${baseDir}/rbind.sh" "${baseDir}/mount.sh"
"${baseDir}/host-id.sh" "${baseDir}/host-id.sh"

View File

@@ -35,9 +35,9 @@ nmcli radio wifi on
nmcli device wifi list nmcli device wifi list
printf "Enter the SSID of the WiFi network you wish to connect to:\n" printf "Enter the SSID of the WiFi network you wish to connect to:\n"
read -r WIFI_NAME read -r wifiName
nmcli --ask device wifi connect ${wifiName} nmcli --ask device wifi connect "${wifiName}"
cat << EOF cat << EOF

22
zfs.sh
View File

@@ -30,14 +30,14 @@ if [[ "${1}" == '--format' ]]; then
while [[ ! "${zpoolPassword}" == "${zpoolPasswordVerify}" ]] || [[ -z "${zpoolPassword}" ]] || [[ "${#zpoolPassword}" -lt '8' ]]; do while [[ ! "${zpoolPassword}" == "${zpoolPasswordVerify}" ]] || [[ -z "${zpoolPassword}" ]] || [[ "${#zpoolPassword}" -lt '8' ]]; do
printf \ printf \
"\nEnter a password to encrypt your root pool (minimum 8 characters):\n" "Enter a password to encrypt your root pool (minimum 8 characters):\n"
read \ read \
-r \ -r \
-s \ -s \
zpoolPassword zpoolPassword
printf \ printf \
"\nVerify the password to encrypt your root pool:\n" "Verify the password to encrypt your root pool:\n"
read \ read \
-r \ -r \
-s \ -s \
@@ -45,13 +45,13 @@ if [[ "${1}" == '--format' ]]; then
if [[ ! "${zpoolPassword}" == "${zpoolPasswordVerify}" ]]; then if [[ ! "${zpoolPassword}" == "${zpoolPasswordVerify}" ]]; then
printf \ printf \
"ERROR:\tPasswords do not match!\n" "ERROR:\tPasswords do not match!\n\n"
elif [[ -z "${zpoolPassword}" ]]; then elif [[ -z "${zpoolPassword}" ]]; then
printf \ printf \
"ERROR:\tPassword is empty!\n" "ERROR:\tPassword is empty!\n\n"
elif [[ "${#zpoolPassword}" -lt '8' ]]; then elif [[ "${#zpoolPassword}" -lt '8' ]]; then
printf \ printf \
"ERROR:\tPassword is too short!\n" "ERROR:\tPassword is too short!\n\n"
fi fi
done done
@@ -222,17 +222,13 @@ if [[ "${1}" == '--key' ]]; then
fi fi
if [[ "${1}" == '--unmount' ]]; then if [[ "${1}" == '--unmount' ]]; then
mount | grep -v zfs | tac | awk '/\/mnt/ {print $3}' | xargs -I {} umount -Rlf {} umount \
-nR \
if [[ "${ID}" == 'fedora' ]]; then /mnt
umount \
-nR \
/mnt
fi
zpool \ zpool \
export \ export \
-a ${hostname,,}
fi fi
if [[ "${1}" == '--host-id' ]]; then if [[ "${1}" == '--host-id' ]]; then