Backup/Restore ZFS datasets, show ip, fixes (#12)

recipes/zquick_core/fs/init

@@ -49,10 +49,15 @@ start_getty() {
     fi
 }
 
+export TERMINFO_DIRS=/usr/share/terminfo
+export TERM=xterm-256color
+
 . /zquick/libexec/utils.sh
 
-# shellcheck disable=SC1091
-. /etc/zquickinit.conf
+if [[ -f "/etc/zfsbootmenu.conf" ]]; then
+    # shellcheck disable=SC1091
+    source /etc/zfsbootmenu.conf
+fi
 
 trap '' EXIT INT TERM
 #tput clear

recipes/zquick_core/fs/zquick/init

@@ -25,7 +25,10 @@ cat <<EOF
 
 EOF
 
-source /etc/zfsbootmenu.conf
+if [[ -f "/etc/zfsbootmenu.conf" ]]; then
+  source /etc/zfsbootmenu.conf
+fi
+
 echo The controlling terminal is ${control_term}
 echo This terminal is $(tty)
 echo

recipes/zquick_core/initcpio/install/zquick_core

@@ -14,6 +14,8 @@ add_terminfo() {
 build() {
 	zquick_add_fs
 
+	add_binary lscpu
+
 	zquick_add_secret /etc/zquickinit.conf "zquick init"
 
 	add_terminfo
@@ -31,6 +33,10 @@ build() {
 	add_binary loadkeys
 	add_binary lspci
 	add_binary lshw
+
+	# prefer real readlink over busybox
+	add_binary readlink
+
 	if which yq-go >/dev/null; then
 		add_binary yq-go /bin/yq
 	else
@@ -90,7 +96,7 @@ build() {
 			libpaths+=("$line")
 		done <"$conf"
 	done
-	libs=(security/pam_warn.so security/pam_deny.so security/pam_unix.so security/pam_env.so security/pam_nologin.so)
+	libs=(security/pam_warn.so security/pam_deny.so security/pam_unix.so security/pam_env.so security/pam_nologin.so libnss_wrapper.so)
 	for llib in "${libs[@]}"; do
 		for ldir in "${libpaths[@]}"; do
 			lib=${ldir}/${llib}
@@ -99,7 +105,10 @@ build() {
 	done
 
 	# UDEV stuff
-	use_systemd=$(sed -rn '/^use_systemd=/s/.*=(.*)/\1/p' "${zquickinit_config}/etc/zquickinit.conf")
+	use_systemd="no"
+	if [[ -f "${zquickinit_config}/etc/zquickinit.conf" ]]; then
+		use_systemd=$(sed -rn '/^use_systemd=/s/.*=(.*)/\1/p' "${zquickinit_config}/etc/zquickinit.conf")
+	fi
 	if [[ "${use_systemd}" = "yes" ]]; then
 		echo "use systemd"
 	else

recipes/zquick_core/recipe.yaml

@@ -8,7 +8,7 @@ xbps-packages:
   - busybox-huge
   - util-linux
   - pciutils
-  - lshw
+  - lshw - nss_wrapper
 debian-packages:
   - kbd
 help: "Required common dependencies to all recipes"

recipes/zquick_hostname/initcpio/install/zquick_hostname

@@ -2,16 +2,21 @@
 
 build() {
 
+	zquick_add_fs
+
+	if [[ $RELEASE == 1 ]]; then
+		echo "Zquickinit" >"$BUILDROOT/etc/hostname"
+		return
+	fi
+
 	for hostname in "$zquickinit_config/etc/hostname" "/etc/hostname"; do
 		[[ -f "$hostname" ]] && break
 	done
 
-	warning "using $hostname"
 	if [ ! -r "$hostname" ]; then
 		warning "Hostname not found"
 	else
 		add_file "$hostname" /etc/hostname
 	fi
 
-	zquick_add_fs
 }

recipes/zquick_lvm/initcpio/install/zquick_lvm

@@ -13,8 +13,8 @@ build() {
 
     # binaries from lvm2
     add_binary "lvm"
-	if which lvmetad > /dev/null; then
-		add_binary "lvmetad"
+    if which lvmetad >/dev/null 2>&1; then
+        add_binary "lvmetad"
     fi
 
     # binaries from device-mapper
@@ -44,4 +44,4 @@ build() {
 
     add_file "/etc/lvm/lvm.conf"
 
-}
+}

recipes/zquick_qemu/fs/zquick/hooks/init.d/20-qemu_up.sh

@@ -2,9 +2,12 @@
 
 source /zquick/libexec/utils.sh
 
-qinitlog "QEMU mounting shared directories /mnt/qemu-host, /mnt/cache"
+if grep -q "hypervisor" /proc/cpuinfo; then
 
-mkdir -p /mnt/qemu-host
-mount -t 9p -o trans=virtio qemuhost /mnt/qemu-host -oversion=9p2000.L,posixacl,msize=104857600 >/dev/null 2>&1 || rmdir /mnt/qemu-host
-mkdir -p /mnt/cache
-mount -t 9p -o trans=virtio qemucache /mnt/cache -oversion=9p2000.L,posixacl,msize=104857600 >/dev/null 2>&1 || rmdir /mnt/cache
+    qinitlog "Detected KVM: QEMU mounting shared directories /mnt/qemu-host, /mnt/cache"
+
+    mkdir -p /mnt/qemu-host
+    mount -t 9p -o trans=virtio qemuhost /mnt/qemu-host -oversion=9p2000.L,posixacl,msize=104857600 >/dev/null 2>&1 || rmdir /mnt/qemu-host
+    mkdir -p /mnt/cache
+    mount -t 9p -o trans=virtio qemucache /mnt/cache -oversion=9p2000.L,posixacl,msize=104857600 >/dev/null 2>&1 || rmdir /mnt/cache
+fi

recipes/zquick_sshd/initcpio/install/zquick_sshd

@@ -1,5 +1,25 @@
 #!/bin/bash
 
+wrap_user() {
+	U=$(id -u)
+	G=$(id -g)
+
+	HOME_DIR=/tmp/user
+	PASSWD=/var/tmp/passwd
+	GROUP=/var/tmp/group
+
+	if [ ! -d "$HOME_DIR" ]; then
+		mkdir "$HOME_DIR"
+	fi
+	if [ ! -f "$PASSWD" ]; then
+		echo "user::$U:$G::$HOME_DIR:" >"$PASSWD"
+	fi
+	if [ ! -f "$GROUP" ]; then
+		echo "user::$G:" >"$GROUP"
+	fi
+
+	LD_PRELOAD=libnss_wrapper.so NSS_WRAPPER_PASSWD="$PASSWD" NSS_WRAPPER_GROUP="$GROUP" "$@"
+}
 build() {
 	zquick_add_fs
 
@@ -19,14 +39,14 @@ build() {
 	zquick_add_secret /etc/ssh/sshd_config "sshd configuration" 644
 
 	if [[ ! -e "${BUILDROOT}/etc/ssh/ssh_host_rsa_key" && ! -e "${BUILDROOT}/etc/ssh/ssh_host_ecdsa_key" && ! -e "${BUILDROOT}/etc/ssh/ssh_host_ed25519_key" ]]; then
-		msg2 "No host keys specified, autogenerating new keys for this build. Keys will be not be saved to zquickinit configuration area."
-		ssh-keygen -A -f "${BUILDROOT}"
+		msg2 "NOTICE: No host keys specified, autogenerating new keys for this build. Keys will be not be saved to zquickinit configuration area."
+		wrap_user ssh-keygen -A -f "${BUILDROOT}"
 	fi
 
 	if [[ ! -e "${BUILDROOT}/etc/ssh/sshd_config" ]]; then
 		msg2 "sshd_config not found, sshd will likely not run until this file is present. (Can be injected into image later)"
 	elif [[ ! -e "${BUILDROOT}/root/.ssh/authorized_keys" ]]; then
-		msg2 "/root/.ssh/authorized_keys not found."
+		msg2 "NOTICE: /root/.ssh/authorized_keys not found."
 	fi
 
 }

recipes/zquick_sshd/recipe.yaml

@@ -1,3 +1,3 @@
 xbps-packages:
- - openssh
-help:  "Includes: `sshd` (OpenSSH)"
+  - openssh
+help: "Includes: `sshd` (OpenSSH)"

recipes/zquick_tailscale/fs/zquick/hooks/ifdown.d/tailscale_down

@@ -3,6 +3,6 @@
 # shellcheck disable=SC1091
 . /zquick/libexec/utils.sh
 
-qloginit "Tailscale - Closing SSH sessions"
+qinitlog "Tailscale - Closing SSH sessions"
 pkill -HUP sshd
 pkill -HUP login

recipes/zquick_tmux/fs/zquick/hooks/bash.d/00-tmux.sh

@@ -1,10 +1,11 @@
 #!/bin/bash
 
 if [[ -z $TMUX ]]; then
+    export TERMINFO_DIRS=/usr/share/terminfo
+    export TERM=xterm-256color
     if tmux -2 -u new-session -A -s ZFSBootMenu; then
         exit 0
     fi
     echo "tmux exited with error, starting shell..."
     exec /bin/sh
 fi
-

recipes/zquick_tmux/fs/zquick/libexec/tmux/status.sh

@@ -1,8 +1,15 @@
 #!/bin/bash
 
+getip() {
+    interface=$(ip route | grep default | awk '{print $5}')
+    # Get the IP address associated with the active interface
+    ip_address=$(ip -4 addr show $interface | grep -oP '(?<=inet\s)\d+(\.\d+){3}')
+    echo "$ip_address"
+}
 status+="#[fg=colour255,bg=colour17] Hostname [#[fg=colour255,bg=colour25]$(hostname)"
+status+="#[fg=colour255,bg=colour17]] | ip [#[fg=colour255,bg=colour25]$(getip)"
 status+="#[fg=colour255,bg=colour17]] | Tailscale [#[fg=colour0,bg=colour25]"
-if which tailscale >/dev/null && [[ -r /var/lib/tailscale/tailscaled.state ]]; then
+if which tailscale >/dev/null2 >&1 && [[ -r /var/lib/tailscale/tailscaled.state ]]; then
     ts_status=$(tailscale status --json)
     if [[ $(echo "$ts_status" | yq e '.Self.Online' -oy) == "true" ]]; then
         status+=" UP "

recipes/zquick_tmux/fs/zquick/libexec/tmux/t.sh

@@ -1,8 +1,10 @@
 #!/bin/bash
 if [[ -z $TMUX ]]; then
+    export TERMINFO_DIRS=/usr/share/terminfo
+    export TERM=xterm-256color
     if tmux -2 -u new-session -A -s ZFSBootMenu; then
         exit 0
     fi
-    echo "tmux exited with error, starting shell..."
+    echo "tmux exited with error, starting shell... tt"
     exec /bin/sh
-fi
+fi