From 026f49b6d8922dc71362e051b386d3e672c76df3 Mon Sep 17 00:00:00 2001
From: Antoine Martin <dev@ayakael.net>
Date: Sat, 26 Aug 2023 15:36:16 -0400
Subject: [PATCH] Moved depends to packages, properly setup services, users and
 groups

---
 scripts/04_install_qubes.sh | 24 ++++++++++++++++--------
 scripts/packages.list       | 11 -----------
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/scripts/04_install_qubes.sh b/scripts/04_install_qubes.sh
index ab88147..4aa89df 100755
--- a/scripts/04_install_qubes.sh
+++ b/scripts/04_install_qubes.sh
@@ -31,7 +31,7 @@ echo "  --> Installing recommended qubes apps"
     "apk add qubes-vm-recommended"
 
 echo "  --> Updating template fstab file..."
-cat >> "${INSTALLDIR}/etc/fstab" <<EOF
+cat > "${INSTALLDIR}/etc/fstab" <<EOF
 #
 # /etc/fstab: static file system information
 #
@@ -53,15 +53,23 @@ EOF
 echo "  --> Configuring system to our preferences..."
 # add hcv0 to inittab
 echo "hvc0::respawn:/sbin/getty -L hvc0 115200 vt220" >> "$INSTALLDIR"/etc/inittab
-# add group qubes and user
-"${TEMPLATE_CONTENT_DIR}/alpine-chroot" "$INSTALLDIR" addgroup user
+
+# user and groups
 "${TEMPLATE_CONTENT_DIR}/alpine-chroot" "$INSTALLDIR" addgroup qubes
-# add user:user
-"${TEMPLATE_CONTENT_DIR}/alpine-chroot" "$INSTALLDIR" adduser -D -S user -g qubes -G user
+"${TEMPLATE_CONTENT_DIR}/alpine-chroot" "$INSTALLDIR" addgroup user
+"${TEMPLATE_CONTENT_DIR}/alpine-chroot" "$INSTALLDIR" adduser -D user -G user -s /bin/bash
+"${TEMPLATE_CONTENT_DIR}/alpine-chroot" "$INSTALLDIR" addgroup user qubes
+
+# create /lib/modules for qubes-kernel module mount
+"${TEMPLATE_CONTENT_DIR}/alpine-chroot" "$INSTALLDIR" mkdir /lib/modules
 
 # enable services
-for i in udev udev-trigger xendriverdomain qubes-qrexec-agent qubes-db qubes-meminfo-writer qubes-sysinit qubes-core-early qubes-core crond acpid; do
+for i in udev udev-trigger xendriverdomain qubes-qrexec-agent qubes-db qubes-meminfo-writer qubes-sysinit qubes-core-early qubes-core qubes-gui-agent crond acpid; do
     "${TEMPLATE_CONTENT_DIR}/alpine-chroot" "$INSTALLDIR" rc-update add $i default
 done
-
-# setup initramfs
+for i in bootmisc hostname hwclock loadkmap modules networking seedrng swap sysctl syslog; do
+    "${TEMPLATE_CONTENT_DIR}/alpine-chroot" "$INSTALLDIR" rc-update add $i boot
+done
+for i in devfs dmesg hwdrivers mdev; do
+    "${TEMPLATE_CONTENT_DIR}/alpine-chroot" "$INSTALLDIR" rc-update add $i sysinit
+done
diff --git a/scripts/packages.list b/scripts/packages.list
index d285c54..3eb32a6 100644
--- a/scripts/packages.list
+++ b/scripts/packages.list
@@ -8,22 +8,12 @@ xrandr
 # Basic utils
 chrony
 cups
-ethtool
 net-tools
 sudo
 wget
-diffutils
 openssh
-grep
 htop
 
-# should be depends by core
-e2fsprogs
-e2fsprogs-extra
-blkid
-mkinitfs
-grub-bios
-
 # User env
 ldns
 tmux
@@ -35,7 +25,6 @@ ttf-dejavu
 ttf-inconsolata
 ttf-linux-libertine
 
-
 # Gnome
 gnome-settings-daemon
 gtk-engines