Too many improvements to list (#11)

* Improve logging

* Bug fixes. Tailscale funnel/serve changes

* Allow --secrets to specify secrets dir

* prelogin

* Upgrade/fix remaning issues

.dockerignore

@@ -7,7 +7,7 @@ Dockerfile
 output
 *.qcow2
 hostname
-ttyd_pushover.conf
+zquickinit.conf
 tailscaled.state*
 *.efi
 *.iso

.gitignore

@@ -1,12 +1,14 @@
+out
 output
 *.qcow2
 hostname
-ttyd_pushover.conf
+zquickinit.conf
 tailscaled.state*
 *.efi
 *.iso
 cache
 *test*
 *ssh_host*
+*sshd_config*
 *.code-workspace
-authorized_keys
+authorized_keys

Dockerfile

@@ -10,7 +10,7 @@
 
 # Use the official Void Linux container
 FROM ghcr.io/void-linux/void-glibc-full 
-LABEL org.opencontainers.image.source https://github.com/midzelis/zquickinit
+LABEL org.opencontainers.image.source=https://github.com/midzelis/zquickinit
 
 ARG XBPS_REPOS="https://repo-fastly.voidlinux.org/current https://repo-fastly.voidlinux.org/current/nonfree"
 
@@ -21,7 +21,7 @@ ARG XBPS_REPOS="https://repo-fastly.voidlinux.org/current https://repo-fastly.vo
 # Default: install 5.10, 5.15, 6.1 and 6.2
 #
 # (multiple entries must be seperated by spaces)
-ARG KERNELS="linux5.10 linux5.15 linux6.1 linux6.2" 
+ARG KERNELS="linux5.10 linux5.15 linux6.1 linux6.2 linux6.6 linux6.8" 
 
 # Run the following within an external cache (/var/cache/xbps) for the 
 # package manager; so when this layer is rebuilt, at least you save 
@@ -81,6 +81,7 @@ ARG PACKAGES=
 # Run ${PACKAGES} install in seperate layer so that the zfs dkms packages 
 # are not rebuilt when ${PACKAGES} change. reuse. Additionally: use xbps cache. 
 RUN --mount=type=cache,target=/var/cache/xbps <<-EOF 
+
 	# Install ZFSBootMenu dependencies and components necessary to build images
 	xbps-install -S
 	xbps-install -y ${PACKAGES}
@@ -116,6 +117,10 @@ RUN <<-EOF
 
 COPY --chmod=755 zquickinit.sh /
 
+RUN ls /usr/bin 
+# use busybox-huge version (vs busybox.static) (for syslogd support)
+RUN [ -x /usr/bin/busybox ] && cp -f /usr/bin/busybox /usr/lib/initcpio/busybox || true
+
 # Run the build script with no arguments by default
 ENTRYPOINT [ "/zquickinit.sh" ]
 ENV RUNNING_IN_CONTAINER=1

README.md

@@ -288,8 +288,11 @@ Uses Hooks:
   * `/zquick/hooks/ifup.d`
   * `/zquick/hooks/ifdown.d`
 
-Config Files: 
-* `ttyd_pushover.conf` -> `/zquick/etc/ttyd_pushover.conf`
+Config Properties (in zquickinit.conf) 
+`
+PUSHOVER_APP_TOKEN=aabbccddaabbccddaabbccdd
+PUSHOVER_USER_KEY=aabbccddaabbccddaabbccdd
+`
 
 ### zquick_installer
   * Provides script `zquick_installer.sh` 

recipes/zquick_bootstrap/fs/zquick/hooks/bash.d/90-installer.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+if [[ "0" == "$(zpool list -H 2>/dev/null | wc | awk '{print $1}')" ]]; then
+    gum style --foreground="#daa520" "Note: no zfs pools found"
+    #/zquick/zbootstrap.sh
+fi
+gum format -- "## zbootstrap.sh" "- install/upgrade Zquickinit" "- install Proxmox" "- convert LVM boot to ZFS root datasets" "- encrypt ZFS root datasets" ""
+echo