From dbbdd443bc5b79ea29203bfa1884bd430cef2782 Mon Sep 17 00:00:00 2001 From: Lukas Date: Wed, 10 Nov 2021 09:44:23 +0100 Subject: [PATCH] rollback livebase erase simple live versoin --- leaves/bl.cfg | 190 +++++++++++++++++++++++++++++++------------------- leaves/l.cfg | 107 ---------------------------- 2 files changed, 119 insertions(+), 178 deletions(-) delete mode 100644 leaves/l.cfg diff --git a/leaves/bl.cfg b/leaves/bl.cfg index 80bdbc6..e676886 100644 --- a/leaves/bl.cfg +++ b/leaves/bl.cfg @@ -10,16 +10,7 @@ # This is NOT a standalone kickstart file -# This kickstart file in particular would not have been possible without the hard work of the following people, -# which are the current and former maintainers of the official fedora kickstart files : -# Adam Miller, Bastien Nocera, Bruno Wolff III, Bryan Kearney, Chitlesh Goorah, Christoph Wickert, -# Colin Walters, Fabian Affolter, Igor Pires Soares, Jens Petersen, Jeremy Katz, Jeroen van Meeuwen -# Jesse Keating, Luya Tshimbalanga, Matthias Clasen, Pedro Silva, Rahul Sundaram, Sebastian Dziallas -# Sebastian Vahl, wart. More information here : https://pagure.io/fedora-kickstarts -# -# Thank you! - -text # Perform installation in text mode +# text # Perform installation in text mode repo --name=fedora --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch # Official Fedora mirror repo --name=updates --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch # Official Fedora updates mirror @@ -29,25 +20,106 @@ url --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$relea keyboard --xlayouts='ch (fr)' # set keyboard layouts for Romandie # Unnecessary if using inital-setup lang en_US.UTF-8 # Set system language to American English # Unnecessary if using inital-setup timezone Europe/Paris --utc # Set System timezone to Paris # Unnecessary if using inital-setup +# lang en_US.UTF-8 +# keyboard us +# timezone US/Eastern selinux --enforcing # Make sure SELinux is in enforced mode firewall --enabled --service=mdns +# selinux --enforcing +# firewall --enabled --service=mdns + # xconfig --startxonboot zerombr clearpart --all -part / --size 5120 --fstype ext4 -bootloader --timeout=1 - -services --enabled=NetworkManager --disabled=sshd -network --bootproto=dhcp --device=link --activate --hostname=phyllome +part / --size 5120 +# bootloader --timeout=2 + +# services --enabled=NetworkManager --disabled=sshd +# network --bootproto=dhcp --device=link --activate --hostname=phyllome +# +# rootpw --lock --iscrypted locked +# +# # shutdown +# zerombr +# clearpart --all +# part / --size 5120 --fstype ext4 +# services --enabled=NetworkManager,ModemManager --disabled=sshd +network --bootproto=dhcp --device=link --activate rootpw --lock --iscrypted locked +shutdown -# shutdown +# +# %packages # Beginning of the packages section. +# +# # Explicitly specified here: +# # walters: because otherwise dependency loops cause yum issues. +# kernel +# kernel-modules +# kernel-modules-extra +# +# # This was added a while ago, I think it falls into the category of +# # "Diagnosis/recovery tool useful from a Live OS image". Leaving this untouched +# # for now. +# #memtest86+ +# #@x86-baremetal-tools # memtest86+ is included +# +# # The point of a live image is to install +# # anaconda +# # anaconda-install-env-deps +# # anaconda-live +# # @anaconda-tools +# # Anaconda has a weak dep on this and we don't want it on livecds, see +# # https://fedoraproject.org/wiki/Changes/RemoveDeviceMapperMultipathFromWorkstationLiveCD +# # -fcoe-utils +# # -device-mapper-multipath +# +# # Need aajohan-comfortaa-fonts for the SVG rnotes images +# # aajohan-comfortaa-fonts +# +# # Without this, initramfs generation during live image creation fails: #1242586 +# dracut-live +# dracut-config-generic # add that as sugested here : https://www.brianlane.com/post/creating-live-isos-with-livemedia-creator/ +# +# # For UEFI-boot, see https://github.com/weldr/lorax/blob/master/docs/fedora-livemedia.ks +# shim +# shim-ia32 +# grub2 +# grub2-efi +# grub2-efi-*-cdboot +# grub2-efi-ia32 +# efibootmgr +# +# # syslinux is in @x86-baremetal-tools +# +# # anaconda needs the locales available to run for different locales +# glibc-all-langpacks +# +# # no longer in @core since 2018-10, but needed for livesys script +# initscripts +# chkconfig +# +# @core # minimal installation +# pciutils # Pciutils provides lspci commandline tool and is not installed by default +# # initial-setup # Install the initial setup package. For the GUI version, use initial-setup-gui instead. +# qemu-guest-agent # "QEMU guest agent" +# spice-vdagent # "Agent for Spice guests" +# -fedora-logos # Fedora logos +# -fedora-release # Fedora release-notes +# -fedora-release-notes +# -fedora-release-common # Fedora release files +# -fedora-release-identity-basic # ??? +# fedora-remix-logos # Install Fedora remix logos +# generic-release +# generic-logos +# generic-release-common # "Generic release files" +# generic-release-notes # "Release Notes" -%packages # Beginning of the packages section. +# %end # End of the packages section +%packages # Explicitly specified here: # walters: because otherwise dependency loops cause yum issues. kernel @@ -58,34 +130,23 @@ kernel-modules-extra # "Diagnosis/recovery tool useful from a Live OS image". Leaving this untouched # for now. #memtest86+ -#@x86-baremetal-tools # memtest86+ is included +@x86-baremetal-tools # memtest86+ is included # The point of a live image is to install -# anaconda -# anaconda-install-env-deps -# anaconda-live -# @anaconda-tools +anaconda +anaconda-install-env-deps +anaconda-live +@anaconda-tools # Anaconda has a weak dep on this and we don't want it on livecds, see # https://fedoraproject.org/wiki/Changes/RemoveDeviceMapperMultipathFromWorkstationLiveCD -# -fcoe-utils -# -device-mapper-multipath +-fcoe-utils +-device-mapper-multipath # Need aajohan-comfortaa-fonts for the SVG rnotes images -# aajohan-comfortaa-fonts +aajohan-comfortaa-fonts # Without this, initramfs generation during live image creation fails: #1242586 dracut-live -dracut-config-generic # add that as sugested here : https://www.brianlane.com/post/creating-live-isos-with-livemedia-creator/ - -# For UEFI-boot, see https://github.com/weldr/lorax/blob/master/docs/fedora-livemedia.ks -shim -shim-ia32 -grub2 -grub2-efi -grub2-efi-*-cdboot -grub2-efi-ia32 -efibootmgr - # syslinux is in @x86-baremetal-tools # anaconda needs the locales available to run for different locales @@ -95,25 +156,10 @@ glibc-all-langpacks initscripts chkconfig -@core # minimal installation -pciutils # Pciutils provides lspci commandline tool and is not installed by default -# initial-setup # Install the initial setup package. For the GUI version, use initial-setup-gui instead. -qemu-guest-agent # "QEMU guest agent" -spice-vdagent # "Agent for Spice guests" --fedora-logos # Fedora logos --fedora-release # Fedora release-notes --fedora-release-notes --fedora-release-common # Fedora release files --fedora-release-identity-basic # ??? -fedora-remix-logos # Install Fedora remix logos -generic-release -generic-logos -generic-release-common # "Generic release files" -generic-release-notes # "Release Notes" - %end # End of the packages section %post --log=/root/bl.log # Beginning of the post-installation section. Add logging. + # FIXME: it'd be better to get this installed from a package cat > /etc/rc.d/init.d/livesys << EOF #!/bin/bash @@ -260,7 +306,7 @@ touch /.liveimg-configured # https://bugzilla.redhat.com/show_bug.cgi?id=679486 # the hostname must be something else than 'localhost' # https://bugzilla.redhat.com/show_bug.cgi?id=1370222 -# hostnamectl set-hostname "localhost-live" +hostnamectl set-hostname "localhost-live" EOF @@ -299,24 +345,24 @@ for o in \`cat /proc/cmdline\` ; do done # if liveinst or textinst is given, start anaconda -#if strstr "\`cat /proc/cmdline\`" liveinst ; then -# plymouth --quit -# /usr/sbin/liveinst \$ks -#fi -#if strstr "\`cat /proc/cmdline\`" textinst ; then -# plymouth --quit -# /usr/sbin/liveinst --text \$ks -#fi +if strstr "\`cat /proc/cmdline\`" liveinst ; then + plymouth --quit + /usr/sbin/liveinst \$ks +fi +if strstr "\`cat /proc/cmdline\`" textinst ; then + plymouth --quit + /usr/sbin/liveinst --text \$ks +fi # configure X, allowing user to override xdriver -#if [ -n "\$xdriver" ]; then -# cat > /etc/X11/xorg.conf.d/00-xdriver.conf < /etc/X11/xorg.conf.d/00-xdriver.conf <> /etc/rc.d/init.d/livesys << EOF - -# disable gnome-software automatically downloading updates -# cat >> /usr/share/glib-2.0/schemas/org.gnome.software.gschema.override << FOE -# [org.gnome.software] -# download-updates=false -# FOE - -# don't autostart gnome-software session service -# rm -f /etc/xdg/autostart/gnome-software-service.desktop - -# disable the gnome-software shell search provider -# FOE - -# don't run gnome-initial-setup -mkdir ~liveuser/.config -touch ~liveuser/.config/gnome-initial-setup-done - -# suppress anaconda spokes redundant with gnome-initial-setup -# cat >> /etc/sysconfig/anaconda << FOE -# [NetworkSpoke] -# visited=1 - -# [PasswordSpoke] -# visited=1 - -# [UserSpoke] -# visited=1 -# FOE - -# make the installer show up -#if [ -f /usr/share/applications/liveinst.desktop ]; then - # Show harddisk install in shell dash -# sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop "" - # need to move it to anaconda.desktop to make shell happy -# mv /usr/share/applications/liveinst.desktop /usr/share/applications/anaconda.desktop - -# cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE -#[org.gnome.shell] -#favorite-apps=['firefox.desktop', 'org.gnome.Calendar.desktop', 'rhythmbox.desktop', 'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop', 'anaconda.desktop'] -#FOE - - # Make the welcome screen show up -# if [ -f /usr/share/anaconda/gnome/fedora-welcome.desktop ]; then -# mkdir -p ~liveuser/.config/autostart -# cp /usr/share/anaconda/gnome/fedora-welcome.desktop /usr/share/applications/ -# cp /usr/share/anaconda/gnome/fedora-welcome.desktop ~liveuser/.config/autostart/ -# fi - - # Disable GNOME welcome tour so it doesn't overlap with Fedora welcome screen -# cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE -#welcome-dialog-last-shown-version='4294967295' -#FOE - - # Copy Anaconda branding in place -# if [ -d /usr/share/lorax/product/usr/share/anaconda ]; then -# cp -a /usr/share/lorax/product/* / -# fi -#fi - -# rebuild schema cache with any overrides we installed -# glib-compile-schemas /usr/share/glib-2.0/schemas -# -# # set up auto-login -# cat > /etc/gdm/custom.conf << FOE -# [daemon] -# AutomaticLoginEnable=True -# AutomaticLogin=liveuser -# FOE - -# Turn off PackageKit-command-not-found while uninstalled -# if [ -f /etc/PackageKit/CommandNotFound.conf ]; then -# sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf -# fi - -# make sure to set the right permissions and selinux contexts -chown -R liveuser:liveuser /home/liveuser/ -restorecon -R /home/liveuser/ - -EOF - -%end # End of the %post section \ No newline at end of file