refactoring of the codebase

create new ks ingredients including for vmm, initial-setup, and else
This commit is contained in:
lukas 2021-11-28 18:12:50 +01:00
parent f12d83b04d
commit dadb1a05be
12 changed files with 32 additions and 218 deletions

View File

@ -14,37 +14,10 @@
%include base-fedora-repo.cfg # offical repositories for Fedora
%include base-storage.cfg # base storage
%include base.cfg # A minimal machine
%include base-desktop-gnome.cfg # A desktop environment
%include base-desktop-gnome.cfg # A desktop environment that ships with virtual machine manager
%include base-desktop-virtual-machine-manager.cfg # the virtual machine manager
%include base-hypervisor.cfg # A base hypervisor
%include base-hypervisor-a.cfg # Specific virtualization configuration for AMD (tm) CPUs
%include base-initial-setup-gnome.cfg # Includes initial-setup for GNOME
reboot --kexec # Reboot straight into the system after a successfull installation
%packages --exclude-weakdeps # Beginning of the packages section. Do not include weak dependencies.
virt-manager # Install virt-manager, the graphical front-end for QEMU/KVM
gnome-initial-setup # Add GNOME initial setup too to let user create local account.
%end # End of the packages section
%post --nochroot --log=/mnt/sysimage/root/dha.log # Beginning of %post section. Those commands are executed outside the chroot environment. Add logging.
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
## Append lines to existing vendor.conf file, so that options are skipped upon reboot
cat >> /mnt/sysimage/usr/share/gnome-initial-setup/vendor.conf<< EOF
[pages]
skip=privacy
[goa]
providers=local-first!
EOF
%end # End of the %post section

View File

@ -14,37 +14,10 @@
%include base-fedora-repo.cfg # offical repositories for Fedora
%include base-storage.cfg # base storage
%include base.cfg # A minimal machine
%include base-desktop-gnome.cfg # A desktop environment
%include base-desktop-gnome.cfg # A desktop environment that ships with virtual machine manager
%include base-desktop-virtual-machine-manager.cfg # the virtual machine manager
%include base-hypervisor.cfg # A base hypervisor
%include base-hypervisor-ii.cfg # Specific virtualization configuration for Intel(tm) CPU and Intel(tm) GPUs
%include base-hypervisor-ii.cfg # Specific virtualization configuration for AMD (tm) CPUs
%include base-initial-setup-gnome.cfg # Includes initial-setup for GNOME
reboot --kexec # Reboot straight into the system after a successfull installation
%packages --exclude-weakdeps # Beginning of the packages section. Do not include weak dependencies.
virt-manager # Install virt-manager, the graphical front-end for QEMU/KVM
gnome-initial-setup # Add GNOME initial setup too to let user create local account.
%end # End of the packages section
%post --nochroot --log=/mnt/sysimage/root/dhi.log # Beginning of %post section. Those commands are executed outside the chroot environment. Add logging.
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
## Append lines to existing vendor.conf file, so that options are skipped upon reboot
cat >> /mnt/sysimage/usr/share/gnome-initial-setup/vendor.conf<< EOF
[pages]
skip=privacy
[goa]
providers=local-first!
EOF
%end # End of the %post section

View File

@ -14,37 +14,9 @@
%include base-fedora-repo.cfg # offical repositories for Fedora
%include base-storage.cfg # base storage
%include base.cfg # A minimal machine
%include base-desktop-gnome.cfg # A desktop environment
%include base-desktop-gnome.cfg # A desktop environment that ships with virtual machine manager
%include base-desktop-virtual-machine-manager.cfg # the virtual machine manager
%include base-hypervisor.cfg # A base hypervisor
%include base-initial-setup-gnome.cfg # Includes initial-setup for GNOME
reboot --kexec # Reboot straight into the system after a successfull installation
%packages --exclude-weakdeps # Beginning of the packages section. Do not include weak dependencies.
virt-manager # Install virt-manager, the graphical front-end for QEMU/KVM
gnome-initial-setup # Add GNOME initial setup too to let user create local account.
%end # End of the packages section
%post --nochroot --log=/mnt/sysimage/root/dh.log # Beginning of %post section. Those commands are executed outside the chroot environment. Add logging.
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
## Append lines to existing vendor.conf file, so that options are skipped upon reboot
cat >> /mnt/sysimage/usr/share/gnome-initial-setup/vendor.conf<< EOF
[pages]
skip=privacy
[goa]
providers=local-first!
EOF
%end # End of the %post section

View File

@ -15,25 +15,6 @@
%include base-storage.cfg # base storage
%include base.cfg # A minimal machine
%include base-desktop-gnome.cfg # A desktop environment
%include base-initial-setup-gnome.cfg # Includes initial-setup for GNOME
reboot --kexec # Reboot straight into the system after a successfull installation
%packages --exclude-weakdeps # Beginning of the packages section. Do not include weak dependencies.
gnome-initial-setup # Add GNOME initial setup too.
%end # End of the %post section
%post --nochroot --log=/mnt/sysimage/root/d.log # Beginning of %post section. Those commands are executed outside the chroot environment. Add logging.
truncate -s 0 /mnt/sysimage/usr/share/gnome-initial-setup/vendor.conf # remove content of vendor.conf so that all options are made available
## Append lines to existing vendor.conf file, so that options are skipped upon reboot
cat >> /mnt/sysimage/usr/share/gnome-initial-setup/vendor.conf<< EOF
[pages]
skip=privacy
[goa]
providers=local-first!
EOF
%end # End of the %post section

View File

@ -14,12 +14,6 @@
%include base-fedora-repo.cfg # offical repositories for Fedora
%include base-storage.cfg # base storage
%include base-nano.cfg # A base system
%include base-initial-setup # Includes initial-setup so on first-boot a new user can be created
firstboot --enable --reconfig # Initial Setup will start after the first reboot
reboot --kexec # Reboot straight into the system after a successfull installation
%packages --exclude-weakdeps # Beginning of the packages section. Do not include weak dependencies.
initial-setup # Install the initial setup package.
%end # End of the packages section

View File

@ -16,12 +16,6 @@
%include base.cfg # A minimal machine
%include base-hypervisor.cfg # A base hypervisor
%include base-hypervisor-a.cfg # Specific virtualization configuration for AMD (tm) CPUs
%include base-initial-setup.cfg # Includes initial-setup so on first-boot a new user can be created
firstboot --enable --reconfig # Initial Setup will start after the first reboot
reboot --kexec # Reboot straight into the system after a successfull installation
%packages --exclude-weakdeps # Beginning of the packages section. Do not include weak dependencies.
initial-setup # Install the initial setup package.
%end # End of the packages section

View File

@ -16,12 +16,6 @@
%include base.cfg # A minimal machine
%include base-hypervisor.cfg # A base hypervisor
%include base-hypervisor-ii.cfg # Specific virtualization configuration for Intel(tm) CPU and Intel(tm) GPUs
%include base-initial-setup.cfg # Includes initial-setup so on first-boot a new user can be created
firstboot --enable --reconfig # Initial Setup will start after the first reboot
reboot --kexec # Reboot straight into the system after a successfull installation
%packages --exclude-weakdeps # Beginning of the packages section. Do not include weak dependencies.
initial-setup # Install the initial setup package.
%end # End of the packages section

View File

@ -15,12 +15,6 @@
%include base-storage.cfg # base storage
%include base.cfg # A minimal machine
%include base-hypervisor.cfg # A base hypervisor
%include base-initial-setup.cfg # Includes initial-setup so on first-boot a new user can be created
firstboot --enable --reconfig # Initial Setup will start after the first reboot
reboot --kexec # Reboot straight into the system after a successfull installation
%packages --exclude-weakdeps # Beginning of the packages section. Do not include weak dependencies.
initial-setup # Install the initial setup package.
%end # End of the packages section

View File

@ -9,17 +9,11 @@
# In order to be fed to virt-install or a software like livecd-creator, this file needs to be flattened.
# Here is how you can do it with the ksflatten tool provided by the pykickstart package on Fedora :
# ksflatten -c server.cfg -o ../leaves/flat-server.cfg
# ksflatten -c server.cfg -o ../leaves/server.cfg
%include base-fedora-repo.cfg # offical repositories for Fedora
%include base-storage.cfg # base storage
%include base.cfg # A base system
%include base-initial-setup.cfg # Includes initial-setup so on first-boot a new user can be created
firstboot --enable --reconfig # Initial Setup will start after the first reboot
reboot --kexec # Reboot straight into the system after a successfull installation
%packages --exclude-weakdeps # Beginning of the packages section. Do not include weak dependencies.
initial-setup # Install the initial setup package.
%end # End of the packages section

View File

@ -14,38 +14,10 @@
%include base-fedora-repo.cfg # offical repositories for Fedora
%include base-storage.cfg # base storage
%include base.cfg # A minimal machine
%include base-desktop-gnome.cfg # A desktop environment
%include base-desktop-gnome.cfg # A desktop environment that ships with virtual machine manager
%include base-desktop-virtual-machine-manager.cfg # the virtual machine manager
%include base-hypervisor.cfg # A base hypervisor
%include base-guest-agents.cfg # Guest agents
%include base-initial-setup-gnome.cfg # Includes initial-setup for GNOME
reboot --kexec # Reboot straight into the system after a successfull installation
%packages --exclude-weakdeps # Beginning of the packages section. Do not include weak dependencies.
virt-manager # Install virt-manager, the graphical front-end for QEMU/KVM
gnome-initial-setup # Add GNOME initial setup too to let user create local account.
%end # End of the packages section
%post --nochroot --log=/mnt/sysimage/root/dh.log # Beginning of %post section. Those commands are executed outside the chroot environment. Add logging.
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
## Append lines to existing vendor.conf file, so that options are skipped upon reboot
cat >> /mnt/sysimage/usr/share/gnome-initial-setup/vendor.conf<< EOF
[pages]
skip=privacy
[goa]
providers=local-first!
EOF
%end # End of the %post section

View File

@ -11,32 +11,11 @@
# Here is how you can do it with the ksflatten tool provided by the pykickstart package on Fedora :
# ksflatten -c virtual-desktop.cfg -o ../leaves/virtual-desktop.cfg
# Note: doesn't work as now
%include base-fedora-repo.cfg # offical repositories for Fedora
%include base-storage.cfg # base storage
%include base.cfg # A minimal machine
%include base-desktop-gnome.cfg # A desktop environment
%include base-guest-agents.cfg # Guest agents
%include base-initial-setup-gnome.cfg # Includes initial-setup for GNOME
reboot --kexec # Reboot straight into the system after a successfull installation
%packages --exclude-weakdeps # Beginning of the packages section. Do not include weak dependencies.
gnome-initial-setup # Add GNOME initial setup too.
%end # End of the %post section
%post --nochroot --log=/mnt/sysimage/root/d.log # Beginning of %post section. Those commands are executed outside the chroot environment. Add logging.
truncate -s 0 /mnt/sysimage/usr/share/gnome-initial-setup/vendor.conf # remove content of vendor.conf so that all options are made available
## Append lines to existing vendor.conf file, so that options are skipped upon reboot
cat >> /mnt/sysimage/usr/share/gnome-initial-setup/vendor.conf<< EOF
[pages]
skip=privacy
[goa]
providers=local-first!
EOF
%end # End of the %post section

View File

@ -9,18 +9,12 @@
# In order to be fed to virt-install or a software like livecd-creator, this file needs to be flattened.
# Here is how you can do it with the ksflatten tool provided by the pykickstart package on Fedora :
# ksflatten -c server.cfg -o ../leaves/flat-server.cfg
# ksflatten -c virtual-server.cfg -o ../leaves/virtual-server.cfg
%include base-fedora-repo.cfg # offical repositories for Fedora
%include base-storage.cfg # base storage
%include base.cfg # A base system
%include base-guest-agents.cfg # Guest agents
%include base-initial-setup.cfg # Includes initial-setup so on first-boot a new user can be created
firstboot --enable --reconfig # Initial Setup will start after the first reboot
reboot --kexec # Reboot straight into the system after a successfull installation
%packages --exclude-weakdeps # Beginning of the packages section. Do not include weak dependencies.
initial-setup # Install the initial setup package.
%end # End of the packages section