From abc5479e324ac54eb0d497e2a1be30bc80923d30 Mon Sep 17 00:00:00 2001 From: Lukas Date: Wed, 10 Nov 2021 09:42:51 +0100 Subject: [PATCH] recent server-based version need to be tested --- flat/flat-s.cfg | 8 ++----- flat/flat-sh.cfg | 52 ++++++++++++++++++++++++++++------------ flat/flat-shi.cfg | 60 +++++++++++++++++++++++++++++++++++------------ 3 files changed, 84 insertions(+), 36 deletions(-) diff --git a/flat/flat-s.cfg b/flat/flat-s.cfg index bf9dba2..21e80f4 100644 --- a/flat/flat-s.cfg +++ b/flat/flat-s.cfg @@ -1,4 +1,4 @@ -# Generated by pykickstart v3.32 +# Generated by pykickstart v3.34 #version=DEVEL # Keyboard layouts keyboard --xlayouts='ch (fr)' @@ -25,7 +25,7 @@ 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,10 +43,6 @@ 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 %packages --exclude-weakdeps diff --git a/flat/flat-sh.cfg b/flat/flat-sh.cfg index 7a4edb8..d297c38 100644 --- a/flat/flat-sh.cfg +++ b/flat/flat-sh.cfg @@ -1,4 +1,4 @@ -# Generated by pykickstart v3.32 +# Generated by pykickstart v3.34 #version=DEVEL # Keyboard layouts keyboard --xlayouts='ch (fr)' @@ -25,7 +25,7 @@ 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,27 +43,49 @@ 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 -wget https://boot.netboot.xyz/ipxe/netboot.xyz.iso -P /mnt/sysimage/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 -virsh pool-define-as iso dir /mnt/sysimage/var/lib/libvirt/iso/ # Make libvirt aware of this new directory by creating a so-called 'pool' -virsh pool-build iso # Build the pool -virsh pool-start iso # Start it -virsh pool-autostart iso # Set-it to autostart - # 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 # to-do : generalize this command -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 diff --git a/flat/flat-shi.cfg b/flat/flat-shi.cfg index 99c7a21..de279ea 100644 --- a/flat/flat-shi.cfg +++ b/flat/flat-shi.cfg @@ -1,4 +1,4 @@ -# Generated by pykickstart v3.32 +# Generated by pykickstart v3.34 #version=DEVEL # Keyboard layouts keyboard --xlayouts='ch (fr)' @@ -13,7 +13,7 @@ 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 @@ -25,7 +25,7 @@ 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,22 +43,49 @@ 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 /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 @@ -76,19 +103,22 @@ echo "vfio-mdev" > /mnt/sysimage/etc/modules-load.d/vfio-mdev.conf # Load specif echo "options kvm_intel nested=1" >> /mnt/sysimage/etc/modprobe.d/kvm.conf # Add support for nested-virtualization -dracut --add-drivers " vfio vfio-pci vfio_iommu_type1 vfio_virqfd vfio-mdev kvmgt " --force # Instruct dracut to load the vfio drivers -dracut --force # Regenerate initramfs +# The following part seems useless +# dracut --add-drivers " vfio vfio-pci vfio_iommu_type1 vfio_virqfd vfio-mdev kvmgt " --force # Instruct dracut to load the vfio drivers +# dracut --force # Regenerate initramfs # Doesn't seem to work # dracut: Cannot find /usr/lib/dracut/dracut-init.sh. # dracut: Are you running from a git checkout? # dracut: Try passing -l as an argument to /mnt/sysimage/usr/bin/dracut -grub2-mkconfig -o /mnt/sysimage/boot/grub2/grub.cfg # Update grub. Does it fail ? /usr/sbin/grub2-probe: error: failed to get canonical path of `LiveOS_rootfs'. +# The following part seems useless too. No need to regenerate grub +# grub2-mkconfig -o /mnt/sysimage/boot/grub2/grub.cfg # Update grub. Does it fail ? /usr/sbin/grub2-probe: error: failed to get canonical path of `LiveOS_rootfs'. %end %packages --exclude-weakdeps @core +@hardware-support fedora-remix-logos generic-logos generic-release