From 6aef6aad6c6ac01a1b8e0324bf6484beb3e7bf6a Mon Sep 17 00:00:00 2001
From: Lukas <lukas@phyllo.me>
Date: Wed, 10 Nov 2021 09:40:39 +0100
Subject: [PATCH] latest dhi version command to fetch scripts

---
 flat/flat-dh.cfg | 79 ++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 63 insertions(+), 16 deletions(-)

diff --git a/flat/flat-dh.cfg b/flat/flat-dh.cfg
index 8f1e8a8..2a6a014 100644
--- a/flat/flat-dh.cfg
+++ b/flat/flat-dh.cfg
@@ -1,5 +1,7 @@
-# Generated by pykickstart v3.32
+# Generated by pykickstart v3.34
 #version=DEVEL
+# X Window System configuration information
+xconfig  --defaultdesktop=GNOME --startxonboot
 # Keyboard layouts
 keyboard --xlayouts='ch (fr)'
 # Root password
@@ -13,19 +15,17 @@ text
 # Network information
 network  --bootproto=dhcp --device=link --hostname=phyllome-alpha --activate
 # Firewall configuration
-firewall --enabled
+firewall --enabled --service=mdns
 # Use network installation
 url --mirrorlist="https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch"
 repo --name="fedora" --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
 repo --name="updates" --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch
 # System timezone
 timezone Europe/Paris --utc
-# Run the Setup Agent on first boot
-firstboot --reconfig
 # SELinux configuration
 selinux --enforcing
 # System services
-services --disabled="sshd" --enabled="NetworkManager"
+services --disabled="sshd" --enabled="NetworkManager,libvirtd"
 # System bootloader configuration
 bootloader --location=mbr --timeout=1
 # Clear the Master Boot Record
@@ -43,36 +43,80 @@ localectl set-keymap ch-fr # Set keymap to `ch-fr`. Alternatively, `us` can be p
 dnf update -y # Update the system 
 grub2-mkconfig -o /boot/grub2/grub.cfg # Update grub otherwise the system won't boot properly
 
-# In the %post section of the kickstart file, add the following as the first line. Probably useless : leaving this uncommented for the moment
-# See : https://www.opensourceforu.com/2010/01/roll-out-a-fedora-remix/
-# sed -i -e 's/Generic release/LFY Fedora Remix/g' /etc/fedora-release /etc/issue 
-
 %end
 
 %post --nochroot --logfile=/mnt/sysimage/root/bh.log
+# %post --log=/root/bh.log # Beginning of %post section. Those commands are executed outside the chroot environment. Logging is enabled to help with post-installation troubleshooting
 
 mkdir /mnt/sysimage/var/lib/libvirt/iso # Create a directory to store iso images
-# virsh pool-create-as --name iso --type dir --target /mnt/sysimage/var/lib/libvirt/iso # Make libvirt aware of this new directory by creating a so-called 'pool'
-# doesn't work
 
-wget https://boot.netboot.xyz/ipxe/netboot.xyz.iso -P /var/lib/libvirt/iso/
+wget https://boot.netboot.xyz/ipxe/netboot.xyz.iso -P /mnt/sysimage/var/lib/libvirt/iso/ # fetch netboot.xyz iso
+
+# fetch custom script and make it executable
+wget https://git.phyllo.me/home/PhyllomeOS/raw/branch/main/post/configure-vmm-and-desktop.sh -P /mnt/sysimage/usr/sbin/
+chmod +x /mnt/sysimage/usr/sbin/configure-vmm-and-desktop.sh
+
+# fetch custom script and make it executable
+wget https://git.phyllo.me/home/PhyllomeOS/raw/branch/main/post/create-live-vm.sh -P /mnt/sysimage/usr/sbin/
+chmod +x /mnt/sysimage/usr/sbin/create-live-vm.sh
+
+# fetch custom script and make it executable
+wget https://git.phyllo.me/home/PhyllomeOS/raw/branch/main/post/virtualization-tweaks-root-needed.sh -P /mnt/sysimage/usr/sbin/
+chmod +x /mnt/sysimage/usr/sbin/virtualization-tweaks-root-needed.sh
+
+# # Create new file /etc/systemd/system/postinstall.service using cat:
+# cat > /mnt/sysimage/etc/systemd/system/post-install.service<< EOF
+# [Unit]
+# Description=Post-installation configuration for Phyllome OS
+# After=gdm.service
+# Requires=gdm.service
+# 
+# [Service]
+# Type=oneshot
+# ExecStart=/bin/bash /usr/sbin/post-install.sh
+# RemainAfterExit=yes
+# 
+# [Install]
+# WantedBy=multi-user.target
+# EOF
+# 
+# systemctl enable /mnt/sysimage/etc/systemd/system/post-install.service # Enable systemd unit
 
 # Add a network bridge. Still need to declare it to libvirt/virt-manager
-nmcli con add ifname br0 type bridge con-name br0 
-nmcli con add type bridge-slave ifname enp1s0 master br0
-nmcli con up br0
+# nmcli con add ifname br0 type bridge con-name br0 
+# nmcli con add type bridge-slave ifname enp1s0 master br0 # to-do : generalize this command so that it could regardless of the name of the ethernet device
+# nmcli con up br0
+
+%end
+
+%post --nochroot --logfile=/mnt/sysimage/root/dh.log
+
+truncate -s 0 /mnt/sysimage/usr/share/gnome-initial-setup/vendor.conf # remove content of vendor.conf so that all options are made available
+
+# Create a file to autostart virt-manager
+cat > /mnt/sysimage/etc/xdg/autostart/virt-manager.desktop << EOF
+[Desktop Entry]
+Type=Application
+Name=Virtual Machine Manager
+Exec=virt-manager
+EOF
 
 %end
 
 %packages --exclude-weakdeps
 @core
+@hardware-support
+dejavu-sans-mono-fonts
+elementary-wallpapers-gnome.noarch
 fedora-remix-logos
 generic-logos
 generic-release
 generic-release-common
 generic-release-notes
+gnome-initial-setup
+gnome-shell
+gnome-terminal
 guestfs-tools
-initial-setup
 libguestfs-tools
 libvirt
 libvirt-daemon-config-network
@@ -85,12 +129,15 @@ qemu-guest-agent
 qemu-kvm
 spice-vdagent
 virt-install
+virt-manager
 virt-top
 wget
+wpa_supplicant
 -fedora-logos
 -fedora-release
 -fedora-release-common
 -fedora-release-identity-basic
 -fedora-release-notes
+-gnome-tour
 
 %end