From 2aeb7696fcd7d5752d0e68313b6525f46eb6f5dc Mon Sep 17 00:00:00 2001 From: Louis Abel Date: Thu, 16 Nov 2023 10:10:10 -0700 Subject: [PATCH] fix gpg key imports --- Rocky-9-Cinnamon.ks | 2 +- Rocky-9-Cinnamon.kse | 503 ---------------- Rocky-9-KDE.ks | 5 +- Rocky-9-MATE.ks | 2 +- Rocky-9-MATE.kse | 558 ------------------ Rocky-9-Workstation-Lite.ks | 2 +- Rocky-9-Workstation-Mainline.ks | 2 +- Rocky-9-Workstation.ks | 2 +- Rocky-9-XFCE.ks | 2 +- Rocky-9-XFCE.kse | 514 ---------------- live/9/aarch64/peridot/rocky-live-kde-base.ks | 3 + live/9/aarch64/prod/rocky-live-kde-base.ks | 3 + live/9/aarch64/stage/rocky-live-kde-base.ks | 3 + live/9/ppc64le/peridot/rocky-live-kde-base.ks | 3 + live/9/ppc64le/prod/rocky-live-kde-base.ks | 3 + live/9/ppc64le/stage/rocky-live-kde-base.ks | 3 + live/9/x86_64/peridot/rocky-live-kde-base.ks | 3 + live/9/x86_64/prod/rocky-live-kde-base.ks | 3 + live/9/x86_64/stage/rocky-live-kde-base.ks | 3 + 19 files changed, 37 insertions(+), 1582 deletions(-) delete mode 100644 Rocky-9-Cinnamon.kse delete mode 100644 Rocky-9-MATE.kse delete mode 100644 Rocky-9-XFCE.kse diff --git a/Rocky-9-Cinnamon.ks b/Rocky-9-Cinnamon.ks index f0f05b8..bd27316 100644 --- a/Rocky-9-Cinnamon.ks +++ b/Rocky-9-Cinnamon.ks @@ -277,7 +277,7 @@ EOF rm -f /var/lib/rpm/__db* releasever=$(rpm -q --qf '%{version}\n' --whatprovides system-release) basearch=$(uname -i) -rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial +rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9 echo "Packages within this LiveCD" rpm -qa # Note that running rpm recreates the rpm db files which aren't needed or wanted diff --git a/Rocky-9-Cinnamon.kse b/Rocky-9-Cinnamon.kse deleted file mode 100644 index 4de6c46..0000000 --- a/Rocky-9-Cinnamon.kse +++ /dev/null @@ -1,503 +0,0 @@ -# Generated by pykickstart v3.41 -#version=DEVEL -# Firewall configuration -firewall --enabled --service=mdns -# Keyboard layouts -keyboard 'us' -# System language -lang en_US.UTF-8 -# Network information -network --bootproto=dhcp --device=link --activate -# Shutdown after installation -shutdown -repo --name="BaseOS" --baseurl=http://dl.rockylinux.org/pub/rocky/9/BaseOS/$basearch/os/ --cost=200 -repo --name="AppStream" --baseurl=http://dl.rockylinux.org/pub/rocky/9/AppStream/$basearch/os/ --cost=200 -repo --name="CRB" --baseurl=http://dl.rockylinux.org/pub/rocky/9/CRB/$basearch/os/ --cost=200 -repo --name="extras" --baseurl=http://dl.rockylinux.org/pub/rocky/9/extras/$basearch/os --cost=200 -repo --name="epel" --baseurl=https://dl.fedoraproject.org/pub/epel/9/Everything/$basearch/ --cost=200 -# Root password -rootpw --iscrypted --lock locked -# SELinux configuration -selinux --enforcing -# System services -services --disabled="sshd" --enabled="NetworkManager,ModemManager" -# System timezone -timezone US/Eastern -# Use network installation -url --url="http://dl.rockylinux.org/pub/rocky/9/BaseOS/$basearch/os/" -# X Window System configuration information -xconfig --startxonboot -# System bootloader configuration -bootloader --location=none -# Clear the Master Boot Record -zerombr -# Partition clearing information -clearpart --all -# Disk partitioning information -part / --fstype="ext4" --size=5120 -part / --size=8192 - -%post -# FIXME: it'd be better to get this installed from a package -cat > /etc/rc.d/init.d/livesys << EOF -#!/bin/bash -# -# live: Init script for live image -# -# chkconfig: 345 00 99 -# description: Init script for live image. -### BEGIN INIT INFO -# X-Start-Before: display-manager chronyd -### END INIT INFO - -. /etc/init.d/functions - -if ! strstr "\`cat /proc/cmdline\`" rd.live.image || [ "\$1" != "start" ]; then - exit 0 -fi - -if [ -e /.liveimg-configured ] ; then - configdone=1 -fi - -exists() { - which \$1 >/dev/null 2>&1 || return - \$* -} - -livedir="LiveOS" -for arg in \`cat /proc/cmdline\` ; do - if [ "\${arg##rd.live.dir=}" != "\${arg}" ]; then - livedir=\${arg##rd.live.dir=} - continue - fi - if [ "\${arg##live_dir=}" != "\${arg}" ]; then - livedir=\${arg##live_dir=} - fi -done - -# Enable swap unless requested otherwise -swaps=\`blkid -t TYPE=swap -o device\` -if ! strstr "\`cat /proc/cmdline\`" noswap && [ -n "\$swaps" ] ; then - for s in \$swaps ; do - action "Enabling swap partition \$s" swapon \$s - done -fi -if ! strstr "\`cat /proc/cmdline\`" noswap && [ -f /run/initramfs/live/\${livedir}/swap.img ] ; then - action "Enabling swap file" swapon /run/initramfs/live/\${livedir}/swap.img -fi - -# Support for persistent homes -mountPersistentHome() { - # support label/uuid - if [ "\${homedev##LABEL=}" != "\${homedev}" -o "\${homedev##UUID=}" != "\${homedev}" ]; then - homedev=\`/sbin/blkid -o device -t "\$homedev"\` - fi - - # if we're given a file rather than a blockdev, loopback it - if [ "\${homedev##mtd}" != "\${homedev}" ]; then - # mtd devs don't have a block device but get magic-mounted with -t jffs2 - mountopts="-t jffs2" - elif [ ! -b "\$homedev" ]; then - loopdev=\`losetup -f\` - if [ "\${homedev##/run/initramfs/live}" != "\${homedev}" ]; then - action "Remounting live store r/w" mount -o remount,rw /run/initramfs/live - fi - losetup \$loopdev \$homedev - homedev=\$loopdev - fi - - # if it's encrypted, we need to unlock it - if [ "\$(/sbin/blkid -s TYPE -o value \$homedev 2>/dev/null)" = "crypto_LUKS" ]; then - echo - echo "Setting up encrypted /home device" - plymouth ask-for-password --command="cryptsetup luksOpen \$homedev EncHome" - homedev=/dev/mapper/EncHome - fi - - # and finally do the mount - mount \$mountopts \$homedev /home - # if we have /home under what's passed for persistent home, then - # we should make that the real /home. useful for mtd device on olpc - if [ -d /home/home ]; then mount --bind /home/home /home ; fi - [ -x /sbin/restorecon ] && /sbin/restorecon /home - if [ -d /home/liveuser ]; then USERADDARGS="-M" ; fi -} - -# Help locate persistent homes -findPersistentHome() { - for arg in \`cat /proc/cmdline\` ; do - if [ "\${arg##persistenthome=}" != "\${arg}" ]; then - homedev=\${arg##persistenthome=} - fi - done -} - -if strstr "\`cat /proc/cmdline\`" persistenthome= ; then - findPersistentHome -elif [ -e /run/initramfs/live/\${livedir}/home.img ]; then - homedev=/run/initramfs/live/\${livedir}/home.img -fi - -# Mount the persistent home if it's available -if ! strstr "\`cat /proc/cmdline\`" nopersistenthome && [ -n "\$homedev" ] ; then - action "Mounting persistent /home" mountPersistentHome -fi - -if [ -n "\$configdone" ]; then - exit 0 -fi - -# Create the liveuser (no password) so automatic logins and sudo works -action "Adding live user" useradd \$USERADDARGS -c "Live System User" liveuser -passwd -d liveuser > /dev/null -usermod -aG wheel liveuser > /dev/null - -# Same for root -passwd -d root > /dev/null - -# Turn off firstboot (similar to a DVD/minimal install, where it asks -# for the user to accept the EULA before bringing up a TTY) -systemctl --no-reload disable firstboot-text.service 2> /dev/null || : -systemctl --no-reload disable firstboot-graphical.service 2> /dev/null || : -systemctl stop firstboot-text.service 2> /dev/null || : -systemctl stop firstboot-graphical.service 2> /dev/null || : - -# Prelinking damages the images -sed -i 's/PRELINKING=yes/PRELINKING=no/' /etc/sysconfig/prelink &>/dev/null || : - -# Turn off mdmonitor by default -systemctl --no-reload disable mdmonitor.service 2> /dev/null || : -systemctl --no-reload disable mdmonitor-takeover.service 2> /dev/null || : -systemctl stop mdmonitor.service 2> /dev/null || : -systemctl stop mdmonitor-takeover.service 2> /dev/null || : - -# Even if there isn't gnome, this doesn't hurt. -gsettings set org.gnome.software download-updates 'false' || : - -# Disable cron -systemctl --no-reload disable crond.service 2> /dev/null || : -systemctl --no-reload disable atd.service 2> /dev/null || : -systemctl stop crond.service 2> /dev/null || : -systemctl stop atd.service 2> /dev/null || : - -# Disable abrt -systemctl --no-reload disable abrtd.service 2> /dev/null || : -systemctl stop abrtd.service 2> /dev/null || : - -# Don't sync the system clock when running live (RHBZ #1018162) -sed -i 's/rtcsync//' /etc/chrony.conf - -# Mark things as configured -touch /.liveimg-configured - -# add static hostname to work around xauth bug -# 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 -echo "localhost-live" > /etc/hostname - -EOF - -# HAL likes to start late. -cat > /etc/rc.d/init.d/livesys-late << EOF -#!/bin/bash -# -# live: Late init script for live image -# -# chkconfig: 345 99 01 -# description: Late init script for live image. - -. /etc/init.d/functions - -if ! strstr "\`cat /proc/cmdline\`" rd.live.image || [ "\$1" != "start" ] || [ -e /.liveimg-late-configured ] ; then - exit 0 -fi - -exists() { - which \$1 >/dev/null 2>&1 || return - \$* -} - -touch /.liveimg-late-configured - -# Read some stuff out of the kernel cmdline -for o in \`cat /proc/cmdline\` ; do - case \$o in - ks=*) - ks="--kickstart=\${o#ks=}" - ;; - xdriver=*) - xdriver="\${o#xdriver=}" - ;; - esac -done - -# If liveinst or textinst is given, start installer -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/fstab << EOF -vartmp /var/tmp tmpfs defaults 0 0 -EOF - -# PackageKit likes to play games. Let's fix that. -rm -f /var/lib/rpm/__db* -releasever=$(rpm -q --qf '%{version}\n' --whatprovides system-release) -basearch=$(uname -i) -rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial -echo "Packages within this LiveCD" -rpm -qa -# Note that running rpm recreates the rpm db files which aren't needed or wanted -rm -f /var/lib/rpm/__db* - -# go ahead and pre-make the man -k cache (#455968) -/usr/bin/mandb - -# make sure there aren't core files lying around -rm -f /core* - -# remove random seed, the newly installed instance should make it's own -rm -f /var/lib/systemd/random-seed - -# convince readahead not to collect -# FIXME: for systemd - -echo 'File created by kickstart. See systemd-update-done.service(8).' \ - | tee /etc/.updated >/var/.updated - -# Drop the rescue kernel and initramfs, we don't need them on the live media itself. -# See bug 1317709 -rm -f /boot/*-rescue* - -# Disable network service here, as doing it in the services line -# fails due to RHBZ #1369794 - the error is expected -/sbin/chkconfig network off - -# Remove machine-id on generated images -rm -f /etc/machine-id -touch /etc/machine-id - -%end - -%post --nochroot -cp $INSTALL_ROOT/usr/share/licenses/*-release/* $LIVE_ROOT/ - -# only works on x86_64 -if [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ]; then - # For livecd-creator builds - if [ ! -d $LIVE_ROOT/LiveOS ]; then mkdir -p $LIVE_ROOT/LiveOS ; fi - cp /usr/bin/livecd-iso-to-disk $LIVE_ROOT/LiveOS - - # For lorax/livemedia-creator builds - sed -i ' - /## make boot.iso/ i\ - # Add livecd-iso-to-disk script to .iso filesystem at /LiveOS/\ - <% f = "usr/bin/livecd-iso-to-disk" %>\ - %if exists(f):\ - install ${f} ${LIVEDIR}/${f|basename}\ - %endif\ - ' /usr/share/lorax/templates.d/99-generic/live/x86.tmpl -fi - -%end - -%post -# cinnamon configuration - -cat > /etc/sysconfig/desktop <> /etc/rc.d/init.d/livesys << EOF -# 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 "" -fi -mkdir /home/liveuser/Desktop -cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop -chmod +x /home/liveuser/Desktop/liveinst.desktop - -# move to anaconda -mv /usr/share/applications/liveinst.desktop /usr/share/applications/anaconda.desktop - -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 - -# set up lightdm autologin -sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf -sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf -sed -i 's/^#show-language-selector=.*/show-language-selector=true/' /etc/lightdm/lightdm-gtk-greeter.conf - -# set cinnamon as default session, otherwise login will fail -sed -i 's/^#user-session=.*/user-session=cinnamon/' /etc/lightdm/lightdm.conf - -# 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 - -# The updater applet might or might not exist -rm -f /etc/xdg/autostart/org.mageia.dnfdragora-updater.desktop - -# reset selinux contexts -chown -R liveuser:liveuser /home/liveuser/ -restorecon -R /home/liveuser/ -restorecon -R / - -EOF - -# this doesn't come up automatically. not sure why. -systemctl enable --force lightdm.service - -# CRB needs to be enabled for EPEL to function. -dnf config-manager --set-enabled crb - -%end - -%packages -@anaconda-tools -@base-x -@core -@dial-up -@fonts -@guest-desktop-agents -@hardware-support -@input-methods -@multimedia -@standard -NetworkManager-adsl -NetworkManager-bluetooth -NetworkManager-l2tp-gnome -NetworkManager-libreswan-gnome -NetworkManager-openconnect-gnome -NetworkManager-openvpn-gnome -NetworkManager-ppp -NetworkManager-pptp-gnome -NetworkManager-wifi -NetworkManager-wwan -aajohan-comfortaa-fonts -anaconda -anaconda-install-env-deps -anaconda-live -chkconfig -cinnamon -cinnamon-control-center -cinnamon-screensaver -dracut-live -efi-filesystem -efibootmgr -efivar-libs -eom -epel-release -f36-backgrounds-extras-gnome -f36-backgrounds-gnome -f37-backgrounds-extras-gnome -f37-backgrounds-gnome -firefox -firewall-config -glibc-all-langpacks -gnome-calculator -gnome-disk-utility -gnome-screenshot -gnome-system-monitor -gnome-terminal -grub2-common -grub2-efi-*64 -grub2-efi-*64-cdboot -grub2-pc-modules -grub2-tools -grub2-tools-efi -grub2-tools-extra -grub2-tools-minimal -grubby -gstreamer1-plugins-ugly-free -gvfs-gphoto2 -gvfs-mtp -gvfs-smb -hexchat -imsettings-systemd -initial-setup-gui -initscripts -kernel -kernel-modules -kernel-modules-extra -libreoffice-calc -libreoffice-emailmerge -libreoffice-graphicfilter -libreoffice-impress -libreoffice-writer -lightdm -memtest86+ -metacity -nemo-fileroller -nemo-image-converter -nemo-preview -nm-connection-editor -parole -pipewire-alsa -pipewire-pulseaudio -powerline -redshift-gtk -rocky-backgrounds -sane-backends-drivers-scanners -setroubleshoot -shim-*64 -slick-greeter -slick-greeter-cinnamon -syslinux -thunderbird -tmux -tmux-powerline -transmission -vim-enhanced -vim-powerline -wireplumber -xdg-user-dirs-gtk -xed -xreader --hplip --isdn4k-utils --mpage --shim-unsigned-*64 --xane-gimp --xsane - -%end diff --git a/Rocky-9-KDE.ks b/Rocky-9-KDE.ks index 6a21a6b..042f825 100644 --- a/Rocky-9-KDE.ks +++ b/Rocky-9-KDE.ks @@ -278,7 +278,7 @@ EOF rm -f /var/lib/rpm/__db* releasever=$(rpm -q --qf '%{version}\n' --whatprovides system-release) basearch=$(uname -i) -rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial +rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9 echo "Packages within this LiveCD" rpm -qa # Note that running rpm recreates the rpm db files which aren't needed or wanted @@ -349,6 +349,9 @@ cat > /root/.config/gtk-3.0/settings.ini << EOF gtk-theme-name = Adwaita EOF +rm -f /usr/share/wallpapers/Fedora +ln -s rocky-abstract-2 /usr/share/wallpapers/Fedora + # add initscript cat >> /etc/rc.d/init.d/livesys << EOF diff --git a/Rocky-9-MATE.ks b/Rocky-9-MATE.ks index 3a97886..f9a5949 100644 --- a/Rocky-9-MATE.ks +++ b/Rocky-9-MATE.ks @@ -277,7 +277,7 @@ EOF rm -f /var/lib/rpm/__db* releasever=$(rpm -q --qf '%{version}\n' --whatprovides system-release) basearch=$(uname -i) -rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial +rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9 echo "Packages within this LiveCD" rpm -qa # Note that running rpm recreates the rpm db files which aren't needed or wanted diff --git a/Rocky-9-MATE.kse b/Rocky-9-MATE.kse deleted file mode 100644 index ee68c01..0000000 --- a/Rocky-9-MATE.kse +++ /dev/null @@ -1,558 +0,0 @@ -# Generated by pykickstart v3.36 -#version=DEVEL -# X Window System configuration information -xconfig --startxonboot -# Keyboard layouts -keyboard 'us' -# Root password -rootpw --iscrypted --lock locked -# System language -lang en_US.UTF-8 -# Shutdown after installation -shutdown -# Network information -network --bootproto=dhcp --device=link --activate -# Firewall configuration -firewall --enabled --service=mdns -# Use network installation -url --url="http://dl.rockylinux.org/stg/rocky/9/BaseOS/$basearch/os/" -repo --name="BaseOS" --baseurl=http://dl.rockylinux.org/stg/rocky/9/BaseOS/$basearch/os/ --cost=200 -repo --name="AppStream" --baseurl=http://dl.rockylinux.org/stg/rocky/9/AppStream/$basearch/os/ --cost=200 -repo --name="CRB" --baseurl=http://dl.rockylinux.org/stg/rocky/9/CRB/$basearch/os/ --cost=200 -repo --name="extras" --baseurl=http://dl.rockylinux.org/stg/rocky/9/extras/$basearch/os --cost=200 -repo --name="epel" --baseurl=https://dl.fedoraproject.org/pub/epel/9/Everything/$basearch/ --cost=200 -# System timezone -timezone US/Eastern -# SELinux configuration -selinux --enforcing -# System services -services --disabled="sshd" --enabled="NetworkManager,ModemManager" -# System bootloader configuration -bootloader --location=none -# Clear the Master Boot Record -zerombr -# Partition clearing information -clearpart --all -# Disk partitioning information -part / --fstype="ext4" --size=5120 -part / --size=7168 - -%post -# FIXME: it'd be better to get this installed from a package -cat > /etc/rc.d/init.d/livesys << EOF -#!/bin/bash -# -# live: Init script for live image -# -# chkconfig: 345 00 99 -# description: Init script for live image. -### BEGIN INIT INFO -# X-Start-Before: display-manager chronyd -### END INIT INFO - -. /etc/init.d/functions - -if ! strstr "\`cat /proc/cmdline\`" rd.live.image || [ "\$1" != "start" ]; then - exit 0 -fi - -if [ -e /.liveimg-configured ] ; then - configdone=1 -fi - -exists() { - which \$1 >/dev/null 2>&1 || return - \$* -} - -livedir="LiveOS" -for arg in \`cat /proc/cmdline\` ; do - if [ "\${arg##rd.live.dir=}" != "\${arg}" ]; then - livedir=\${arg##rd.live.dir=} - continue - fi - if [ "\${arg##live_dir=}" != "\${arg}" ]; then - livedir=\${arg##live_dir=} - fi -done - -# Enable swap unless requested otherwise -swaps=\`blkid -t TYPE=swap -o device\` -if ! strstr "\`cat /proc/cmdline\`" noswap && [ -n "\$swaps" ] ; then - for s in \$swaps ; do - action "Enabling swap partition \$s" swapon \$s - done -fi -if ! strstr "\`cat /proc/cmdline\`" noswap && [ -f /run/initramfs/live/\${livedir}/swap.img ] ; then - action "Enabling swap file" swapon /run/initramfs/live/\${livedir}/swap.img -fi - -# Support for persistent homes -mountPersistentHome() { - # support label/uuid - if [ "\${homedev##LABEL=}" != "\${homedev}" -o "\${homedev##UUID=}" != "\${homedev}" ]; then - homedev=\`/sbin/blkid -o device -t "\$homedev"\` - fi - - # if we're given a file rather than a blockdev, loopback it - if [ "\${homedev##mtd}" != "\${homedev}" ]; then - # mtd devs don't have a block device but get magic-mounted with -t jffs2 - mountopts="-t jffs2" - elif [ ! -b "\$homedev" ]; then - loopdev=\`losetup -f\` - if [ "\${homedev##/run/initramfs/live}" != "\${homedev}" ]; then - action "Remounting live store r/w" mount -o remount,rw /run/initramfs/live - fi - losetup \$loopdev \$homedev - homedev=\$loopdev - fi - - # if it's encrypted, we need to unlock it - if [ "\$(/sbin/blkid -s TYPE -o value \$homedev 2>/dev/null)" = "crypto_LUKS" ]; then - echo - echo "Setting up encrypted /home device" - plymouth ask-for-password --command="cryptsetup luksOpen \$homedev EncHome" - homedev=/dev/mapper/EncHome - fi - - # and finally do the mount - mount \$mountopts \$homedev /home - # if we have /home under what's passed for persistent home, then - # we should make that the real /home. useful for mtd device on olpc - if [ -d /home/home ]; then mount --bind /home/home /home ; fi - [ -x /sbin/restorecon ] && /sbin/restorecon /home - if [ -d /home/liveuser ]; then USERADDARGS="-M" ; fi -} - -# Help locate persistent homes -findPersistentHome() { - for arg in \`cat /proc/cmdline\` ; do - if [ "\${arg##persistenthome=}" != "\${arg}" ]; then - homedev=\${arg##persistenthome=} - fi - done -} - -if strstr "\`cat /proc/cmdline\`" persistenthome= ; then - findPersistentHome -elif [ -e /run/initramfs/live/\${livedir}/home.img ]; then - homedev=/run/initramfs/live/\${livedir}/home.img -fi - -# Mount the persistent home if it's available -if ! strstr "\`cat /proc/cmdline\`" nopersistenthome && [ -n "\$homedev" ] ; then - action "Mounting persistent /home" mountPersistentHome -fi - -if [ -n "\$configdone" ]; then - exit 0 -fi - -# Create the liveuser (no password) so automatic logins and sudo works -action "Adding live user" useradd \$USERADDARGS -c "Live System User" liveuser -passwd -d liveuser > /dev/null -usermod -aG wheel liveuser > /dev/null - -# Same for root -passwd -d root > /dev/null - -# Turn off firstboot (similar to a DVD/minimal install, where it asks -# for the user to accept the EULA before bringing up a TTY) -systemctl --no-reload disable firstboot-text.service 2> /dev/null || : -systemctl --no-reload disable firstboot-graphical.service 2> /dev/null || : -systemctl stop firstboot-text.service 2> /dev/null || : -systemctl stop firstboot-graphical.service 2> /dev/null || : - -# Prelinking damages the images -sed -i 's/PRELINKING=yes/PRELINKING=no/' /etc/sysconfig/prelink &>/dev/null || : - -# Turn off mdmonitor by default -systemctl --no-reload disable mdmonitor.service 2> /dev/null || : -systemctl --no-reload disable mdmonitor-takeover.service 2> /dev/null || : -systemctl stop mdmonitor.service 2> /dev/null || : -systemctl stop mdmonitor-takeover.service 2> /dev/null || : - -# Even if there isn't gnome, this doesn't hurt. -gsettings set org.gnome.software download-updates 'false' || : - -# Disable cron -systemctl --no-reload disable crond.service 2> /dev/null || : -systemctl --no-reload disable atd.service 2> /dev/null || : -systemctl stop crond.service 2> /dev/null || : -systemctl stop atd.service 2> /dev/null || : - -# Disable abrt -systemctl --no-reload disable abrtd.service 2> /dev/null || : -systemctl stop abrtd.service 2> /dev/null || : - -# Don't sync the system clock when running live (RHBZ #1018162) -sed -i 's/rtcsync//' /etc/chrony.conf - -# Mark things as configured -touch /.liveimg-configured - -# add static hostname to work around xauth bug -# 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 -echo "localhost-live" > /etc/hostname - -EOF - -# HAL likes to start late. -cat > /etc/rc.d/init.d/livesys-late << EOF -#!/bin/bash -# -# live: Late init script for live image -# -# chkconfig: 345 99 01 -# description: Late init script for live image. - -. /etc/init.d/functions - -if ! strstr "\`cat /proc/cmdline\`" rd.live.image || [ "\$1" != "start" ] || [ -e /.liveimg-late-configured ] ; then - exit 0 -fi - -exists() { - which \$1 >/dev/null 2>&1 || return - \$* -} - -touch /.liveimg-late-configured - -# Read some stuff out of the kernel cmdline -for o in \`cat /proc/cmdline\` ; do - case \$o in - ks=*) - ks="--kickstart=\${o#ks=}" - ;; - xdriver=*) - xdriver="\${o#xdriver=}" - ;; - esac -done - -# If liveinst or textinst is given, start installer -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/fstab << EOF -vartmp /var/tmp tmpfs defaults 0 0 -EOF - -# PackageKit likes to play games. Let's fix that. -rm -f /var/lib/rpm/__db* -releasever=$(rpm -q --qf '%{version}\n' --whatprovides system-release) -basearch=$(uname -i) -rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial -echo "Packages within this LiveCD" -rpm -qa -# Note that running rpm recreates the rpm db files which aren't needed or wanted -rm -f /var/lib/rpm/__db* - -# go ahead and pre-make the man -k cache (#455968) -/usr/bin/mandb - -# make sure there aren't core files lying around -rm -f /core* - -# remove random seed, the newly installed instance should make it's own -rm -f /var/lib/systemd/random-seed - -# convince readahead not to collect -# FIXME: for systemd - -echo 'File created by kickstart. See systemd-update-done.service(8).' \ - | tee /etc/.updated >/var/.updated - -# Drop the rescue kernel and initramfs, we don't need them on the live media itself. -# See bug 1317709 -rm -f /boot/*-rescue* - -# Disable network service here, as doing it in the services line -# fails due to RHBZ #1369794 - the error is expected -/sbin/chkconfig network off - -# Remove machine-id on generated images -rm -f /etc/machine-id -touch /etc/machine-id - -%end - -%post --nochroot -cp $INSTALL_ROOT/usr/share/licenses/*-release/* $LIVE_ROOT/ - -# only works on x86_64 -if [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ]; then - # For livecd-creator builds - if [ ! -d $LIVE_ROOT/LiveOS ]; then mkdir -p $LIVE_ROOT/LiveOS ; fi - cp /usr/bin/livecd-iso-to-disk $LIVE_ROOT/LiveOS - - # For lorax/livemedia-creator builds - sed -i ' - /## make boot.iso/ i\ - # Add livecd-iso-to-disk script to .iso filesystem at /LiveOS/\ - <% f = "usr/bin/livecd-iso-to-disk" %>\ - %if exists(f):\ - install ${f} ${LIVEDIR}/${f|basename}\ - %endif\ - ' /usr/share/lorax/templates.d/99-generic/live/x86.tmpl -fi - -%end - -%post -# mate configuration - -cat >> /etc/rc.d/init.d/livesys << EOF -# 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 "" -fi -mkdir /home/liveuser/Desktop -cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop -chmod +x /home/liveuser/Desktop/liveinst.desktop - -# move to anaconda - probably not required for MATE. -mv /usr/share/applications/liveinst.desktop /usr/share/applications/anaconda.desktop - -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 - -# rebuild schema cache with any overrides we installed -glib-compile-schemas /usr/share/glib-2.0/schemas - -# set up lightdm autologin -sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf -sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf -sed -i 's/^#show-language-selector=.*/show-language-selector=true/' /etc/lightdm/lightdm-gtk-greeter.conf - -# set MATE as default session, otherwise login will fail -sed -i 's/^#user-session=.*/user-session=mate/' /etc/lightdm/lightdm.conf - -# 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 - -# The updater applet might or might not exist -rm -f /etc/xdg/autostart/org.mageia.dnfdragora-updater.desktop - -# reset selinux contexts -chown -R liveuser:liveuser /home/liveuser/ -restorecon -R /home/liveuser/ -restorecon -R / - -EOF - -# this doesn't come up automatically. not sure why. -systemctl enable --force lightdm.service - -# CRB needs to be enabled for EPEL to function. -dnf config-manager --set-enabled crb - -%end - -%packages -@anaconda-tools -@base-x -@core -@dial-up -@fonts -@guest-desktop-agents -@hardware-support -@input-methods -@multimedia -@standard -NetworkManager-adsl -NetworkManager-bluetooth -NetworkManager-l2tp-gnome -NetworkManager-libreswan-gnome -NetworkManager-openconnect-gnome -NetworkManager-openvpn-gnome -NetworkManager-ovs -NetworkManager-ppp -NetworkManager-pptp-gnome -NetworkManager-team -NetworkManager-wifi -NetworkManager-wwan -aajohan-comfortaa-fonts -anaconda -anaconda-install-env-deps -anaconda-live -atril -atril-caja -atril-thumbnailer -caja -caja-actions -chkconfig -dconf-editor -dracut-live -efi-filesystem -efibootmgr -efivar-libs -engrampa -eom -epel-release -f36-backgrounds-extras-mate -f36-backgrounds-mate -filezilla -firefox -firewall-applet -firewall-config -glibc-all-langpacks -gnome-disk-utility -gnome-epub-thumbnailer -gnome-themes-extra -gparted -grub2-common -grub2-efi-*64 -grub2-efi-*64-cdboot -grub2-pc-modules -grub2-tools -grub2-tools-efi -grub2-tools-extra -grub2-tools-minimal -grubby -gstreamer1-plugins-ugly-free -gtk2-engines -gucharmap -gvfs-fuse -gvfs-gphoto2 -gvfs-mtp -gvfs-smb -hexchat -initial-setup-gui -initscripts -kernel -kernel-modules -kernel-modules-extra -libmatekbd -libmatemixer -libmateweather -libreoffice-calc -libreoffice-emailmerge -libreoffice-graphicfilter -libreoffice-impress -libreoffice-writer -libsecret -lightdm -lm_sensors -marco -mate-applets -mate-backgrounds -mate-calc -mate-control-center -mate-desktop -mate-dictionary -mate-disk-usage-analyzer -mate-icon-theme -mate-media -mate-menu -mate-menus -mate-menus-preferences-category-menu -mate-notification-daemon -mate-panel -mate-polkit -mate-power-manager -mate-screensaver -mate-screenshot -mate-search-tool -mate-sensors-applet -mate-session-manager -mate-settings-daemon -mate-system-log -mate-system-monitor -mate-terminal -mate-themes -mate-user-admin -mate-user-guide -mate-utils -memtest86+ -mozo -network-manager-applet -nm-connection-editor -orca -p7zip -p7zip-plugins -parole -pavucontrol -pipewire-alsa -pipewire-pulseaudio -pluma -pluma-plugins -rocky-backgrounds -seahorse -seahorse-caja -setroubleshoot -shim-*64 -slick-greeter-mate -syslinux -thunderbird -tigervnc -usermode-gtk -vim-enhanced -wireplumber -xdg-user-dirs-gtk -xmodmap -xrdb -yelp --@3d-printing --@admin-tools --audacious --brasero --evolution-help --fedora-icon-theme --gnome-icon-theme --gnome-icon-theme-symbolic --gnome-logs --gnome-software --gnome-user-docs --hplip --isdn4k-utils --mpage --sane-backends --shim-unsigned-*64 --systemd-oomd-defaults --telnet --xane-gimp --xsane - -%end diff --git a/Rocky-9-Workstation-Lite.ks b/Rocky-9-Workstation-Lite.ks index 7bc565c..2dda2f1 100644 --- a/Rocky-9-Workstation-Lite.ks +++ b/Rocky-9-Workstation-Lite.ks @@ -276,7 +276,7 @@ EOF rm -f /var/lib/rpm/__db* releasever=$(rpm -q --qf '%{version}\n' --whatprovides system-release) basearch=$(uname -i) -rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial +rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9 echo "Packages within this LiveCD" rpm -qa # Note that running rpm recreates the rpm db files which aren't needed or wanted diff --git a/Rocky-9-Workstation-Mainline.ks b/Rocky-9-Workstation-Mainline.ks index 9329856..e44c855 100644 --- a/Rocky-9-Workstation-Mainline.ks +++ b/Rocky-9-Workstation-Mainline.ks @@ -278,7 +278,7 @@ EOF rm -f /var/lib/rpm/__db* releasever=$(rpm -q --qf '%{version}\n' --whatprovides system-release) basearch=$(uname -i) -rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial +rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9 echo "Packages within this LiveCD" rpm -qa # Note that running rpm recreates the rpm db files which aren't needed or wanted diff --git a/Rocky-9-Workstation.ks b/Rocky-9-Workstation.ks index 02c8265..62125a1 100644 --- a/Rocky-9-Workstation.ks +++ b/Rocky-9-Workstation.ks @@ -276,7 +276,7 @@ EOF rm -f /var/lib/rpm/__db* releasever=$(rpm -q --qf '%{version}\n' --whatprovides system-release) basearch=$(uname -i) -rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial +rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9 echo "Packages within this LiveCD" rpm -qa # Note that running rpm recreates the rpm db files which aren't needed or wanted diff --git a/Rocky-9-XFCE.ks b/Rocky-9-XFCE.ks index 55c2042..5caec29 100644 --- a/Rocky-9-XFCE.ks +++ b/Rocky-9-XFCE.ks @@ -277,7 +277,7 @@ EOF rm -f /var/lib/rpm/__db* releasever=$(rpm -q --qf '%{version}\n' --whatprovides system-release) basearch=$(uname -i) -rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial +rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9 echo "Packages within this LiveCD" rpm -qa # Note that running rpm recreates the rpm db files which aren't needed or wanted diff --git a/Rocky-9-XFCE.kse b/Rocky-9-XFCE.kse deleted file mode 100644 index d0fe745..0000000 --- a/Rocky-9-XFCE.kse +++ /dev/null @@ -1,514 +0,0 @@ -# Generated by pykickstart v3.36 -#version=DEVEL -# X Window System configuration information -xconfig --startxonboot -# Keyboard layouts -keyboard 'us' -# Root password -rootpw --iscrypted --lock locked -# System language -lang en_US.UTF-8 -# Shutdown after installation -shutdown -# Network information -network --bootproto=dhcp --device=link --activate -# Firewall configuration -firewall --enabled --service=mdns -# Use network installation -url --url="http://dl.rockylinux.org/stg/rocky/9/BaseOS/$basearch/os/" -repo --name="BaseOS" --baseurl=http://dl.rockylinux.org/stg/rocky/9/BaseOS/$basearch/os/ --cost=200 -repo --name="AppStream" --baseurl=http://dl.rockylinux.org/stg/rocky/9/AppStream/$basearch/os/ --cost=200 -repo --name="CRB" --baseurl=http://dl.rockylinux.org/stg/rocky/9/CRB/$basearch/os/ --cost=200 -repo --name="extras" --baseurl=http://dl.rockylinux.org/stg/rocky/9/extras/$basearch/os --cost=200 -repo --name="epel" --baseurl=https://dl.fedoraproject.org/pub/epel/9/Everything/$basearch/ --cost=200 -# System timezone -timezone US/Eastern -# SELinux configuration -selinux --enforcing -# System services -services --disabled="sshd" --enabled="NetworkManager,ModemManager" -# System bootloader configuration -bootloader --location=none -# Clear the Master Boot Record -zerombr -# Partition clearing information -clearpart --all -# Disk partitioning information -part / --fstype="ext4" --size=5120 -part / --size=6144 - -%post -# FIXME: it'd be better to get this installed from a package -cat > /etc/rc.d/init.d/livesys << EOF -#!/bin/bash -# -# live: Init script for live image -# -# chkconfig: 345 00 99 -# description: Init script for live image. -### BEGIN INIT INFO -# X-Start-Before: display-manager chronyd -### END INIT INFO - -. /etc/init.d/functions - -if ! strstr "\`cat /proc/cmdline\`" rd.live.image || [ "\$1" != "start" ]; then - exit 0 -fi - -if [ -e /.liveimg-configured ] ; then - configdone=1 -fi - -exists() { - which \$1 >/dev/null 2>&1 || return - \$* -} - -livedir="LiveOS" -for arg in \`cat /proc/cmdline\` ; do - if [ "\${arg##rd.live.dir=}" != "\${arg}" ]; then - livedir=\${arg##rd.live.dir=} - continue - fi - if [ "\${arg##live_dir=}" != "\${arg}" ]; then - livedir=\${arg##live_dir=} - fi -done - -# Enable swap unless requested otherwise -swaps=\`blkid -t TYPE=swap -o device\` -if ! strstr "\`cat /proc/cmdline\`" noswap && [ -n "\$swaps" ] ; then - for s in \$swaps ; do - action "Enabling swap partition \$s" swapon \$s - done -fi -if ! strstr "\`cat /proc/cmdline\`" noswap && [ -f /run/initramfs/live/\${livedir}/swap.img ] ; then - action "Enabling swap file" swapon /run/initramfs/live/\${livedir}/swap.img -fi - -# Support for persistent homes -mountPersistentHome() { - # support label/uuid - if [ "\${homedev##LABEL=}" != "\${homedev}" -o "\${homedev##UUID=}" != "\${homedev}" ]; then - homedev=\`/sbin/blkid -o device -t "\$homedev"\` - fi - - # if we're given a file rather than a blockdev, loopback it - if [ "\${homedev##mtd}" != "\${homedev}" ]; then - # mtd devs don't have a block device but get magic-mounted with -t jffs2 - mountopts="-t jffs2" - elif [ ! -b "\$homedev" ]; then - loopdev=\`losetup -f\` - if [ "\${homedev##/run/initramfs/live}" != "\${homedev}" ]; then - action "Remounting live store r/w" mount -o remount,rw /run/initramfs/live - fi - losetup \$loopdev \$homedev - homedev=\$loopdev - fi - - # if it's encrypted, we need to unlock it - if [ "\$(/sbin/blkid -s TYPE -o value \$homedev 2>/dev/null)" = "crypto_LUKS" ]; then - echo - echo "Setting up encrypted /home device" - plymouth ask-for-password --command="cryptsetup luksOpen \$homedev EncHome" - homedev=/dev/mapper/EncHome - fi - - # and finally do the mount - mount \$mountopts \$homedev /home - # if we have /home under what's passed for persistent home, then - # we should make that the real /home. useful for mtd device on olpc - if [ -d /home/home ]; then mount --bind /home/home /home ; fi - [ -x /sbin/restorecon ] && /sbin/restorecon /home - if [ -d /home/liveuser ]; then USERADDARGS="-M" ; fi -} - -# Help locate persistent homes -findPersistentHome() { - for arg in \`cat /proc/cmdline\` ; do - if [ "\${arg##persistenthome=}" != "\${arg}" ]; then - homedev=\${arg##persistenthome=} - fi - done -} - -if strstr "\`cat /proc/cmdline\`" persistenthome= ; then - findPersistentHome -elif [ -e /run/initramfs/live/\${livedir}/home.img ]; then - homedev=/run/initramfs/live/\${livedir}/home.img -fi - -# Mount the persistent home if it's available -if ! strstr "\`cat /proc/cmdline\`" nopersistenthome && [ -n "\$homedev" ] ; then - action "Mounting persistent /home" mountPersistentHome -fi - -if [ -n "\$configdone" ]; then - exit 0 -fi - -# Create the liveuser (no password) so automatic logins and sudo works -action "Adding live user" useradd \$USERADDARGS -c "Live System User" liveuser -passwd -d liveuser > /dev/null -usermod -aG wheel liveuser > /dev/null - -# Same for root -passwd -d root > /dev/null - -# Turn off firstboot (similar to a DVD/minimal install, where it asks -# for the user to accept the EULA before bringing up a TTY) -systemctl --no-reload disable firstboot-text.service 2> /dev/null || : -systemctl --no-reload disable firstboot-graphical.service 2> /dev/null || : -systemctl stop firstboot-text.service 2> /dev/null || : -systemctl stop firstboot-graphical.service 2> /dev/null || : - -# Prelinking damages the images -sed -i 's/PRELINKING=yes/PRELINKING=no/' /etc/sysconfig/prelink &>/dev/null || : - -# Turn off mdmonitor by default -systemctl --no-reload disable mdmonitor.service 2> /dev/null || : -systemctl --no-reload disable mdmonitor-takeover.service 2> /dev/null || : -systemctl stop mdmonitor.service 2> /dev/null || : -systemctl stop mdmonitor-takeover.service 2> /dev/null || : - -# Even if there isn't gnome, this doesn't hurt. -gsettings set org.gnome.software download-updates 'false' || : - -# Disable cron -systemctl --no-reload disable crond.service 2> /dev/null || : -systemctl --no-reload disable atd.service 2> /dev/null || : -systemctl stop crond.service 2> /dev/null || : -systemctl stop atd.service 2> /dev/null || : - -# Disable abrt -systemctl --no-reload disable abrtd.service 2> /dev/null || : -systemctl stop abrtd.service 2> /dev/null || : - -# Don't sync the system clock when running live (RHBZ #1018162) -sed -i 's/rtcsync//' /etc/chrony.conf - -# Mark things as configured -touch /.liveimg-configured - -# add static hostname to work around xauth bug -# 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 -echo "localhost-live" > /etc/hostname - -EOF - -# HAL likes to start late. -cat > /etc/rc.d/init.d/livesys-late << EOF -#!/bin/bash -# -# live: Late init script for live image -# -# chkconfig: 345 99 01 -# description: Late init script for live image. - -. /etc/init.d/functions - -if ! strstr "\`cat /proc/cmdline\`" rd.live.image || [ "\$1" != "start" ] || [ -e /.liveimg-late-configured ] ; then - exit 0 -fi - -exists() { - which \$1 >/dev/null 2>&1 || return - \$* -} - -touch /.liveimg-late-configured - -# Read some stuff out of the kernel cmdline -for o in \`cat /proc/cmdline\` ; do - case \$o in - ks=*) - ks="--kickstart=\${o#ks=}" - ;; - xdriver=*) - xdriver="\${o#xdriver=}" - ;; - esac -done - -# If liveinst or textinst is given, start installer -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/fstab << EOF -vartmp /var/tmp tmpfs defaults 0 0 -EOF - -# PackageKit likes to play games. Let's fix that. -rm -f /var/lib/rpm/__db* -releasever=$(rpm -q --qf '%{version}\n' --whatprovides system-release) -basearch=$(uname -i) -rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial -echo "Packages within this LiveCD" -rpm -qa -# Note that running rpm recreates the rpm db files which aren't needed or wanted -rm -f /var/lib/rpm/__db* - -# go ahead and pre-make the man -k cache (#455968) -/usr/bin/mandb - -# make sure there aren't core files lying around -rm -f /core* - -# remove random seed, the newly installed instance should make it's own -rm -f /var/lib/systemd/random-seed - -# convince readahead not to collect -# FIXME: for systemd - -echo 'File created by kickstart. See systemd-update-done.service(8).' \ - | tee /etc/.updated >/var/.updated - -# Drop the rescue kernel and initramfs, we don't need them on the live media itself. -# See bug 1317709 -rm -f /boot/*-rescue* - -# Disable network service here, as doing it in the services line -# fails due to RHBZ #1369794 - the error is expected -/sbin/chkconfig network off - -# Remove machine-id on generated images -rm -f /etc/machine-id -touch /etc/machine-id - -%end - -%post --nochroot -cp $INSTALL_ROOT/usr/share/licenses/*-release/* $LIVE_ROOT/ - -# only works on x86_64 -if [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ]; then - # For livecd-creator builds - if [ ! -d $LIVE_ROOT/LiveOS ]; then mkdir -p $LIVE_ROOT/LiveOS ; fi - cp /usr/bin/livecd-iso-to-disk $LIVE_ROOT/LiveOS - - # For lorax/livemedia-creator builds - sed -i ' - /## make boot.iso/ i\ - # Add livecd-iso-to-disk script to .iso filesystem at /LiveOS/\ - <% f = "usr/bin/livecd-iso-to-disk" %>\ - %if exists(f):\ - install ${f} ${LIVEDIR}/${f|basename}\ - %endif\ - ' /usr/share/lorax/templates.d/99-generic/live/x86.tmpl -fi - -%end - -%post -# xfce configuration - -# create /etc/sysconfig/desktop (needed for installation) - -cat > /etc/sysconfig/desktop <> /etc/rc.d/init.d/livesys << EOF - -mkdir -p /home/liveuser/.config/xfce4 -# ugly stuff, this should give us a default background for now -#mkdir -p /usr/share/backgrounds/images -#ln -s /usr/share/backgrounds/f32/default/f32.png \ -# /usr/share/backgrounds/images/default.png - -cat > /home/liveuser/.config/xfce4/helpers.rc << FOE -MailReader=sylpheed-claws -FileManager=Thunar -WebBrowser=firefox -FOE - -# disable screensaver locking (#674410) -cat >> /home/liveuser/.xscreensaver << FOE -mode: off -lock: False -dpmsEnabled: False -FOE - -# deactivate xfconf-migration (#683161) -rm -f /etc/xdg/autostart/xfconf-migration-4.6.desktop || : - -# deactivate xfce4-panel first-run dialog (#693569) -mkdir -p /home/liveuser/.config/xfce4/xfconf/xfce-perchannel-xml -cp /etc/xdg/xfce4/panel/default.xml /home/liveuser/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml - -# set up lightdm autologin -sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf -sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf -sed -i 's/^#show-language-selector=.*/show-language-selector=true/' /etc/lightdm/lightdm-gtk-greeter.conf - -# set Xfce as default session, otherwise login will fail -sed -i 's/^#user-session=.*/user-session=xfce/' /etc/lightdm/lightdm.conf - -# debrand -#sed -i "s/Red Hat Enterprise/Rocky/g" /usr/share/anaconda/gnome/fedora-welcome.desktop -#sed -i "s/RHEL/Rocky Linux/g" /usr/share/anaconda/gnome/fedora-welcome -#sed -i "s/Red Hat Enterprise/Rocky/g" /usr/share/anaconda/gnome/fedora-welcome -#sed -i "s/org.fedoraproject.AnacondaInstaller/fedora-logo-icon/g" /usr/share/anaconda/gnome/fedora-welcome -#sed -i "s/org.fedoraproject.AnacondaInstaller/fedora-logo-icon/g" /usr/share/applications/liveinst.desktop - -# Show harddisk install on the desktop -sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop -mkdir /home/liveuser/Desktop -cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop/ - -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 - -# no updater applet in live environment -rm -f /etc/xdg/autostart/org.mageia.dnfdragora-updater.desktop - -# and mark it as executable (new Xfce security feature) -chmod +x /home/liveuser/Desktop/liveinst.desktop - -# move to anaconda - probably not required for XFCE. -mv /usr/share/applications/liveinst.desktop /usr/share/applications/anaconda.desktop - -# this goes at the end after all other changes. -chown -R liveuser:liveuser /home/liveuser -restorecon -R /home/liveuser - -EOF - -# this doesn't come up automatically. not sure why. -systemctl enable --force lightdm.service - -# CRB needs to be enabled for EPEL to function. -dnf config-manager --set-enabled crb - -%end - -%packages -@anaconda-tools -@base-x -@core -@dial-up -@fonts -@guest-desktop-agents -@hardware-support -@input-methods -@multimedia -@standard -@xfce-desktop --nodefaults -aajohan-comfortaa-fonts -anaconda -anaconda-install-env-deps -anaconda-live -chkconfig -dracut-live -efi-filesystem -efibootmgr -efivar-libs -epel-release -f35-backgrounds-extras-xfce -f35-backgrounds-xfce -firefox -firewall-config -glibc-all-langpacks -gparted -grub2-common -grub2-efi-*64 -grub2-efi-*64-cdboot -grub2-pc-modules -grub2-tools -grub2-tools-efi -grub2-tools-extra -grub2-tools-minimal -grubby -initscripts -kernel -kernel-modules -kernel-modules-extra -lightdm -memtest86+ -network-manager-applet -openssh-askpass -pavucontrol -pcp-selinux -rocky-backgrounds -seahorse -shim-*64 -syslinux -thunar-archive-plugin -thunar-volman -thunderbird -tumbler -wget -xdg-user-dirs -xdg-user-dirs-gtk -xfce-polkit -xfce4-about -xfce4-appfinder -xfce4-datetime-plugin -xfce4-netload-plugin -xfce4-power-manager -xfce4-screensaver -xfce4-screenshooter-plugin -xfce4-smartbookmark-plugin -xfce4-systemload-plugin -xfce4-taskmanager -xfce4-terminal -xfce4-time-out-plugin -xfce4-weather-plugin -xfce4-whiskermenu-plugin --acpid --aspell-* --autofs --desktop-backgrounds-basic --gdm --gimp-help --gnome-shell --hplip --isdn4k-utils --mpage --sane-backends --shim-unsigned-*64 --xfce4-eyes-plugin --xfce4-sensors-plugin --xsane --xsane-gimp - -%end diff --git a/live/9/aarch64/peridot/rocky-live-kde-base.ks b/live/9/aarch64/peridot/rocky-live-kde-base.ks index 33c1327..a5aa7bb 100644 --- a/live/9/aarch64/peridot/rocky-live-kde-base.ks +++ b/live/9/aarch64/peridot/rocky-live-kde-base.ks @@ -17,6 +17,9 @@ cat > /root/.config/gtk-3.0/settings.ini << EOF gtk-theme-name = Adwaita EOF +rm -f /usr/share/wallpapers/Fedora +ln -s rocky-abstract-2 /usr/share/wallpapers/Fedora + # add initscript cat >> /etc/rc.d/init.d/livesys << EOF diff --git a/live/9/aarch64/prod/rocky-live-kde-base.ks b/live/9/aarch64/prod/rocky-live-kde-base.ks index 33c1327..a5aa7bb 100644 --- a/live/9/aarch64/prod/rocky-live-kde-base.ks +++ b/live/9/aarch64/prod/rocky-live-kde-base.ks @@ -17,6 +17,9 @@ cat > /root/.config/gtk-3.0/settings.ini << EOF gtk-theme-name = Adwaita EOF +rm -f /usr/share/wallpapers/Fedora +ln -s rocky-abstract-2 /usr/share/wallpapers/Fedora + # add initscript cat >> /etc/rc.d/init.d/livesys << EOF diff --git a/live/9/aarch64/stage/rocky-live-kde-base.ks b/live/9/aarch64/stage/rocky-live-kde-base.ks index 33c1327..a5aa7bb 100644 --- a/live/9/aarch64/stage/rocky-live-kde-base.ks +++ b/live/9/aarch64/stage/rocky-live-kde-base.ks @@ -17,6 +17,9 @@ cat > /root/.config/gtk-3.0/settings.ini << EOF gtk-theme-name = Adwaita EOF +rm -f /usr/share/wallpapers/Fedora +ln -s rocky-abstract-2 /usr/share/wallpapers/Fedora + # add initscript cat >> /etc/rc.d/init.d/livesys << EOF diff --git a/live/9/ppc64le/peridot/rocky-live-kde-base.ks b/live/9/ppc64le/peridot/rocky-live-kde-base.ks index 33c1327..a5aa7bb 100644 --- a/live/9/ppc64le/peridot/rocky-live-kde-base.ks +++ b/live/9/ppc64le/peridot/rocky-live-kde-base.ks @@ -17,6 +17,9 @@ cat > /root/.config/gtk-3.0/settings.ini << EOF gtk-theme-name = Adwaita EOF +rm -f /usr/share/wallpapers/Fedora +ln -s rocky-abstract-2 /usr/share/wallpapers/Fedora + # add initscript cat >> /etc/rc.d/init.d/livesys << EOF diff --git a/live/9/ppc64le/prod/rocky-live-kde-base.ks b/live/9/ppc64le/prod/rocky-live-kde-base.ks index 33c1327..a5aa7bb 100644 --- a/live/9/ppc64le/prod/rocky-live-kde-base.ks +++ b/live/9/ppc64le/prod/rocky-live-kde-base.ks @@ -17,6 +17,9 @@ cat > /root/.config/gtk-3.0/settings.ini << EOF gtk-theme-name = Adwaita EOF +rm -f /usr/share/wallpapers/Fedora +ln -s rocky-abstract-2 /usr/share/wallpapers/Fedora + # add initscript cat >> /etc/rc.d/init.d/livesys << EOF diff --git a/live/9/ppc64le/stage/rocky-live-kde-base.ks b/live/9/ppc64le/stage/rocky-live-kde-base.ks index 33c1327..a5aa7bb 100644 --- a/live/9/ppc64le/stage/rocky-live-kde-base.ks +++ b/live/9/ppc64le/stage/rocky-live-kde-base.ks @@ -17,6 +17,9 @@ cat > /root/.config/gtk-3.0/settings.ini << EOF gtk-theme-name = Adwaita EOF +rm -f /usr/share/wallpapers/Fedora +ln -s rocky-abstract-2 /usr/share/wallpapers/Fedora + # add initscript cat >> /etc/rc.d/init.d/livesys << EOF diff --git a/live/9/x86_64/peridot/rocky-live-kde-base.ks b/live/9/x86_64/peridot/rocky-live-kde-base.ks index 33c1327..a5aa7bb 100644 --- a/live/9/x86_64/peridot/rocky-live-kde-base.ks +++ b/live/9/x86_64/peridot/rocky-live-kde-base.ks @@ -17,6 +17,9 @@ cat > /root/.config/gtk-3.0/settings.ini << EOF gtk-theme-name = Adwaita EOF +rm -f /usr/share/wallpapers/Fedora +ln -s rocky-abstract-2 /usr/share/wallpapers/Fedora + # add initscript cat >> /etc/rc.d/init.d/livesys << EOF diff --git a/live/9/x86_64/prod/rocky-live-kde-base.ks b/live/9/x86_64/prod/rocky-live-kde-base.ks index 33c1327..a5aa7bb 100644 --- a/live/9/x86_64/prod/rocky-live-kde-base.ks +++ b/live/9/x86_64/prod/rocky-live-kde-base.ks @@ -17,6 +17,9 @@ cat > /root/.config/gtk-3.0/settings.ini << EOF gtk-theme-name = Adwaita EOF +rm -f /usr/share/wallpapers/Fedora +ln -s rocky-abstract-2 /usr/share/wallpapers/Fedora + # add initscript cat >> /etc/rc.d/init.d/livesys << EOF diff --git a/live/9/x86_64/stage/rocky-live-kde-base.ks b/live/9/x86_64/stage/rocky-live-kde-base.ks index 33c1327..a5aa7bb 100644 --- a/live/9/x86_64/stage/rocky-live-kde-base.ks +++ b/live/9/x86_64/stage/rocky-live-kde-base.ks @@ -17,6 +17,9 @@ cat > /root/.config/gtk-3.0/settings.ini << EOF gtk-theme-name = Adwaita EOF +rm -f /usr/share/wallpapers/Fedora +ln -s rocky-abstract-2 /usr/share/wallpapers/Fedora + # add initscript cat >> /etc/rc.d/init.d/livesys << EOF