From e90589b34b294e8d4821b09f3dcf9cf5d0ce62de Mon Sep 17 00:00:00 2001 From: Louis Abel Date: Wed, 22 Mar 2023 13:34:30 -0700 Subject: [PATCH] add cinnamon, change kde a bit --- Rocky-9-Cinnamon.ks | 503 ++++++++++++++++++ Rocky-9-KDE.ks | 2 +- .../peridot/rocky-live-cinnamon-common.ks | 77 +++ live/9/aarch64/peridot/rocky-live-cinnamon.ks | 64 +++ live/9/aarch64/peridot/rocky-live-kde.ks | 3 +- .../aarch64/peridot/rocky-live-mate-common.ks | 2 + .../aarch64/peridot/rocky-live-xfce-common.ks | 6 +- .../prod/rocky-live-cinnamon-common.ks | 77 +++ live/9/aarch64/prod/rocky-live-cinnamon.ks | 64 +++ live/9/aarch64/prod/rocky-live-kde.ks | 1 - live/9/aarch64/prod/rocky-live-mate-common.ks | 2 + live/9/aarch64/prod/rocky-live-xfce-common.ks | 6 +- .../stage/rocky-live-cinnamon-common.ks | 77 +++ live/9/aarch64/stage/rocky-live-cinnamon.ks | 64 +++ live/9/aarch64/stage/rocky-live-kde.ks | 3 +- .../9/aarch64/stage/rocky-live-mate-common.ks | 2 + .../9/aarch64/stage/rocky-live-xfce-common.ks | 6 +- .../peridot/rocky-live-cinnamon-common.ks | 77 +++ live/9/x86_64/peridot/rocky-live-cinnamon.ks | 64 +++ live/9/x86_64/peridot/rocky-live-kde.ks | 3 +- .../x86_64/peridot/rocky-live-mate-common.ks | 2 + .../x86_64/peridot/rocky-live-xfce-common.ks | 6 +- .../x86_64/prod/rocky-live-cinnamon-common.ks | 77 +++ live/9/x86_64/prod/rocky-live-cinnamon.ks | 64 +++ live/9/x86_64/prod/rocky-live-kde.ks | 1 - live/9/x86_64/prod/rocky-live-mate-common.ks | 2 + live/9/x86_64/prod/rocky-live-xfce-common.ks | 6 +- .../stage/rocky-live-cinnamon-common.ks | 77 +++ live/9/x86_64/stage/rocky-live-cinnamon.ks | 64 +++ live/9/x86_64/stage/rocky-live-kde.ks | 3 +- live/9/x86_64/stage/rocky-live-mate-common.ks | 2 + live/9/x86_64/stage/rocky-live-xfce-common.ks | 6 +- 32 files changed, 1396 insertions(+), 17 deletions(-) create mode 100644 Rocky-9-Cinnamon.ks create mode 100644 live/9/aarch64/peridot/rocky-live-cinnamon-common.ks create mode 100644 live/9/aarch64/peridot/rocky-live-cinnamon.ks create mode 100644 live/9/aarch64/prod/rocky-live-cinnamon-common.ks create mode 100644 live/9/aarch64/prod/rocky-live-cinnamon.ks create mode 100644 live/9/aarch64/stage/rocky-live-cinnamon-common.ks create mode 100644 live/9/aarch64/stage/rocky-live-cinnamon.ks create mode 100644 live/9/x86_64/peridot/rocky-live-cinnamon-common.ks create mode 100644 live/9/x86_64/peridot/rocky-live-cinnamon.ks create mode 100644 live/9/x86_64/prod/rocky-live-cinnamon-common.ks create mode 100644 live/9/x86_64/prod/rocky-live-cinnamon.ks create mode 100644 live/9/x86_64/stage/rocky-live-cinnamon-common.ks create mode 100644 live/9/x86_64/stage/rocky-live-cinnamon.ks diff --git a/Rocky-9-Cinnamon.ks b/Rocky-9-Cinnamon.ks new file mode 100644 index 0000000..4de6c46 --- /dev/null +++ b/Rocky-9-Cinnamon.ks @@ -0,0 +1,503 @@ +# 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 018ff52..f30c8f4 100644 --- a/Rocky-9-KDE.ks +++ b/Rocky-9-KDE.ks @@ -36,7 +36,7 @@ zerombr clearpart --all # Disk partitioning information part / --fstype="ext4" --size=5120 -part / --size=7000 +part / --size=7300 %post # FIXME: it'd be better to get this installed from a package diff --git a/live/9/aarch64/peridot/rocky-live-cinnamon-common.ks b/live/9/aarch64/peridot/rocky-live-cinnamon-common.ks new file mode 100644 index 0000000..82f887a --- /dev/null +++ b/live/9/aarch64/peridot/rocky-live-cinnamon-common.ks @@ -0,0 +1,77 @@ +# cinnamon +%packages +rocky-backgrounds +thunderbird +firefox +f36-backgrounds-gnome +f36-backgrounds-extras-gnome +f37-backgrounds-gnome +f37-backgrounds-extras-gnome + +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 +cinnamon +cinnamon-control-center +cinnamon-screensaver +eom +firewall-config +gnome-calculator +gnome-disk-utility +gnome-screenshot +gnome-system-monitor +gnome-terminal +gstreamer1-plugins-ugly-free +gvfs-gphoto2 +gvfs-mtp +gvfs-smb +hexchat +imsettings-systemd +initial-setup-gui +lightdm +metacity +nemo-fileroller +nemo-image-converter +nemo-preview +nm-connection-editor +pipewire-alsa +pipewire-pulseaudio +powerline +redshift-gtk +sane-backends-drivers-scanners +setroubleshoot +slick-greeter +slick-greeter-cinnamon +tmux +tmux-powerline +transmission +vim-enhanced +vim-powerline +xdg-user-dirs-gtk +xed +xreader +wireplumber + +parole +#audacious +#rhythmbox + +libreoffice-calc +libreoffice-emailmerge +libreoffice-graphicfilter +libreoffice-impress +libreoffice-writer + +-xsane +-xane-gimp +-mpage +-hplip +-isdn4k-utils +%end diff --git a/live/9/aarch64/peridot/rocky-live-cinnamon.ks b/live/9/aarch64/peridot/rocky-live-cinnamon.ks new file mode 100644 index 0000000..b86fe38 --- /dev/null +++ b/live/9/aarch64/peridot/rocky-live-cinnamon.ks @@ -0,0 +1,64 @@ +# rocky-live-cinnamon.ks + +%include rocky-live-base-spin.ks +%include rocky-live-cinnamon-common.ks + +part / --size 8192 + +%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 diff --git a/live/9/aarch64/peridot/rocky-live-kde.ks b/live/9/aarch64/peridot/rocky-live-kde.ks index 457cac8..80661ef 100644 --- a/live/9/aarch64/peridot/rocky-live-kde.ks +++ b/live/9/aarch64/peridot/rocky-live-kde.ks @@ -1,10 +1,9 @@ # rocky-live-kde.ks -# BROKEN %include rocky-live-kde-base.ks # DVD -part / --size=7000 +part / --size=7300 %post %end diff --git a/live/9/aarch64/peridot/rocky-live-mate-common.ks b/live/9/aarch64/peridot/rocky-live-mate-common.ks index ece2ca3..c507394 100644 --- a/live/9/aarch64/peridot/rocky-live-mate-common.ks +++ b/live/9/aarch64/peridot/rocky-live-mate-common.ks @@ -5,6 +5,8 @@ thunderbird firefox f36-backgrounds-mate f36-backgrounds-extras-mate +f37-backgrounds-mate +f37-backgrounds-extras-mate NetworkManager-adsl NetworkManager-bluetooth diff --git a/live/9/aarch64/peridot/rocky-live-xfce-common.ks b/live/9/aarch64/peridot/rocky-live-xfce-common.ks index c742ae7..1403ab9 100644 --- a/live/9/aarch64/peridot/rocky-live-xfce-common.ks +++ b/live/9/aarch64/peridot/rocky-live-xfce-common.ks @@ -1,7 +1,7 @@ # xfce %packages -# these aren't an epel 8 thing for some reason. +# these aren't an epel thing for some reason. @xfce-desktop --nodefaults #@^xfce-desktop-environment #@xfce-apps @@ -34,6 +34,10 @@ gparted # extras f35-backgrounds-xfce f35-backgrounds-extras-xfce +f36-backgrounds-xfce +f36-backgrounds-extras-xfce +f37-backgrounds-xfce +f37-backgrounds-extras-xfce xfce4-about xfce4-taskmanager diff --git a/live/9/aarch64/prod/rocky-live-cinnamon-common.ks b/live/9/aarch64/prod/rocky-live-cinnamon-common.ks new file mode 100644 index 0000000..82f887a --- /dev/null +++ b/live/9/aarch64/prod/rocky-live-cinnamon-common.ks @@ -0,0 +1,77 @@ +# cinnamon +%packages +rocky-backgrounds +thunderbird +firefox +f36-backgrounds-gnome +f36-backgrounds-extras-gnome +f37-backgrounds-gnome +f37-backgrounds-extras-gnome + +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 +cinnamon +cinnamon-control-center +cinnamon-screensaver +eom +firewall-config +gnome-calculator +gnome-disk-utility +gnome-screenshot +gnome-system-monitor +gnome-terminal +gstreamer1-plugins-ugly-free +gvfs-gphoto2 +gvfs-mtp +gvfs-smb +hexchat +imsettings-systemd +initial-setup-gui +lightdm +metacity +nemo-fileroller +nemo-image-converter +nemo-preview +nm-connection-editor +pipewire-alsa +pipewire-pulseaudio +powerline +redshift-gtk +sane-backends-drivers-scanners +setroubleshoot +slick-greeter +slick-greeter-cinnamon +tmux +tmux-powerline +transmission +vim-enhanced +vim-powerline +xdg-user-dirs-gtk +xed +xreader +wireplumber + +parole +#audacious +#rhythmbox + +libreoffice-calc +libreoffice-emailmerge +libreoffice-graphicfilter +libreoffice-impress +libreoffice-writer + +-xsane +-xane-gimp +-mpage +-hplip +-isdn4k-utils +%end diff --git a/live/9/aarch64/prod/rocky-live-cinnamon.ks b/live/9/aarch64/prod/rocky-live-cinnamon.ks new file mode 100644 index 0000000..b86fe38 --- /dev/null +++ b/live/9/aarch64/prod/rocky-live-cinnamon.ks @@ -0,0 +1,64 @@ +# rocky-live-cinnamon.ks + +%include rocky-live-base-spin.ks +%include rocky-live-cinnamon-common.ks + +part / --size 8192 + +%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 diff --git a/live/9/aarch64/prod/rocky-live-kde.ks b/live/9/aarch64/prod/rocky-live-kde.ks index bda9103..80661ef 100644 --- a/live/9/aarch64/prod/rocky-live-kde.ks +++ b/live/9/aarch64/prod/rocky-live-kde.ks @@ -1,5 +1,4 @@ # rocky-live-kde.ks -# BROKEN %include rocky-live-kde-base.ks diff --git a/live/9/aarch64/prod/rocky-live-mate-common.ks b/live/9/aarch64/prod/rocky-live-mate-common.ks index ece2ca3..c507394 100644 --- a/live/9/aarch64/prod/rocky-live-mate-common.ks +++ b/live/9/aarch64/prod/rocky-live-mate-common.ks @@ -5,6 +5,8 @@ thunderbird firefox f36-backgrounds-mate f36-backgrounds-extras-mate +f37-backgrounds-mate +f37-backgrounds-extras-mate NetworkManager-adsl NetworkManager-bluetooth diff --git a/live/9/aarch64/prod/rocky-live-xfce-common.ks b/live/9/aarch64/prod/rocky-live-xfce-common.ks index c742ae7..1403ab9 100644 --- a/live/9/aarch64/prod/rocky-live-xfce-common.ks +++ b/live/9/aarch64/prod/rocky-live-xfce-common.ks @@ -1,7 +1,7 @@ # xfce %packages -# these aren't an epel 8 thing for some reason. +# these aren't an epel thing for some reason. @xfce-desktop --nodefaults #@^xfce-desktop-environment #@xfce-apps @@ -34,6 +34,10 @@ gparted # extras f35-backgrounds-xfce f35-backgrounds-extras-xfce +f36-backgrounds-xfce +f36-backgrounds-extras-xfce +f37-backgrounds-xfce +f37-backgrounds-extras-xfce xfce4-about xfce4-taskmanager diff --git a/live/9/aarch64/stage/rocky-live-cinnamon-common.ks b/live/9/aarch64/stage/rocky-live-cinnamon-common.ks new file mode 100644 index 0000000..82f887a --- /dev/null +++ b/live/9/aarch64/stage/rocky-live-cinnamon-common.ks @@ -0,0 +1,77 @@ +# cinnamon +%packages +rocky-backgrounds +thunderbird +firefox +f36-backgrounds-gnome +f36-backgrounds-extras-gnome +f37-backgrounds-gnome +f37-backgrounds-extras-gnome + +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 +cinnamon +cinnamon-control-center +cinnamon-screensaver +eom +firewall-config +gnome-calculator +gnome-disk-utility +gnome-screenshot +gnome-system-monitor +gnome-terminal +gstreamer1-plugins-ugly-free +gvfs-gphoto2 +gvfs-mtp +gvfs-smb +hexchat +imsettings-systemd +initial-setup-gui +lightdm +metacity +nemo-fileroller +nemo-image-converter +nemo-preview +nm-connection-editor +pipewire-alsa +pipewire-pulseaudio +powerline +redshift-gtk +sane-backends-drivers-scanners +setroubleshoot +slick-greeter +slick-greeter-cinnamon +tmux +tmux-powerline +transmission +vim-enhanced +vim-powerline +xdg-user-dirs-gtk +xed +xreader +wireplumber + +parole +#audacious +#rhythmbox + +libreoffice-calc +libreoffice-emailmerge +libreoffice-graphicfilter +libreoffice-impress +libreoffice-writer + +-xsane +-xane-gimp +-mpage +-hplip +-isdn4k-utils +%end diff --git a/live/9/aarch64/stage/rocky-live-cinnamon.ks b/live/9/aarch64/stage/rocky-live-cinnamon.ks new file mode 100644 index 0000000..b86fe38 --- /dev/null +++ b/live/9/aarch64/stage/rocky-live-cinnamon.ks @@ -0,0 +1,64 @@ +# rocky-live-cinnamon.ks + +%include rocky-live-base-spin.ks +%include rocky-live-cinnamon-common.ks + +part / --size 8192 + +%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 diff --git a/live/9/aarch64/stage/rocky-live-kde.ks b/live/9/aarch64/stage/rocky-live-kde.ks index 457cac8..80661ef 100644 --- a/live/9/aarch64/stage/rocky-live-kde.ks +++ b/live/9/aarch64/stage/rocky-live-kde.ks @@ -1,10 +1,9 @@ # rocky-live-kde.ks -# BROKEN %include rocky-live-kde-base.ks # DVD -part / --size=7000 +part / --size=7300 %post %end diff --git a/live/9/aarch64/stage/rocky-live-mate-common.ks b/live/9/aarch64/stage/rocky-live-mate-common.ks index ece2ca3..c507394 100644 --- a/live/9/aarch64/stage/rocky-live-mate-common.ks +++ b/live/9/aarch64/stage/rocky-live-mate-common.ks @@ -5,6 +5,8 @@ thunderbird firefox f36-backgrounds-mate f36-backgrounds-extras-mate +f37-backgrounds-mate +f37-backgrounds-extras-mate NetworkManager-adsl NetworkManager-bluetooth diff --git a/live/9/aarch64/stage/rocky-live-xfce-common.ks b/live/9/aarch64/stage/rocky-live-xfce-common.ks index c742ae7..1403ab9 100644 --- a/live/9/aarch64/stage/rocky-live-xfce-common.ks +++ b/live/9/aarch64/stage/rocky-live-xfce-common.ks @@ -1,7 +1,7 @@ # xfce %packages -# these aren't an epel 8 thing for some reason. +# these aren't an epel thing for some reason. @xfce-desktop --nodefaults #@^xfce-desktop-environment #@xfce-apps @@ -34,6 +34,10 @@ gparted # extras f35-backgrounds-xfce f35-backgrounds-extras-xfce +f36-backgrounds-xfce +f36-backgrounds-extras-xfce +f37-backgrounds-xfce +f37-backgrounds-extras-xfce xfce4-about xfce4-taskmanager diff --git a/live/9/x86_64/peridot/rocky-live-cinnamon-common.ks b/live/9/x86_64/peridot/rocky-live-cinnamon-common.ks new file mode 100644 index 0000000..82f887a --- /dev/null +++ b/live/9/x86_64/peridot/rocky-live-cinnamon-common.ks @@ -0,0 +1,77 @@ +# cinnamon +%packages +rocky-backgrounds +thunderbird +firefox +f36-backgrounds-gnome +f36-backgrounds-extras-gnome +f37-backgrounds-gnome +f37-backgrounds-extras-gnome + +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 +cinnamon +cinnamon-control-center +cinnamon-screensaver +eom +firewall-config +gnome-calculator +gnome-disk-utility +gnome-screenshot +gnome-system-monitor +gnome-terminal +gstreamer1-plugins-ugly-free +gvfs-gphoto2 +gvfs-mtp +gvfs-smb +hexchat +imsettings-systemd +initial-setup-gui +lightdm +metacity +nemo-fileroller +nemo-image-converter +nemo-preview +nm-connection-editor +pipewire-alsa +pipewire-pulseaudio +powerline +redshift-gtk +sane-backends-drivers-scanners +setroubleshoot +slick-greeter +slick-greeter-cinnamon +tmux +tmux-powerline +transmission +vim-enhanced +vim-powerline +xdg-user-dirs-gtk +xed +xreader +wireplumber + +parole +#audacious +#rhythmbox + +libreoffice-calc +libreoffice-emailmerge +libreoffice-graphicfilter +libreoffice-impress +libreoffice-writer + +-xsane +-xane-gimp +-mpage +-hplip +-isdn4k-utils +%end diff --git a/live/9/x86_64/peridot/rocky-live-cinnamon.ks b/live/9/x86_64/peridot/rocky-live-cinnamon.ks new file mode 100644 index 0000000..b86fe38 --- /dev/null +++ b/live/9/x86_64/peridot/rocky-live-cinnamon.ks @@ -0,0 +1,64 @@ +# rocky-live-cinnamon.ks + +%include rocky-live-base-spin.ks +%include rocky-live-cinnamon-common.ks + +part / --size 8192 + +%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 diff --git a/live/9/x86_64/peridot/rocky-live-kde.ks b/live/9/x86_64/peridot/rocky-live-kde.ks index 457cac8..80661ef 100644 --- a/live/9/x86_64/peridot/rocky-live-kde.ks +++ b/live/9/x86_64/peridot/rocky-live-kde.ks @@ -1,10 +1,9 @@ # rocky-live-kde.ks -# BROKEN %include rocky-live-kde-base.ks # DVD -part / --size=7000 +part / --size=7300 %post %end diff --git a/live/9/x86_64/peridot/rocky-live-mate-common.ks b/live/9/x86_64/peridot/rocky-live-mate-common.ks index 1a433c5..9e4c3c6 100644 --- a/live/9/x86_64/peridot/rocky-live-mate-common.ks +++ b/live/9/x86_64/peridot/rocky-live-mate-common.ks @@ -5,6 +5,8 @@ thunderbird firefox f36-backgrounds-mate f36-backgrounds-extras-mate +f37-backgrounds-mate +f37-backgrounds-extras-mate NetworkManager-adsl NetworkManager-bluetooth diff --git a/live/9/x86_64/peridot/rocky-live-xfce-common.ks b/live/9/x86_64/peridot/rocky-live-xfce-common.ks index c742ae7..1403ab9 100644 --- a/live/9/x86_64/peridot/rocky-live-xfce-common.ks +++ b/live/9/x86_64/peridot/rocky-live-xfce-common.ks @@ -1,7 +1,7 @@ # xfce %packages -# these aren't an epel 8 thing for some reason. +# these aren't an epel thing for some reason. @xfce-desktop --nodefaults #@^xfce-desktop-environment #@xfce-apps @@ -34,6 +34,10 @@ gparted # extras f35-backgrounds-xfce f35-backgrounds-extras-xfce +f36-backgrounds-xfce +f36-backgrounds-extras-xfce +f37-backgrounds-xfce +f37-backgrounds-extras-xfce xfce4-about xfce4-taskmanager diff --git a/live/9/x86_64/prod/rocky-live-cinnamon-common.ks b/live/9/x86_64/prod/rocky-live-cinnamon-common.ks new file mode 100644 index 0000000..82f887a --- /dev/null +++ b/live/9/x86_64/prod/rocky-live-cinnamon-common.ks @@ -0,0 +1,77 @@ +# cinnamon +%packages +rocky-backgrounds +thunderbird +firefox +f36-backgrounds-gnome +f36-backgrounds-extras-gnome +f37-backgrounds-gnome +f37-backgrounds-extras-gnome + +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 +cinnamon +cinnamon-control-center +cinnamon-screensaver +eom +firewall-config +gnome-calculator +gnome-disk-utility +gnome-screenshot +gnome-system-monitor +gnome-terminal +gstreamer1-plugins-ugly-free +gvfs-gphoto2 +gvfs-mtp +gvfs-smb +hexchat +imsettings-systemd +initial-setup-gui +lightdm +metacity +nemo-fileroller +nemo-image-converter +nemo-preview +nm-connection-editor +pipewire-alsa +pipewire-pulseaudio +powerline +redshift-gtk +sane-backends-drivers-scanners +setroubleshoot +slick-greeter +slick-greeter-cinnamon +tmux +tmux-powerline +transmission +vim-enhanced +vim-powerline +xdg-user-dirs-gtk +xed +xreader +wireplumber + +parole +#audacious +#rhythmbox + +libreoffice-calc +libreoffice-emailmerge +libreoffice-graphicfilter +libreoffice-impress +libreoffice-writer + +-xsane +-xane-gimp +-mpage +-hplip +-isdn4k-utils +%end diff --git a/live/9/x86_64/prod/rocky-live-cinnamon.ks b/live/9/x86_64/prod/rocky-live-cinnamon.ks new file mode 100644 index 0000000..b86fe38 --- /dev/null +++ b/live/9/x86_64/prod/rocky-live-cinnamon.ks @@ -0,0 +1,64 @@ +# rocky-live-cinnamon.ks + +%include rocky-live-base-spin.ks +%include rocky-live-cinnamon-common.ks + +part / --size 8192 + +%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 diff --git a/live/9/x86_64/prod/rocky-live-kde.ks b/live/9/x86_64/prod/rocky-live-kde.ks index bda9103..80661ef 100644 --- a/live/9/x86_64/prod/rocky-live-kde.ks +++ b/live/9/x86_64/prod/rocky-live-kde.ks @@ -1,5 +1,4 @@ # rocky-live-kde.ks -# BROKEN %include rocky-live-kde-base.ks diff --git a/live/9/x86_64/prod/rocky-live-mate-common.ks b/live/9/x86_64/prod/rocky-live-mate-common.ks index 1a433c5..9e4c3c6 100644 --- a/live/9/x86_64/prod/rocky-live-mate-common.ks +++ b/live/9/x86_64/prod/rocky-live-mate-common.ks @@ -5,6 +5,8 @@ thunderbird firefox f36-backgrounds-mate f36-backgrounds-extras-mate +f37-backgrounds-mate +f37-backgrounds-extras-mate NetworkManager-adsl NetworkManager-bluetooth diff --git a/live/9/x86_64/prod/rocky-live-xfce-common.ks b/live/9/x86_64/prod/rocky-live-xfce-common.ks index c742ae7..1403ab9 100644 --- a/live/9/x86_64/prod/rocky-live-xfce-common.ks +++ b/live/9/x86_64/prod/rocky-live-xfce-common.ks @@ -1,7 +1,7 @@ # xfce %packages -# these aren't an epel 8 thing for some reason. +# these aren't an epel thing for some reason. @xfce-desktop --nodefaults #@^xfce-desktop-environment #@xfce-apps @@ -34,6 +34,10 @@ gparted # extras f35-backgrounds-xfce f35-backgrounds-extras-xfce +f36-backgrounds-xfce +f36-backgrounds-extras-xfce +f37-backgrounds-xfce +f37-backgrounds-extras-xfce xfce4-about xfce4-taskmanager diff --git a/live/9/x86_64/stage/rocky-live-cinnamon-common.ks b/live/9/x86_64/stage/rocky-live-cinnamon-common.ks new file mode 100644 index 0000000..82f887a --- /dev/null +++ b/live/9/x86_64/stage/rocky-live-cinnamon-common.ks @@ -0,0 +1,77 @@ +# cinnamon +%packages +rocky-backgrounds +thunderbird +firefox +f36-backgrounds-gnome +f36-backgrounds-extras-gnome +f37-backgrounds-gnome +f37-backgrounds-extras-gnome + +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 +cinnamon +cinnamon-control-center +cinnamon-screensaver +eom +firewall-config +gnome-calculator +gnome-disk-utility +gnome-screenshot +gnome-system-monitor +gnome-terminal +gstreamer1-plugins-ugly-free +gvfs-gphoto2 +gvfs-mtp +gvfs-smb +hexchat +imsettings-systemd +initial-setup-gui +lightdm +metacity +nemo-fileroller +nemo-image-converter +nemo-preview +nm-connection-editor +pipewire-alsa +pipewire-pulseaudio +powerline +redshift-gtk +sane-backends-drivers-scanners +setroubleshoot +slick-greeter +slick-greeter-cinnamon +tmux +tmux-powerline +transmission +vim-enhanced +vim-powerline +xdg-user-dirs-gtk +xed +xreader +wireplumber + +parole +#audacious +#rhythmbox + +libreoffice-calc +libreoffice-emailmerge +libreoffice-graphicfilter +libreoffice-impress +libreoffice-writer + +-xsane +-xane-gimp +-mpage +-hplip +-isdn4k-utils +%end diff --git a/live/9/x86_64/stage/rocky-live-cinnamon.ks b/live/9/x86_64/stage/rocky-live-cinnamon.ks new file mode 100644 index 0000000..b86fe38 --- /dev/null +++ b/live/9/x86_64/stage/rocky-live-cinnamon.ks @@ -0,0 +1,64 @@ +# rocky-live-cinnamon.ks + +%include rocky-live-base-spin.ks +%include rocky-live-cinnamon-common.ks + +part / --size 8192 + +%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 diff --git a/live/9/x86_64/stage/rocky-live-kde.ks b/live/9/x86_64/stage/rocky-live-kde.ks index 457cac8..80661ef 100644 --- a/live/9/x86_64/stage/rocky-live-kde.ks +++ b/live/9/x86_64/stage/rocky-live-kde.ks @@ -1,10 +1,9 @@ # rocky-live-kde.ks -# BROKEN %include rocky-live-kde-base.ks # DVD -part / --size=7000 +part / --size=7300 %post %end diff --git a/live/9/x86_64/stage/rocky-live-mate-common.ks b/live/9/x86_64/stage/rocky-live-mate-common.ks index 1a433c5..9e4c3c6 100644 --- a/live/9/x86_64/stage/rocky-live-mate-common.ks +++ b/live/9/x86_64/stage/rocky-live-mate-common.ks @@ -5,6 +5,8 @@ thunderbird firefox f36-backgrounds-mate f36-backgrounds-extras-mate +f37-backgrounds-mate +f37-backgrounds-extras-mate NetworkManager-adsl NetworkManager-bluetooth diff --git a/live/9/x86_64/stage/rocky-live-xfce-common.ks b/live/9/x86_64/stage/rocky-live-xfce-common.ks index c742ae7..1403ab9 100644 --- a/live/9/x86_64/stage/rocky-live-xfce-common.ks +++ b/live/9/x86_64/stage/rocky-live-xfce-common.ks @@ -1,7 +1,7 @@ # xfce %packages -# these aren't an epel 8 thing for some reason. +# these aren't an epel thing for some reason. @xfce-desktop --nodefaults #@^xfce-desktop-environment #@xfce-apps @@ -34,6 +34,10 @@ gparted # extras f35-backgrounds-xfce f35-backgrounds-extras-xfce +f36-backgrounds-xfce +f36-backgrounds-extras-xfce +f37-backgrounds-xfce +f37-backgrounds-extras-xfce xfce4-about xfce4-taskmanager