it verks!

potassium-os · May 9, 2024 · 2d57579 · 2d57579
1 parent 9a2d8da
commit 2d57579
Show file tree

Hide file tree

Showing 12 changed files with 249 additions and 184 deletions.
diff --git a/dev-build-installer.sh → build.sh b/dev-build-installer.sh → build.sh
diff --git a/conf.yml.example b/conf.yml.example
@@ -0,0 +1,18 @@
+---
+
+# Hostname to set
+hostname: "potassium-os"
+
+root_password: "potassium"
+
+ssh_pubkey: "ssh-rsa <snip>"
+
+kernel_cmdline: " console=tty0 console=ttyS0,115200 console=ttyS1,115200 "
+
+# Define disks to use in zpools for rpool/bpool
+# Only mirroring layouts are supported for now
+zpool_disks:
+  - /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi0
+  - /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi1
+
+zpool_layout: "mirror"
diff --git a/debian-live/source/config/hooks/live/0099-create-user.hook.chroot b/debian-live/source/config/hooks/live/0099-create-user.hook.chroot
@@ -34,7 +34,7 @@ esac
 
 if [ -z "$DISPLAY" ] && [[ $(tty) = "/dev/tty1" || $(tty) = "/dev/ttyS0" ]]; then
   echo "Login on $(tty), starting installer" | tee -a "${HOME}/installer.log" | sudo tee /dev/kmesg
-  screen -S potassium-installer "/usr/local/bin/potassium-installer.sh"
+  screen -L -Logfile "${HOME}/installer.screen.log" -S potassium-installer "/usr/local/bin/potassium-installer.sh"
 else
   echo "You logged in on $(tty), so we didn't start the installer for you (that only happens on tty1 and ttyS0)."
   echo "Feel free to look around, fix things, etc., and when you're ready, start the installer with"
@@ -44,7 +44,6 @@ fi
 EOF
 
 cat <<'EOF' >> /home/installer/.screenrc
-
 # Enable mouse scrolling and scroll bar history scrolling
 termcapinfo xterm* ti@:te@
 

diff --git a/debian-live/source/config/hooks/live/0099-set-systemd-services.hook.chroot b/debian-live/source/config/hooks/live/0099-set-systemd-services.hook.chroot
@@ -11,6 +11,3 @@ systemctl enable generate-ssh-hostkeys.service
 systemctl enable ssh.service
 
 systemctl enable fetch-ssh-key.service
-
-systemctl disable zfs-import-cache.service
-systemctl disable zfs-import.target
diff --git a/debian-live/source/config/hooks/live/9999-minimal.hook.chroot b/debian-live/source/config/hooks/live/9999-minimal.hook.chroot
diff --git a/debian-live/source/config/package-lists/potassium-installer.list.chroot b/debian-live/source/config/package-lists/potassium-installer.list.chroot
@@ -8,9 +8,9 @@ gettext
 screen
 linux-image-amd64
 linux-headers-amd64
-
-zfs-dkms
-zfsutils-linux
-
 debootstrap
 gdisk
+efibootmgr
+less
+dosfstools
+tree
diff --git a/installer/potassium-installer.sh b/installer/potassium-installer.sh
@@ -31,6 +31,7 @@ function _main () {
   read -rp "  Press enter to continue, SIGINT to exit."
 
   # Install steps (in order)
+  # "finalize-system"
   INSTALL_STEPS=( "prerequs" "load-installer-config" "make-zfs-pools" "debootstrap-system" "chroot-system-setup" "finalize-system" )
   # run each installation step
   for STEP in "${INSTALL_STEPS[@]}"; do
@@ -59,7 +60,7 @@ LOGO=$(cat <<END
   ╚════════════════════════════╝  
 
   Potassium
-  root-on-zfs installer v0.0.1
+  root-on-zfs installer v1.1.0-rc0
 
 END
 )

diff --git a/installer/potassium/chroot-system-setup.sh b/installer/potassium/chroot-system-setup.sh
diff --git a/installer/potassium/finalize-system.sh b/installer/potassium/finalize-system.sh
@@ -27,9 +27,23 @@ function _main () {
   # shellcheck source=common.sh
   . "${TOP_DIR}/potassium/common.sh"
 
+  sudo chroot \
+    /mnt \
+    /bin/bash -c '
+      umount -R /boot
+      cd /root
+      zfs unmount -a || true
+      cd /
+      zfs unmount -a || true
+    '
   mount | grep -v zfs | tac | awk '/\/mnt/ {print $3}' | \
       xargs -i{} sudo -E umount -lf {}
-  sudo -E zpool export -a
+  sudo -E zpool export -a || true
+
+  printf '\n\n\n  Installation finished\n\n\n'
+  read -rp "  Press enter to reboot, SIGINT to exit to a shell."
+  sleep 5
+  sudo systemctl reboot
 }
 
 # Call main() to start the script

diff --git a/installer/potassium/load-installer-config.sh b/installer/potassium/load-installer-config.sh
@@ -59,9 +59,8 @@ function _main () {
 
   echo "${INSTALLER_CONF_YAML}" | tee "${HOME}/potassium-installer-config.yml" | _log
   if [ -n "${INSTALLER_CONF_YAML}" ]; then
-    _log "Loaded config sucessfully:\n\n"
+    _log "Loaded config sucessfully:"
     _log "${INSTALLER_CONF_YAML}"
-    _log "\n\n"
     export INSTALLER_CONF_YAML
   else
     _log "INSTALLER_CONF_YAML appears to be empty, cannot continue"

diff --git a/installer/potassium/make-zfs-pools.sh b/installer/potassium/make-zfs-pools.sh
@@ -28,31 +28,33 @@ function _main () {
   . "${TOP_DIR}/potassium/common.sh"
 
   _log "Selecting disks from config yaml"
-
-  ZPOOL_DISKS_STRING=$(yq '.zpool_disks[]' <<< "${INSTALLER_CONF_YAML}")
-  readarray -td, ZPOOL_DISKS <<<"$ZPOOL_DISKS_STRING,"
+  ZPOOL_DISKS_STRING=$(yq '.zpool_disks[]' <<< "${INSTALLER_CONF_YAML}" | sed 's/"//g')
+  readarray -t ZPOOL_DISKS <<< "${ZPOOL_DISKS_STRING}"
   export ZPOOL_DISKS
-
-  _log "${ZPOOL_DISKS}"
-
   _log "Selected disks for installation: ${ZPOOL_DISKS[*]}"
 
   _log "Wiping disks and creating partitions"
-  for i in "${!ZPOOL_DISKS[@]}"; do
-    sudo -E /usr/sbin/wipefs -af "${ZPOOL_DISKS[$i]}"
-    sudo -E /usr/sbin/sgdisk --zap-all "${ZPOOL_DISKS[$i]}"
-    sudo -E /usr/sbin/sgdisk -n2:1M:+512M -t2:EF00 "${ZPOOL_DISKS[$i]}"
-    sudo -E /usr/sbin/sgdisk -n3:0:+2G -t3:BF01 "${ZPOOL_DISKS[$i]}"
-    sudo -E /usr/sbin/sgdisk -n4:0:0 -t4:BF00 "${ZPOOL_DISKS[$i]}"
+  for DISK in "${ZPOOL_DISKS[@]}"; do
+    # DISK="$( echo \"${DISK}\" | sed 's/"//g' )"
+    _log "Wiping and creating partitions on ${DISK}"
+    sudo -E /usr/sbin/wipefs -af "${DISK}"
+    sudo -E /usr/sbin/sgdisk --zap-all "${DISK}"
+    sudo -E /usr/sbin/sgdisk -n2:1M:+512M -t2:EF00 "${DISK}"
+    sudo -E /usr/sbin/sgdisk -n3:0:+2G -t3:BF01 "${DISK}"
+    sudo -E /usr/sbin/sgdisk -n4:0:0 -t4:BF00 "${DISK}"
   done
 
   for i in "${!ZPOOL_DISKS[@]}"; do
-    export DISKS_PARTS_ESP[$i]="${ZPOOL_DISKS[$i]}-part2"
-    export DISKS_PARTS_BPOOL[$i]="${ZPOOL_DISKS[$i]}-part3"
-    export DISKS_PARTS_RPOOL[$i]="${ZPOOL_DISKS[$i]}-part4"
+    DISKS_PARTS_ESP[i]="${ZPOOL_DISKS[$i]}-part2"
+    DISKS_PARTS_BPOOL[i]="${ZPOOL_DISKS[$i]}-part3"
+    DISKS_PARTS_RPOOL[i]="${ZPOOL_DISKS[$i]}-part4"
   done
 
-  ZPOOL_LAYOUT=$(yq '.zpool_layout' <<< "${INSTALLER_CONF_YAML}")
+  export DISKS_PARTS_ESP
+  export DISKS_PARTS_BPOOL
+  export DISKS_PARTS_RPOOL
+
+  ZPOOL_LAYOUT=$(yq '.zpool_layout' <<< "${INSTALLER_CONF_YAML}" | sed 's/"//g')
   export ZPOOL_LAYOUT
 
   _log "Creating bpool on disks ${DISKS_PARTS_BPOOL[*]}"
@@ -68,8 +70,11 @@ function _main () {
     -O normalization=formD \
     -O relatime=on \
     -O canmount=off -O mountpoint=/boot -R /mnt \
+    -f \
     bpool "${ZPOOL_LAYOUT}" "${DISKS_PARTS_BPOOL[@]}"
 
+  _log "Creating rpool on disks ${DISKS_PARTS_RPOOL[*]}"
+
   sudo -E zpool create \
     -o ashift=12 \
     -o autotrim=on \
@@ -78,7 +83,10 @@ function _main () {
     -O normalization=formD \
     -O relatime=on \
     -O canmount=off -O mountpoint=/ -R /mnt \
+    -f \
     rpool "${ZPOOL_LAYOUT}" "${DISKS_PARTS_RPOOL[@]}"
+
+  _log "Creating datasets"
 
   sudo -E zfs create -o canmount=off -o mountpoint=none rpool/ROOT
   sudo -E zfs create -o canmount=off -o mountpoint=none bpool/BOOT

diff --git a/installer/potassium/prerequs.sh b/installer/potassium/prerequs.sh
@@ -40,6 +40,22 @@ function _main () {
 
   # Ensure apt/dpkg don't try to spawn a tui
   export DEBIAN_FRONTEND="noninteractive"
+
+  _log "Installing zfs-dkms"
+
+  sudo apt-get -yq update
+
+  sudo apt-get -yq install \
+    zfs-dkms \
+    zfsutils-linux
+
+  sudo systemctl disable zfs-import-cache.service
+  sudo systemctl disable zfs-import.target
+
+  sudo systemctl stop zfs-import-cache.service
+  sudo systemctl stop zfs-import.target
+
+  sudo modprobe zfs
 }
 
 # Call main() to start the script