From 0a4656168caa2957ad900330d29387b40bf6815c Mon Sep 17 00:00:00 2001 From: Louis Abel Date: Wed, 14 Feb 2024 20:40:30 -0700 Subject: [PATCH] Use livesys scripts package --- Rocky-9-Cinnamon.ks | 54 +--- Rocky-9-KDE.ks | 169 +++--------- Rocky-9-MATE.ks | 81 ++---- Rocky-9-Workstation-Lite.ks | 143 ++-------- Rocky-9-Workstation.ks | 148 +++------- Rocky-9-XFCE.ks | 111 ++------ .../9/aarch64/peridot/rocky-live-base-spin.ks | 253 +----------------- live/9/aarch64/peridot/rocky-live-base.ks | 253 +----------------- live/9/aarch64/peridot/rocky-live-cinnamon.ks | 42 +-- live/9/aarch64/peridot/rocky-live-kde-base.ks | 101 +------ live/9/aarch64/peridot/rocky-live-mate.ks | 45 +--- .../peridot/rocky-live-workstation-lite.ks | 85 +----- .../aarch64/peridot/rocky-live-workstation.ks | 86 +----- live/9/aarch64/peridot/rocky-live-xfce.ks | 74 +---- live/9/aarch64/prod/rocky-live-base-spin.ks | 253 +----------------- live/9/aarch64/prod/rocky-live-base.ks | 253 +----------------- live/9/aarch64/prod/rocky-live-cinnamon.ks | 42 +-- live/9/aarch64/prod/rocky-live-kde-base.ks | 101 +------ live/9/aarch64/prod/rocky-live-mate.ks | 45 +--- .../prod/rocky-live-workstation-lite.ks | 85 +----- live/9/aarch64/prod/rocky-live-workstation.ks | 86 +----- live/9/aarch64/prod/rocky-live-xfce.ks | 74 +---- live/9/aarch64/stage/rocky-live-base-spin.ks | 253 +----------------- live/9/aarch64/stage/rocky-live-base.ks | 253 +----------------- live/9/aarch64/stage/rocky-live-cinnamon.ks | 42 +-- live/9/aarch64/stage/rocky-live-kde-base.ks | 101 +------ live/9/aarch64/stage/rocky-live-mate.ks | 45 +--- .../stage/rocky-live-workstation-lite.ks | 85 +----- .../9/aarch64/stage/rocky-live-workstation.ks | 86 +----- live/9/aarch64/stage/rocky-live-xfce.ks | 74 +---- .../9/ppc64le/peridot/rocky-live-base-spin.ks | 253 +----------------- live/9/ppc64le/peridot/rocky-live-base.ks | 253 +----------------- live/9/ppc64le/peridot/rocky-live-cinnamon.ks | 42 +-- live/9/ppc64le/peridot/rocky-live-kde-base.ks | 101 +------ live/9/ppc64le/peridot/rocky-live-mate.ks | 45 +--- .../peridot/rocky-live-workstation-lite.ks | 85 +----- .../ppc64le/peridot/rocky-live-workstation.ks | 86 +----- live/9/ppc64le/peridot/rocky-live-xfce.ks | 74 +---- live/9/ppc64le/prod/rocky-live-base-spin.ks | 253 +----------------- live/9/ppc64le/prod/rocky-live-base.ks | 253 +----------------- live/9/ppc64le/prod/rocky-live-cinnamon.ks | 42 +-- live/9/ppc64le/prod/rocky-live-kde-base.ks | 101 +------ live/9/ppc64le/prod/rocky-live-mate.ks | 45 +--- .../prod/rocky-live-workstation-lite.ks | 85 +----- live/9/ppc64le/prod/rocky-live-workstation.ks | 86 +----- live/9/ppc64le/prod/rocky-live-xfce.ks | 74 +---- live/9/ppc64le/stage/rocky-live-base-spin.ks | 253 +----------------- live/9/ppc64le/stage/rocky-live-base.ks | 253 +----------------- live/9/ppc64le/stage/rocky-live-cinnamon.ks | 42 +-- live/9/ppc64le/stage/rocky-live-kde-base.ks | 101 +------ live/9/ppc64le/stage/rocky-live-mate.ks | 45 +--- .../stage/rocky-live-workstation-lite.ks | 85 +----- .../9/ppc64le/stage/rocky-live-workstation.ks | 86 +----- live/9/ppc64le/stage/rocky-live-xfce.ks | 74 +---- .../peridot/mainline/rocky-live-base.ks | 1 + live/9/x86_64/peridot/rocky-live-base-spin.ks | 253 +----------------- live/9/x86_64/peridot/rocky-live-base.ks | 253 +----------------- live/9/x86_64/peridot/rocky-live-cinnamon.ks | 42 +-- live/9/x86_64/peridot/rocky-live-kde-base.ks | 101 +------ live/9/x86_64/peridot/rocky-live-mate.ks | 45 +--- .../peridot/rocky-live-workstation-lite.ks | 85 +----- .../x86_64/peridot/rocky-live-workstation.ks | 86 +----- live/9/x86_64/peridot/rocky-live-xfce.ks | 74 +---- .../9/x86_64/prod/mainline/rocky-live-base.ks | 1 + live/9/x86_64/prod/rocky-live-base-spin.ks | 253 +----------------- live/9/x86_64/prod/rocky-live-base.ks | 253 +----------------- live/9/x86_64/prod/rocky-live-cinnamon.ks | 42 +-- live/9/x86_64/prod/rocky-live-kde-base.ks | 101 +------ live/9/x86_64/prod/rocky-live-mate.ks | 45 +--- .../prod/rocky-live-workstation-lite.ks | 85 +----- live/9/x86_64/prod/rocky-live-workstation.ks | 86 +----- live/9/x86_64/prod/rocky-live-xfce.ks | 74 +---- .../x86_64/stage/mainline/rocky-live-base.ks | 1 + live/9/x86_64/stage/rocky-live-base-spin.ks | 253 +----------------- live/9/x86_64/stage/rocky-live-base.ks | 253 +----------------- live/9/x86_64/stage/rocky-live-cinnamon.ks | 42 +-- live/9/x86_64/stage/rocky-live-kde-base.ks | 101 +------ live/9/x86_64/stage/rocky-live-mate.ks | 45 +--- .../stage/rocky-live-workstation-lite.ks | 85 +----- live/9/x86_64/stage/rocky-live-workstation.ks | 86 +----- live/9/x86_64/stage/rocky-live-xfce.ks | 74 +---- 81 files changed, 281 insertions(+), 8879 deletions(-) diff --git a/Rocky-9-Cinnamon.ks b/Rocky-9-Cinnamon.ks index bd27316..eed6666 100644 --- a/Rocky-9-Cinnamon.ks +++ b/Rocky-9-Cinnamon.ks @@ -1,4 +1,4 @@ -# Generated by pykickstart v3.41 +# Generated by pykickstart v3.48 #version=DEVEL # Firewall configuration firewall --enabled --service=mdns @@ -10,10 +10,10 @@ lang en_US.UTF-8 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="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 # Root password rootpw --iscrypted --lock locked @@ -24,7 +24,7 @@ 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/" +url --url="http://dl.rockylinux.org/stg/rocky/9/BaseOS/$basearch/os/" # X Window System configuration information xconfig --startxonboot # System bootloader configuration @@ -342,47 +342,7 @@ PREFERRED=/usr/bin/cinnamon-session DISPLAYMANAGER=/usr/sbin/lightdm EOF -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 -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 +sed -i 's/^livesys_session=.*/livesys_session="cinnamon"/' /etc/sysconfig/livesys # this doesn't come up automatically. not sure why. systemctl enable --force lightdm.service diff --git a/Rocky-9-KDE.ks b/Rocky-9-KDE.ks index 33aef64..297f463 100644 --- a/Rocky-9-KDE.ks +++ b/Rocky-9-KDE.ks @@ -1,33 +1,32 @@ -# Generated by pykickstart v3.36 +# Generated by pykickstart v3.48 #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/" +# 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/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 -#repo --name="epel-modular" --baseurl=https://dl.fedoraproject.org/pub/epel/8/Modular/$basearch/ --cost=200 -# System timezone -timezone US/Eastern +# 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/stg/rocky/9/BaseOS/$basearch/os/" +# X Window System configuration information +xconfig --startxonboot # System bootloader configuration bootloader --location=none # Clear the Master Boot Record @@ -337,6 +336,8 @@ fi %post +sed -i 's/^livesys_session=.*/livesys_session="kde"/' /etc/sysconfig/livesys + # set default GTK+ theme for root (see #683855, #689070, #808062) cat > /root/.gtkrc-2.0 << EOF include "/usr/share/themes/Adwaita/gtk-2.0/gtkrc" @@ -352,109 +353,9 @@ 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 - -# are we *not* able to use wayland sessions? -if strstr "\`cat /proc/cmdline\`" nomodeset ; then -PLASMA_SESSION_FILE="plasmax11.desktop" -else -PLASMA_SESSION_FILE="plasma.desktop" -fi - -# set up autologin for user liveuser -if [ -f /etc/sddm.conf ]; then -sed -i 's/^#User=.*/User=liveuser/' /etc/sddm.conf -sed -i "s/^#Session=.*/Session=\${PLASMA_SESSION_FILE}/" /etc/sddm.conf -else -cat > /etc/sddm.conf << SDDM_EOF -[Autologin] -User=liveuser -Session=\${PLASMA_SESSION_FILE} -SDDM_EOF -fi - -# add liveinst.desktop to favorites menu -mkdir -p /home/liveuser/.config/ -cat > /home/liveuser/.config/kickoffrc << MENU_EOF -[Favorites] -FavoriteURLs=/usr/share/applications/firefox.desktop,/usr/share/applications/org.kde.dolphin.desktop,/usr/share/applications/systemsettings.desktop,/usr/share/applications/org.kde.konsole.desktop,/usr/share/applications/liveinst.desktop -MENU_EOF - -# show liveinst.desktop on desktop and in menu -sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop -# set executable bit disable KDE security warning -chmod +x /usr/share/applications/liveinst.desktop -mkdir /home/liveuser/Desktop -cp -a /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 - -# Set akonadi backend -mkdir -p /home/liveuser/.config/akonadi -cat > /home/liveuser/.config/akonadi/akonadiserverrc << AKONADI_EOF -[%General] -Driver=QSQLITE3 -AKONADI_EOF - -# "Disable plasma-discover-notifier" -mkdir -p /home/liveuser/.config/autostart -cp -a /etc/xdg/autostart/org.kde.discover.notifier.desktop /home/liveuser/.config/autostart/ -echo 'Hidden=true' >> /home/liveuser/.config/autostart/org.kde.discover.notifier.desktop - -# Disable baloo -cat > /home/liveuser/.config/baloofilerc << BALOO_EOF -[Basic Settings] -Indexing-Enabled=false -BALOO_EOF - -# Disable kres-migrator -cat > /home/liveuser/.kde/share/config/kres-migratorrc << KRES_EOF -[Migration] -Enabled=false -KRES_EOF - -# Disable kwallet migrator -cat > /home/liveuser/.config/kwalletrc << KWALLET_EOL -[Migration] -alreadyMigrated=true -KWALLET_EOL -# Disable automount of 'known' devices -# https://bugzilla.redhat.com/show_bug.cgi?id=2073708 -cat > /home/liveuser/.config/kded_device_automounterrc << AUTOMOUNTER_EOF -[General] -AutomountEnabled=false -AutomountOnLogin=false -AutomountOnPlugin=false -AUTOMOUNTER_EOF - -# disable kdeconnect -cat > /home/liveuser/.config/autostart/org.kde.kdeconnect.daemon.desktop << KDECONNECT_EOF -[Desktop Entry] -Hidden=true -KDECONNECT_EOF -mkdir -p /home/liveuser/.local/share/dbus-1/services/ -cat > /home/liveuser/.local/share/dbus-1/services/org.kde.kdeconnect.service << DBUS_EOF -[D-BUS Service] -Name=org.kde.kdeconnect -Exec=/usr/bin/false -DBUS_EOF - -# make sure to set the right permissions and selinux contexts -chown -R liveuser:liveuser /home/liveuser/ -restorecon -R /home/liveuser/ -restorecon -R / - -EOF - systemctl enable --force sddm.service dnf config-manager --set-enabled crb -# set default sddm theme cat > /etc/sddm.conf.d/theme.conf <> /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 +sed -i 's/^livesys_session=.*/livesys_session="mate"/' /etc/sysconfig/livesys # this doesn't come up automatically. not sure why. systemctl enable --force lightdm.service @@ -433,6 +390,8 @@ eom epel-release f36-backgrounds-extras-mate f36-backgrounds-mate +f37-backgrounds-extras-mate +f37-backgrounds-mate filezilla firefox firewall-applet diff --git a/Rocky-9-Workstation-Lite.ks b/Rocky-9-Workstation-Lite.ks index 2dda2f1..f57e611 100644 --- a/Rocky-9-Workstation-Lite.ks +++ b/Rocky-9-Workstation-Lite.ks @@ -1,31 +1,31 @@ -# Generated by pykickstart v3.36 +# Generated by pykickstart v3.48 #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/" +# 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/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 -# System timezone -timezone US/Eastern +# 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/stg/rocky/9/BaseOS/$basearch/os/" +# X Window System configuration information +xconfig --startxonboot # System bootloader configuration bootloader --location=none # Clear the Master Boot Record @@ -335,90 +335,7 @@ fi %post -cat >> /etc/rc.d/init.d/livesys << EOF - - -# disable gnome-software automatically downloading updates -cat >> /usr/share/glib-2.0/schemas/org.gnome.software.gschema.override << FOE -[org.gnome.software] -download-updates=false -FOE - -# don't autostart gnome-software session service -rm -f /etc/xdg/autostart/gnome-software-service.desktop - -# disable the gnome-software shell search provider -cat >> /usr/share/gnome-shell/search-providers/org.gnome.Software-search-provider.ini << FOE -DefaultDisabled=true -FOE - -# don't run gnome-initial-setup -mkdir ~liveuser/.config -touch ~liveuser/.config/gnome-initial-setup-done - -# suppress anaconda spokes redundant with gnome-initial-setup -cat >> /etc/sysconfig/anaconda << FOE -[NetworkSpoke] -visited=1 - -[PasswordSpoke] -visited=1 - -[UserSpoke] -visited=1 -FOE - -# make the installer show up -if [ -f /usr/share/applications/liveinst.desktop ]; then - # Show harddisk install in shell dash - sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop "" - # need to move it to anaconda.desktop to make shell happy - mv /usr/share/applications/liveinst.desktop /usr/share/applications/anaconda.desktop - - cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE -[org.gnome.shell] -favorite-apps=['firefox.desktop', 'evolution.desktop', 'org.gnome.Nautilus.desktop', 'anaconda.desktop'] -FOE - - # Make the welcome screen show up - if [ -f /usr/share/anaconda/gnome/fedora-welcome.desktop ]; then - mkdir -p ~liveuser/.config/autostart - cp /usr/share/anaconda/gnome/fedora-welcome.desktop /usr/share/applications/ - cp /usr/share/anaconda/gnome/fedora-welcome.desktop ~liveuser/.config/autostart/ - fi - - # Disable GNOME welcome tour so it doesn't overlap with Fedora welcome screen - cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE -welcome-dialog-last-shown-version='4294967295' -FOE - - # Copy Anaconda branding in place - if [ -d /usr/share/lorax/product/usr/share/anaconda ]; then - cp -a /usr/share/lorax/product/* / - fi -fi - -# rebuild schema cache with any overrides we installed -glib-compile-schemas /usr/share/glib-2.0/schemas - -# set up auto-login -cat > /etc/gdm/custom.conf << FOE -[daemon] -AutomaticLoginEnable=True -AutomaticLogin=liveuser -FOE - -# Turn off PackageKit-command-not-found while uninstalled -if [ -f /etc/PackageKit/CommandNotFound.conf ]; then - sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf -fi - -# make sure to set the right permissions and selinux contexts -chown -R liveuser:liveuser /home/liveuser/ -restorecon -R /home/liveuser/ -restorecon -R / - -EOF +sed -i 's/^livesys_session=.*/livesys_session="gnome"/' /etc/sysconfig/livesys %end @@ -439,20 +356,10 @@ anaconda-install-env-deps anaconda-live chkconfig dracut-live -glibc-all-langpacks -initscripts -kernel -kernel-modules -kernel-modules-extra -libreoffice-calc -libreoffice-writer -memtest86+ -syslinux -shim-*64 -grub2-efi efi-filesystem -efivar-libs efibootmgr +efivar-libs +glibc-all-langpacks grub2-common grub2-efi-*64 grub2-efi-*64-cdboot @@ -462,12 +369,20 @@ grub2-tools-efi grub2-tools-extra grub2-tools-minimal grubby +initscripts +kernel +kernel-modules +kernel-modules-extra +libreoffice-calc +libreoffice-writer +memtest86+ shim-*64 --shim-unsigned-*64 +syslinux -@dial-up -@input-methods -@standard -gfs2-utils -reiserfs-utils +-shim-unsigned-*64 %end diff --git a/Rocky-9-Workstation.ks b/Rocky-9-Workstation.ks index 62125a1..54b769c 100644 --- a/Rocky-9-Workstation.ks +++ b/Rocky-9-Workstation.ks @@ -1,31 +1,31 @@ -# Generated by pykickstart v3.36 +# Generated by pykickstart v3.48 #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/" +# 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/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 -# System timezone -timezone US/Eastern +# 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/stg/rocky/9/BaseOS/$basearch/os/" +# X Window System configuration information +xconfig --startxonboot # System bootloader configuration bootloader --location=none # Clear the Master Boot Record @@ -335,91 +335,7 @@ fi %post -cat >> /etc/rc.d/init.d/livesys << EOF - - -# disable gnome-software automatically downloading updates -cat >> /usr/share/glib-2.0/schemas/org.gnome.software.gschema.override << FOE -[org.gnome.software] -allow-updates=false -download-updates=false -FOE - -# don't autostart gnome-software session service -rm -f /etc/xdg/autostart/gnome-software-service.desktop - -# disable the gnome-software shell search provider -cat >> /usr/share/gnome-shell/search-providers/org.gnome.Software-search-provider.ini << FOE -DefaultDisabled=true -FOE - -# don't run gnome-initial-setup -mkdir ~liveuser/.config -touch ~liveuser/.config/gnome-initial-setup-done - -# suppress anaconda spokes redundant with gnome-initial-setup -cat >> /etc/sysconfig/anaconda << FOE -[NetworkSpoke] -visited=1 - -[PasswordSpoke] -visited=1 - -[UserSpoke] -visited=1 -FOE - -# make the installer show up -if [ -f /usr/share/applications/liveinst.desktop ]; then - # Show harddisk install in shell dash - sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop "" - # need to move it to anaconda.desktop to make shell happy - mv /usr/share/applications/liveinst.desktop /usr/share/applications/anaconda.desktop - - cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE -[org.gnome.shell] -favorite-apps=['firefox.desktop', 'evolution.desktop', 'org.gnome.Nautilus.desktop', 'anaconda.desktop'] -FOE - - # Make the welcome screen show up - if [ -f /usr/share/anaconda/gnome/fedora-welcome.desktop ]; then - mkdir -p ~liveuser/.config/autostart - cp /usr/share/anaconda/gnome/fedora-welcome.desktop /usr/share/applications/ - cp /usr/share/anaconda/gnome/fedora-welcome.desktop ~liveuser/.config/autostart/ - fi - - # Disable GNOME welcome tour so it doesn't overlap with Fedora welcome screen - cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE -welcome-dialog-last-shown-version='4294967295' -FOE - - # Copy Anaconda branding in place - if [ -d /usr/share/lorax/product/usr/share/anaconda ]; then - cp -a /usr/share/lorax/product/* / - fi -fi - -# rebuild schema cache with any overrides we installed -glib-compile-schemas /usr/share/glib-2.0/schemas - -# set up auto-login -cat > /etc/gdm/custom.conf << FOE -[daemon] -AutomaticLoginEnable=True -AutomaticLogin=liveuser -FOE - -# Turn off PackageKit-command-not-found while uninstalled -if [ -f /etc/PackageKit/CommandNotFound.conf ]; then - sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf -fi - -# make sure to set the right permissions and selinux contexts -chown -R liveuser:liveuser /home/liveuser/ -restorecon -R /home/liveuser/ -restorecon -R / - -EOF +sed -i 's/^livesys_session=.*/livesys_session="gnome"/' /etc/sysconfig/livesys %end @@ -441,7 +357,19 @@ anaconda-install-env-deps anaconda-live chkconfig dracut-live +efi-filesystem +efibootmgr +efivar-libs glibc-all-langpacks +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 @@ -452,25 +380,13 @@ libreoffice-graphicfilter libreoffice-impress libreoffice-writer memtest86+ -syslinux -efi-filesystem -efivar-libs -efibootmgr -grub2-common -grub2-efi-*64 -grub2-efi-*64-cdboot -grub2-pc-modules -grub2-tools -grub2-tools-efi -grub2-tools-extra -grub2-tools-minimal -grubby shim-*64 --shim-unsigned-*64 +syslinux -@dial-up -@input-methods -@standard -gfs2-utils -reiserfs-utils +-shim-unsigned-*64 %end diff --git a/Rocky-9-XFCE.ks b/Rocky-9-XFCE.ks index 43ddf72..7525183 100644 --- a/Rocky-9-XFCE.ks +++ b/Rocky-9-XFCE.ks @@ -1,32 +1,32 @@ -# Generated by pykickstart v3.36 +# Generated by pykickstart v3.48 #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/" +# 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/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 +# 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/stg/rocky/9/BaseOS/$basearch/os/" +# X Window System configuration information +xconfig --startxonboot # System bootloader configuration bootloader --location=none # Clear the Master Boot Record @@ -344,49 +344,6 @@ PREFERRED=/usr/bin/startxfce4 DISPLAYMANAGER=/usr/sbin/lightdm EOF -cat >> /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 - # set default background cat > /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml < @@ -395,7 +352,8 @@ cat > /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml < - + + @@ -405,36 +363,7 @@ cat > /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml < XFCEEOF -# 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 - -cat > ~liveuser/.profile << PROFILE_EOF -export XDG_DATA_DIRS="\\\${XDG_DATA_DIRS}:\\\${HOME}/Desktop" -PROFILE_EOF - -# this goes at the end after all other changes. -chown -R liveuser:liveuser /home/liveuser -restorecon -R /home/liveuser -restorecon -R / - -EOF +sed -i 's/^livesys_session=.*/livesys_session="xfce"/' /etc/sysconfig/livesys # this doesn't come up automatically. not sure why. systemctl enable --force lightdm.service diff --git a/live/9/aarch64/peridot/rocky-live-base-spin.ks b/live/9/aarch64/peridot/rocky-live-base-spin.ks index 445254e..af66a8b 100644 --- a/live/9/aarch64/peridot/rocky-live-base-spin.ks +++ b/live/9/aarch64/peridot/rocky-live-base-spin.ks @@ -39,6 +39,7 @@ kernel-modules-extra anaconda anaconda-install-env-deps anaconda-live +livesys-scripts @anaconda-tools efi-filesystem efivar-libs @@ -74,231 +75,8 @@ epel-release %end %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 <\ - %if exists(f):\ - install ${f} ${LIVEDIR}/${f|basename}\ - %endif\ - ' /usr/share/lorax/templates.d/99-generic/live/x86.tmpl -fi - -%end diff --git a/live/9/aarch64/peridot/rocky-live-base.ks b/live/9/aarch64/peridot/rocky-live-base.ks index e50e9ac..953d4de 100644 --- a/live/9/aarch64/peridot/rocky-live-base.ks +++ b/live/9/aarch64/peridot/rocky-live-base.ks @@ -38,6 +38,7 @@ kernel-modules-extra anaconda anaconda-install-env-deps anaconda-live +livesys-scripts @anaconda-tools efi-filesystem efivar-libs @@ -70,231 +71,8 @@ chkconfig %end %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 <\ - %if exists(f):\ - install ${f} ${LIVEDIR}/${f|basename}\ - %endif\ - ' /usr/share/lorax/templates.d/99-generic/live/x86.tmpl -fi - -%end diff --git a/live/9/aarch64/peridot/rocky-live-cinnamon.ks b/live/9/aarch64/peridot/rocky-live-cinnamon.ks index b86fe38..9a5c562 100644 --- a/live/9/aarch64/peridot/rocky-live-cinnamon.ks +++ b/live/9/aarch64/peridot/rocky-live-cinnamon.ks @@ -13,47 +13,7 @@ PREFERRED=/usr/bin/cinnamon-session DISPLAYMANAGER=/usr/sbin/lightdm EOF -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 -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 +sed -i 's/^livesys_session=.*/livesys_session="cinnamon"/' /etc/sysconfig/livesys # this doesn't come up automatically. not sure why. systemctl enable --force lightdm.service diff --git a/live/9/aarch64/peridot/rocky-live-kde-base.ks b/live/9/aarch64/peridot/rocky-live-kde-base.ks index 4da7880..4550987 100644 --- a/live/9/aarch64/peridot/rocky-live-kde-base.ks +++ b/live/9/aarch64/peridot/rocky-live-kde-base.ks @@ -5,6 +5,8 @@ %post +sed -i 's/^livesys_session=.*/livesys_session="kde"/' /etc/sysconfig/livesys + # set default GTK+ theme for root (see #683855, #689070, #808062) cat > /root/.gtkrc-2.0 << EOF include "/usr/share/themes/Adwaita/gtk-2.0/gtkrc" @@ -20,105 +22,6 @@ 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 - -# are we *not* able to use wayland sessions? -if strstr "\`cat /proc/cmdline\`" nomodeset ; then -PLASMA_SESSION_FILE="plasmax11.desktop" -else -PLASMA_SESSION_FILE="plasma.desktop" -fi - -# set up autologin for user liveuser -if [ -f /etc/sddm.conf ]; then -sed -i 's/^#User=.*/User=liveuser/' /etc/sddm.conf -sed -i "s/^#Session=.*/Session=\${PLASMA_SESSION_FILE}/" /etc/sddm.conf -else -cat > /etc/sddm.conf << SDDM_EOF -[Autologin] -User=liveuser -Session=\${PLASMA_SESSION_FILE} -SDDM_EOF -fi - -# add liveinst.desktop to favorites menu -mkdir -p /home/liveuser/.config/ -cat > /home/liveuser/.config/kickoffrc << MENU_EOF -[Favorites] -FavoriteURLs=/usr/share/applications/firefox.desktop,/usr/share/applications/org.kde.dolphin.desktop,/usr/share/applications/systemsettings.desktop,/usr/share/applications/org.kde.konsole.desktop,/usr/share/applications/liveinst.desktop -MENU_EOF - -# show liveinst.desktop on desktop and in menu -sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop -# set executable bit disable KDE security warning -chmod +x /usr/share/applications/liveinst.desktop -mkdir /home/liveuser/Desktop -cp -a /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 - -# Set akonadi backend -mkdir -p /home/liveuser/.config/akonadi -cat > /home/liveuser/.config/akonadi/akonadiserverrc << AKONADI_EOF -[%General] -Driver=QSQLITE3 -AKONADI_EOF - -# "Disable plasma-discover-notifier" -mkdir -p /home/liveuser/.config/autostart -cp -a /etc/xdg/autostart/org.kde.discover.notifier.desktop /home/liveuser/.config/autostart/ -echo 'Hidden=true' >> /home/liveuser/.config/autostart/org.kde.discover.notifier.desktop - -# Disable baloo -cat > /home/liveuser/.config/baloofilerc << BALOO_EOF -[Basic Settings] -Indexing-Enabled=false -BALOO_EOF - -# Disable kres-migrator -cat > /home/liveuser/.kde/share/config/kres-migratorrc << KRES_EOF -[Migration] -Enabled=false -KRES_EOF - -# Disable kwallet migrator -cat > /home/liveuser/.config/kwalletrc << KWALLET_EOL -[Migration] -alreadyMigrated=true -KWALLET_EOL -# Disable automount of 'known' devices -# https://bugzilla.redhat.com/show_bug.cgi?id=2073708 -cat > /home/liveuser/.config/kded_device_automounterrc << AUTOMOUNTER_EOF -[General] -AutomountEnabled=false -AutomountOnLogin=false -AutomountOnPlugin=false -AUTOMOUNTER_EOF - -# disable kdeconnect -cat > /home/liveuser/.config/autostart/org.kde.kdeconnect.daemon.desktop << KDECONNECT_EOF -[Desktop Entry] -Hidden=true -KDECONNECT_EOF -mkdir -p /home/liveuser/.local/share/dbus-1/services/ -cat > /home/liveuser/.local/share/dbus-1/services/org.kde.kdeconnect.service << DBUS_EOF -[D-BUS Service] -Name=org.kde.kdeconnect -Exec=/usr/bin/false -DBUS_EOF - -# make sure to set the right permissions and selinux contexts -chown -R liveuser:liveuser /home/liveuser/ -restorecon -R /home/liveuser/ -restorecon -R / - -EOF - systemctl enable --force sddm.service dnf config-manager --set-enabled crb diff --git a/live/9/aarch64/peridot/rocky-live-mate.ks b/live/9/aarch64/peridot/rocky-live-mate.ks index 5bb4105..3154533 100644 --- a/live/9/aarch64/peridot/rocky-live-mate.ks +++ b/live/9/aarch64/peridot/rocky-live-mate.ks @@ -9,50 +9,7 @@ part / --size 7168 %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 +sed -i 's/^livesys_session=.*/livesys_session="mate"/' /etc/sysconfig/livesys # this doesn't come up automatically. not sure why. systemctl enable --force lightdm.service diff --git a/live/9/aarch64/peridot/rocky-live-workstation-lite.ks b/live/9/aarch64/peridot/rocky-live-workstation-lite.ks index f9511ee..28f8f96 100644 --- a/live/9/aarch64/peridot/rocky-live-workstation-lite.ks +++ b/live/9/aarch64/peridot/rocky-live-workstation-lite.ks @@ -13,89 +13,6 @@ part / --size 7750 %post -cat >> /etc/rc.d/init.d/livesys << EOF - - -# disable gnome-software automatically downloading updates -cat >> /usr/share/glib-2.0/schemas/org.gnome.software.gschema.override << FOE -[org.gnome.software] -download-updates=false -FOE - -# don't autostart gnome-software session service -rm -f /etc/xdg/autostart/gnome-software-service.desktop - -# disable the gnome-software shell search provider -cat >> /usr/share/gnome-shell/search-providers/org.gnome.Software-search-provider.ini << FOE -DefaultDisabled=true -FOE - -# don't run gnome-initial-setup -mkdir ~liveuser/.config -touch ~liveuser/.config/gnome-initial-setup-done - -# suppress anaconda spokes redundant with gnome-initial-setup -cat >> /etc/sysconfig/anaconda << FOE -[NetworkSpoke] -visited=1 - -[PasswordSpoke] -visited=1 - -[UserSpoke] -visited=1 -FOE - -# make the installer show up -if [ -f /usr/share/applications/liveinst.desktop ]; then - # Show harddisk install in shell dash - sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop "" - # need to move it to anaconda.desktop to make shell happy - mv /usr/share/applications/liveinst.desktop /usr/share/applications/anaconda.desktop - - cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE -[org.gnome.shell] -favorite-apps=['firefox.desktop', 'evolution.desktop', 'org.gnome.Nautilus.desktop', 'anaconda.desktop'] -FOE - - # Make the welcome screen show up - if [ -f /usr/share/anaconda/gnome/fedora-welcome.desktop ]; then - mkdir -p ~liveuser/.config/autostart - cp /usr/share/anaconda/gnome/fedora-welcome.desktop /usr/share/applications/ - cp /usr/share/anaconda/gnome/fedora-welcome.desktop ~liveuser/.config/autostart/ - fi - - # Disable GNOME welcome tour so it doesn't overlap with Fedora welcome screen - cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE -welcome-dialog-last-shown-version='4294967295' -FOE - - # Copy Anaconda branding in place - if [ -d /usr/share/lorax/product/usr/share/anaconda ]; then - cp -a /usr/share/lorax/product/* / - fi -fi - -# rebuild schema cache with any overrides we installed -glib-compile-schemas /usr/share/glib-2.0/schemas - -# set up auto-login -cat > /etc/gdm/custom.conf << FOE -[daemon] -AutomaticLoginEnable=True -AutomaticLogin=liveuser -FOE - -# Turn off PackageKit-command-not-found while uninstalled -if [ -f /etc/PackageKit/CommandNotFound.conf ]; then - sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf -fi - -# make sure to set the right permissions and selinux contexts -chown -R liveuser:liveuser /home/liveuser/ -restorecon -R /home/liveuser/ -restorecon -R / - -EOF +sed -i 's/^livesys_session=.*/livesys_session="gnome"/' /etc/sysconfig/livesys %end diff --git a/live/9/aarch64/peridot/rocky-live-workstation.ks b/live/9/aarch64/peridot/rocky-live-workstation.ks index 7266a6f..3a5c9b5 100644 --- a/live/9/aarch64/peridot/rocky-live-workstation.ks +++ b/live/9/aarch64/peridot/rocky-live-workstation.ks @@ -13,90 +13,6 @@ part / --size 7750 %post -cat >> /etc/rc.d/init.d/livesys << EOF - - -# disable gnome-software automatically downloading updates -cat >> /usr/share/glib-2.0/schemas/org.gnome.software.gschema.override << FOE -[org.gnome.software] -allow-updates=false -download-updates=false -FOE - -# don't autostart gnome-software session service -rm -f /etc/xdg/autostart/gnome-software-service.desktop - -# disable the gnome-software shell search provider -cat >> /usr/share/gnome-shell/search-providers/org.gnome.Software-search-provider.ini << FOE -DefaultDisabled=true -FOE - -# don't run gnome-initial-setup -mkdir ~liveuser/.config -touch ~liveuser/.config/gnome-initial-setup-done - -# suppress anaconda spokes redundant with gnome-initial-setup -cat >> /etc/sysconfig/anaconda << FOE -[NetworkSpoke] -visited=1 - -[PasswordSpoke] -visited=1 - -[UserSpoke] -visited=1 -FOE - -# make the installer show up -if [ -f /usr/share/applications/liveinst.desktop ]; then - # Show harddisk install in shell dash - sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop "" - # need to move it to anaconda.desktop to make shell happy - mv /usr/share/applications/liveinst.desktop /usr/share/applications/anaconda.desktop - - cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE -[org.gnome.shell] -favorite-apps=['firefox.desktop', 'evolution.desktop', 'org.gnome.Nautilus.desktop', 'anaconda.desktop'] -FOE - - # Make the welcome screen show up - if [ -f /usr/share/anaconda/gnome/fedora-welcome.desktop ]; then - mkdir -p ~liveuser/.config/autostart - cp /usr/share/anaconda/gnome/fedora-welcome.desktop /usr/share/applications/ - cp /usr/share/anaconda/gnome/fedora-welcome.desktop ~liveuser/.config/autostart/ - fi - - # Disable GNOME welcome tour so it doesn't overlap with Fedora welcome screen - cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE -welcome-dialog-last-shown-version='4294967295' -FOE - - # Copy Anaconda branding in place - if [ -d /usr/share/lorax/product/usr/share/anaconda ]; then - cp -a /usr/share/lorax/product/* / - fi -fi - -# rebuild schema cache with any overrides we installed -glib-compile-schemas /usr/share/glib-2.0/schemas - -# set up auto-login -cat > /etc/gdm/custom.conf << FOE -[daemon] -AutomaticLoginEnable=True -AutomaticLogin=liveuser -FOE - -# Turn off PackageKit-command-not-found while uninstalled -if [ -f /etc/PackageKit/CommandNotFound.conf ]; then - sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf -fi - -# make sure to set the right permissions and selinux contexts -chown -R liveuser:liveuser /home/liveuser/ -restorecon -R /home/liveuser/ -restorecon -R / - -EOF +sed -i 's/^livesys_session=.*/livesys_session="gnome"/' /etc/sysconfig/livesys %end diff --git a/live/9/aarch64/peridot/rocky-live-xfce.ks b/live/9/aarch64/peridot/rocky-live-xfce.ks index 6f6a94f..3e4c5b7 100644 --- a/live/9/aarch64/peridot/rocky-live-xfce.ks +++ b/live/9/aarch64/peridot/rocky-live-xfce.ks @@ -16,49 +16,6 @@ PREFERRED=/usr/bin/startxfce4 DISPLAYMANAGER=/usr/sbin/lightdm EOF -cat >> /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 - # set default background cat > /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml < @@ -78,36 +35,7 @@ cat > /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml < XFCEEOF -# 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 - -cat > ~liveuser/.profile << PROFILE_EOF -export XDG_DATA_DIRS="\\\${XDG_DATA_DIRS}:\\\${HOME}/Desktop" -PROFILE_EOF - -# 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 -restorecon -R / - -EOF +sed -i 's/^livesys_session=.*/livesys_session="xfce"/' /etc/sysconfig/livesys # this doesn't come up automatically. not sure why. systemctl enable --force lightdm.service diff --git a/live/9/aarch64/prod/rocky-live-base-spin.ks b/live/9/aarch64/prod/rocky-live-base-spin.ks index 445254e..af66a8b 100644 --- a/live/9/aarch64/prod/rocky-live-base-spin.ks +++ b/live/9/aarch64/prod/rocky-live-base-spin.ks @@ -39,6 +39,7 @@ kernel-modules-extra anaconda anaconda-install-env-deps anaconda-live +livesys-scripts @anaconda-tools efi-filesystem efivar-libs @@ -74,231 +75,8 @@ epel-release %end %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 <\ - %if exists(f):\ - install ${f} ${LIVEDIR}/${f|basename}\ - %endif\ - ' /usr/share/lorax/templates.d/99-generic/live/x86.tmpl -fi - -%end diff --git a/live/9/aarch64/prod/rocky-live-base.ks b/live/9/aarch64/prod/rocky-live-base.ks index e50e9ac..953d4de 100644 --- a/live/9/aarch64/prod/rocky-live-base.ks +++ b/live/9/aarch64/prod/rocky-live-base.ks @@ -38,6 +38,7 @@ kernel-modules-extra anaconda anaconda-install-env-deps anaconda-live +livesys-scripts @anaconda-tools efi-filesystem efivar-libs @@ -70,231 +71,8 @@ chkconfig %end %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 <\ - %if exists(f):\ - install ${f} ${LIVEDIR}/${f|basename}\ - %endif\ - ' /usr/share/lorax/templates.d/99-generic/live/x86.tmpl -fi - -%end diff --git a/live/9/aarch64/prod/rocky-live-cinnamon.ks b/live/9/aarch64/prod/rocky-live-cinnamon.ks index b86fe38..9a5c562 100644 --- a/live/9/aarch64/prod/rocky-live-cinnamon.ks +++ b/live/9/aarch64/prod/rocky-live-cinnamon.ks @@ -13,47 +13,7 @@ PREFERRED=/usr/bin/cinnamon-session DISPLAYMANAGER=/usr/sbin/lightdm EOF -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 -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 +sed -i 's/^livesys_session=.*/livesys_session="cinnamon"/' /etc/sysconfig/livesys # this doesn't come up automatically. not sure why. systemctl enable --force lightdm.service diff --git a/live/9/aarch64/prod/rocky-live-kde-base.ks b/live/9/aarch64/prod/rocky-live-kde-base.ks index 4da7880..4550987 100644 --- a/live/9/aarch64/prod/rocky-live-kde-base.ks +++ b/live/9/aarch64/prod/rocky-live-kde-base.ks @@ -5,6 +5,8 @@ %post +sed -i 's/^livesys_session=.*/livesys_session="kde"/' /etc/sysconfig/livesys + # set default GTK+ theme for root (see #683855, #689070, #808062) cat > /root/.gtkrc-2.0 << EOF include "/usr/share/themes/Adwaita/gtk-2.0/gtkrc" @@ -20,105 +22,6 @@ 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 - -# are we *not* able to use wayland sessions? -if strstr "\`cat /proc/cmdline\`" nomodeset ; then -PLASMA_SESSION_FILE="plasmax11.desktop" -else -PLASMA_SESSION_FILE="plasma.desktop" -fi - -# set up autologin for user liveuser -if [ -f /etc/sddm.conf ]; then -sed -i 's/^#User=.*/User=liveuser/' /etc/sddm.conf -sed -i "s/^#Session=.*/Session=\${PLASMA_SESSION_FILE}/" /etc/sddm.conf -else -cat > /etc/sddm.conf << SDDM_EOF -[Autologin] -User=liveuser -Session=\${PLASMA_SESSION_FILE} -SDDM_EOF -fi - -# add liveinst.desktop to favorites menu -mkdir -p /home/liveuser/.config/ -cat > /home/liveuser/.config/kickoffrc << MENU_EOF -[Favorites] -FavoriteURLs=/usr/share/applications/firefox.desktop,/usr/share/applications/org.kde.dolphin.desktop,/usr/share/applications/systemsettings.desktop,/usr/share/applications/org.kde.konsole.desktop,/usr/share/applications/liveinst.desktop -MENU_EOF - -# show liveinst.desktop on desktop and in menu -sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop -# set executable bit disable KDE security warning -chmod +x /usr/share/applications/liveinst.desktop -mkdir /home/liveuser/Desktop -cp -a /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 - -# Set akonadi backend -mkdir -p /home/liveuser/.config/akonadi -cat > /home/liveuser/.config/akonadi/akonadiserverrc << AKONADI_EOF -[%General] -Driver=QSQLITE3 -AKONADI_EOF - -# "Disable plasma-discover-notifier" -mkdir -p /home/liveuser/.config/autostart -cp -a /etc/xdg/autostart/org.kde.discover.notifier.desktop /home/liveuser/.config/autostart/ -echo 'Hidden=true' >> /home/liveuser/.config/autostart/org.kde.discover.notifier.desktop - -# Disable baloo -cat > /home/liveuser/.config/baloofilerc << BALOO_EOF -[Basic Settings] -Indexing-Enabled=false -BALOO_EOF - -# Disable kres-migrator -cat > /home/liveuser/.kde/share/config/kres-migratorrc << KRES_EOF -[Migration] -Enabled=false -KRES_EOF - -# Disable kwallet migrator -cat > /home/liveuser/.config/kwalletrc << KWALLET_EOL -[Migration] -alreadyMigrated=true -KWALLET_EOL -# Disable automount of 'known' devices -# https://bugzilla.redhat.com/show_bug.cgi?id=2073708 -cat > /home/liveuser/.config/kded_device_automounterrc << AUTOMOUNTER_EOF -[General] -AutomountEnabled=false -AutomountOnLogin=false -AutomountOnPlugin=false -AUTOMOUNTER_EOF - -# disable kdeconnect -cat > /home/liveuser/.config/autostart/org.kde.kdeconnect.daemon.desktop << KDECONNECT_EOF -[Desktop Entry] -Hidden=true -KDECONNECT_EOF -mkdir -p /home/liveuser/.local/share/dbus-1/services/ -cat > /home/liveuser/.local/share/dbus-1/services/org.kde.kdeconnect.service << DBUS_EOF -[D-BUS Service] -Name=org.kde.kdeconnect -Exec=/usr/bin/false -DBUS_EOF - -# make sure to set the right permissions and selinux contexts -chown -R liveuser:liveuser /home/liveuser/ -restorecon -R /home/liveuser/ -restorecon -R / - -EOF - systemctl enable --force sddm.service dnf config-manager --set-enabled crb diff --git a/live/9/aarch64/prod/rocky-live-mate.ks b/live/9/aarch64/prod/rocky-live-mate.ks index 5bb4105..3154533 100644 --- a/live/9/aarch64/prod/rocky-live-mate.ks +++ b/live/9/aarch64/prod/rocky-live-mate.ks @@ -9,50 +9,7 @@ part / --size 7168 %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 +sed -i 's/^livesys_session=.*/livesys_session="mate"/' /etc/sysconfig/livesys # this doesn't come up automatically. not sure why. systemctl enable --force lightdm.service diff --git a/live/9/aarch64/prod/rocky-live-workstation-lite.ks b/live/9/aarch64/prod/rocky-live-workstation-lite.ks index f9511ee..28f8f96 100644 --- a/live/9/aarch64/prod/rocky-live-workstation-lite.ks +++ b/live/9/aarch64/prod/rocky-live-workstation-lite.ks @@ -13,89 +13,6 @@ part / --size 7750 %post -cat >> /etc/rc.d/init.d/livesys << EOF - - -# disable gnome-software automatically downloading updates -cat >> /usr/share/glib-2.0/schemas/org.gnome.software.gschema.override << FOE -[org.gnome.software] -download-updates=false -FOE - -# don't autostart gnome-software session service -rm -f /etc/xdg/autostart/gnome-software-service.desktop - -# disable the gnome-software shell search provider -cat >> /usr/share/gnome-shell/search-providers/org.gnome.Software-search-provider.ini << FOE -DefaultDisabled=true -FOE - -# don't run gnome-initial-setup -mkdir ~liveuser/.config -touch ~liveuser/.config/gnome-initial-setup-done - -# suppress anaconda spokes redundant with gnome-initial-setup -cat >> /etc/sysconfig/anaconda << FOE -[NetworkSpoke] -visited=1 - -[PasswordSpoke] -visited=1 - -[UserSpoke] -visited=1 -FOE - -# make the installer show up -if [ -f /usr/share/applications/liveinst.desktop ]; then - # Show harddisk install in shell dash - sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop "" - # need to move it to anaconda.desktop to make shell happy - mv /usr/share/applications/liveinst.desktop /usr/share/applications/anaconda.desktop - - cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE -[org.gnome.shell] -favorite-apps=['firefox.desktop', 'evolution.desktop', 'org.gnome.Nautilus.desktop', 'anaconda.desktop'] -FOE - - # Make the welcome screen show up - if [ -f /usr/share/anaconda/gnome/fedora-welcome.desktop ]; then - mkdir -p ~liveuser/.config/autostart - cp /usr/share/anaconda/gnome/fedora-welcome.desktop /usr/share/applications/ - cp /usr/share/anaconda/gnome/fedora-welcome.desktop ~liveuser/.config/autostart/ - fi - - # Disable GNOME welcome tour so it doesn't overlap with Fedora welcome screen - cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE -welcome-dialog-last-shown-version='4294967295' -FOE - - # Copy Anaconda branding in place - if [ -d /usr/share/lorax/product/usr/share/anaconda ]; then - cp -a /usr/share/lorax/product/* / - fi -fi - -# rebuild schema cache with any overrides we installed -glib-compile-schemas /usr/share/glib-2.0/schemas - -# set up auto-login -cat > /etc/gdm/custom.conf << FOE -[daemon] -AutomaticLoginEnable=True -AutomaticLogin=liveuser -FOE - -# Turn off PackageKit-command-not-found while uninstalled -if [ -f /etc/PackageKit/CommandNotFound.conf ]; then - sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf -fi - -# make sure to set the right permissions and selinux contexts -chown -R liveuser:liveuser /home/liveuser/ -restorecon -R /home/liveuser/ -restorecon -R / - -EOF +sed -i 's/^livesys_session=.*/livesys_session="gnome"/' /etc/sysconfig/livesys %end diff --git a/live/9/aarch64/prod/rocky-live-workstation.ks b/live/9/aarch64/prod/rocky-live-workstation.ks index 7266a6f..3a5c9b5 100644 --- a/live/9/aarch64/prod/rocky-live-workstation.ks +++ b/live/9/aarch64/prod/rocky-live-workstation.ks @@ -13,90 +13,6 @@ part / --size 7750 %post -cat >> /etc/rc.d/init.d/livesys << EOF - - -# disable gnome-software automatically downloading updates -cat >> /usr/share/glib-2.0/schemas/org.gnome.software.gschema.override << FOE -[org.gnome.software] -allow-updates=false -download-updates=false -FOE - -# don't autostart gnome-software session service -rm -f /etc/xdg/autostart/gnome-software-service.desktop - -# disable the gnome-software shell search provider -cat >> /usr/share/gnome-shell/search-providers/org.gnome.Software-search-provider.ini << FOE -DefaultDisabled=true -FOE - -# don't run gnome-initial-setup -mkdir ~liveuser/.config -touch ~liveuser/.config/gnome-initial-setup-done - -# suppress anaconda spokes redundant with gnome-initial-setup -cat >> /etc/sysconfig/anaconda << FOE -[NetworkSpoke] -visited=1 - -[PasswordSpoke] -visited=1 - -[UserSpoke] -visited=1 -FOE - -# make the installer show up -if [ -f /usr/share/applications/liveinst.desktop ]; then - # Show harddisk install in shell dash - sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop "" - # need to move it to anaconda.desktop to make shell happy - mv /usr/share/applications/liveinst.desktop /usr/share/applications/anaconda.desktop - - cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE -[org.gnome.shell] -favorite-apps=['firefox.desktop', 'evolution.desktop', 'org.gnome.Nautilus.desktop', 'anaconda.desktop'] -FOE - - # Make the welcome screen show up - if [ -f /usr/share/anaconda/gnome/fedora-welcome.desktop ]; then - mkdir -p ~liveuser/.config/autostart - cp /usr/share/anaconda/gnome/fedora-welcome.desktop /usr/share/applications/ - cp /usr/share/anaconda/gnome/fedora-welcome.desktop ~liveuser/.config/autostart/ - fi - - # Disable GNOME welcome tour so it doesn't overlap with Fedora welcome screen - cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE -welcome-dialog-last-shown-version='4294967295' -FOE - - # Copy Anaconda branding in place - if [ -d /usr/share/lorax/product/usr/share/anaconda ]; then - cp -a /usr/share/lorax/product/* / - fi -fi - -# rebuild schema cache with any overrides we installed -glib-compile-schemas /usr/share/glib-2.0/schemas - -# set up auto-login -cat > /etc/gdm/custom.conf << FOE -[daemon] -AutomaticLoginEnable=True -AutomaticLogin=liveuser -FOE - -# Turn off PackageKit-command-not-found while uninstalled -if [ -f /etc/PackageKit/CommandNotFound.conf ]; then - sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf -fi - -# make sure to set the right permissions and selinux contexts -chown -R liveuser:liveuser /home/liveuser/ -restorecon -R /home/liveuser/ -restorecon -R / - -EOF +sed -i 's/^livesys_session=.*/livesys_session="gnome"/' /etc/sysconfig/livesys %end diff --git a/live/9/aarch64/prod/rocky-live-xfce.ks b/live/9/aarch64/prod/rocky-live-xfce.ks index 6f6a94f..3e4c5b7 100644 --- a/live/9/aarch64/prod/rocky-live-xfce.ks +++ b/live/9/aarch64/prod/rocky-live-xfce.ks @@ -16,49 +16,6 @@ PREFERRED=/usr/bin/startxfce4 DISPLAYMANAGER=/usr/sbin/lightdm EOF -cat >> /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 - # set default background cat > /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml < @@ -78,36 +35,7 @@ cat > /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml < XFCEEOF -# 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 - -cat > ~liveuser/.profile << PROFILE_EOF -export XDG_DATA_DIRS="\\\${XDG_DATA_DIRS}:\\\${HOME}/Desktop" -PROFILE_EOF - -# 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 -restorecon -R / - -EOF +sed -i 's/^livesys_session=.*/livesys_session="xfce"/' /etc/sysconfig/livesys # this doesn't come up automatically. not sure why. systemctl enable --force lightdm.service diff --git a/live/9/aarch64/stage/rocky-live-base-spin.ks b/live/9/aarch64/stage/rocky-live-base-spin.ks index 445254e..af66a8b 100644 --- a/live/9/aarch64/stage/rocky-live-base-spin.ks +++ b/live/9/aarch64/stage/rocky-live-base-spin.ks @@ -39,6 +39,7 @@ kernel-modules-extra anaconda anaconda-install-env-deps anaconda-live +livesys-scripts @anaconda-tools efi-filesystem efivar-libs @@ -74,231 +75,8 @@ epel-release %end %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 <\ - %if exists(f):\ - install ${f} ${LIVEDIR}/${f|basename}\ - %endif\ - ' /usr/share/lorax/templates.d/99-generic/live/x86.tmpl -fi - -%end diff --git a/live/9/aarch64/stage/rocky-live-base.ks b/live/9/aarch64/stage/rocky-live-base.ks index e50e9ac..953d4de 100644 --- a/live/9/aarch64/stage/rocky-live-base.ks +++ b/live/9/aarch64/stage/rocky-live-base.ks @@ -38,6 +38,7 @@ kernel-modules-extra anaconda anaconda-install-env-deps anaconda-live +livesys-scripts @anaconda-tools efi-filesystem efivar-libs @@ -70,231 +71,8 @@ chkconfig %end %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 <\ - %if exists(f):\ - install ${f} ${LIVEDIR}/${f|basename}\ - %endif\ - ' /usr/share/lorax/templates.d/99-generic/live/x86.tmpl -fi - -%end diff --git a/live/9/aarch64/stage/rocky-live-cinnamon.ks b/live/9/aarch64/stage/rocky-live-cinnamon.ks index b86fe38..9a5c562 100644 --- a/live/9/aarch64/stage/rocky-live-cinnamon.ks +++ b/live/9/aarch64/stage/rocky-live-cinnamon.ks @@ -13,47 +13,7 @@ PREFERRED=/usr/bin/cinnamon-session DISPLAYMANAGER=/usr/sbin/lightdm EOF -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 -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 +sed -i 's/^livesys_session=.*/livesys_session="cinnamon"/' /etc/sysconfig/livesys # this doesn't come up automatically. not sure why. systemctl enable --force lightdm.service diff --git a/live/9/aarch64/stage/rocky-live-kde-base.ks b/live/9/aarch64/stage/rocky-live-kde-base.ks index 4da7880..4550987 100644 --- a/live/9/aarch64/stage/rocky-live-kde-base.ks +++ b/live/9/aarch64/stage/rocky-live-kde-base.ks @@ -5,6 +5,8 @@ %post +sed -i 's/^livesys_session=.*/livesys_session="kde"/' /etc/sysconfig/livesys + # set default GTK+ theme for root (see #683855, #689070, #808062) cat > /root/.gtkrc-2.0 << EOF include "/usr/share/themes/Adwaita/gtk-2.0/gtkrc" @@ -20,105 +22,6 @@ 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 - -# are we *not* able to use wayland sessions? -if strstr "\`cat /proc/cmdline\`" nomodeset ; then -PLASMA_SESSION_FILE="plasmax11.desktop" -else -PLASMA_SESSION_FILE="plasma.desktop" -fi - -# set up autologin for user liveuser -if [ -f /etc/sddm.conf ]; then -sed -i 's/^#User=.*/User=liveuser/' /etc/sddm.conf -sed -i "s/^#Session=.*/Session=\${PLASMA_SESSION_FILE}/" /etc/sddm.conf -else -cat > /etc/sddm.conf << SDDM_EOF -[Autologin] -User=liveuser -Session=\${PLASMA_SESSION_FILE} -SDDM_EOF -fi - -# add liveinst.desktop to favorites menu -mkdir -p /home/liveuser/.config/ -cat > /home/liveuser/.config/kickoffrc << MENU_EOF -[Favorites] -FavoriteURLs=/usr/share/applications/firefox.desktop,/usr/share/applications/org.kde.dolphin.desktop,/usr/share/applications/systemsettings.desktop,/usr/share/applications/org.kde.konsole.desktop,/usr/share/applications/liveinst.desktop -MENU_EOF - -# show liveinst.desktop on desktop and in menu -sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop -# set executable bit disable KDE security warning -chmod +x /usr/share/applications/liveinst.desktop -mkdir /home/liveuser/Desktop -cp -a /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 - -# Set akonadi backend -mkdir -p /home/liveuser/.config/akonadi -cat > /home/liveuser/.config/akonadi/akonadiserverrc << AKONADI_EOF -[%General] -Driver=QSQLITE3 -AKONADI_EOF - -# "Disable plasma-discover-notifier" -mkdir -p /home/liveuser/.config/autostart -cp -a /etc/xdg/autostart/org.kde.discover.notifier.desktop /home/liveuser/.config/autostart/ -echo 'Hidden=true' >> /home/liveuser/.config/autostart/org.kde.discover.notifier.desktop - -# Disable baloo -cat > /home/liveuser/.config/baloofilerc << BALOO_EOF -[Basic Settings] -Indexing-Enabled=false -BALOO_EOF - -# Disable kres-migrator -cat > /home/liveuser/.kde/share/config/kres-migratorrc << KRES_EOF -[Migration] -Enabled=false -KRES_EOF - -# Disable kwallet migrator -cat > /home/liveuser/.config/kwalletrc << KWALLET_EOL -[Migration] -alreadyMigrated=true -KWALLET_EOL -# Disable automount of 'known' devices -# https://bugzilla.redhat.com/show_bug.cgi?id=2073708 -cat > /home/liveuser/.config/kded_device_automounterrc << AUTOMOUNTER_EOF -[General] -AutomountEnabled=false -AutomountOnLogin=false -AutomountOnPlugin=false -AUTOMOUNTER_EOF - -# disable kdeconnect -cat > /home/liveuser/.config/autostart/org.kde.kdeconnect.daemon.desktop << KDECONNECT_EOF -[Desktop Entry] -Hidden=true -KDECONNECT_EOF -mkdir -p /home/liveuser/.local/share/dbus-1/services/ -cat > /home/liveuser/.local/share/dbus-1/services/org.kde.kdeconnect.service << DBUS_EOF -[D-BUS Service] -Name=org.kde.kdeconnect -Exec=/usr/bin/false -DBUS_EOF - -# make sure to set the right permissions and selinux contexts -chown -R liveuser:liveuser /home/liveuser/ -restorecon -R /home/liveuser/ -restorecon -R / - -EOF - systemctl enable --force sddm.service dnf config-manager --set-enabled crb diff --git a/live/9/aarch64/stage/rocky-live-mate.ks b/live/9/aarch64/stage/rocky-live-mate.ks index 5bb4105..3154533 100644 --- a/live/9/aarch64/stage/rocky-live-mate.ks +++ b/live/9/aarch64/stage/rocky-live-mate.ks @@ -9,50 +9,7 @@ part / --size 7168 %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 +sed -i 's/^livesys_session=.*/livesys_session="mate"/' /etc/sysconfig/livesys # this doesn't come up automatically. not sure why. systemctl enable --force lightdm.service diff --git a/live/9/aarch64/stage/rocky-live-workstation-lite.ks b/live/9/aarch64/stage/rocky-live-workstation-lite.ks index f9511ee..28f8f96 100644 --- a/live/9/aarch64/stage/rocky-live-workstation-lite.ks +++ b/live/9/aarch64/stage/rocky-live-workstation-lite.ks @@ -13,89 +13,6 @@ part / --size 7750 %post -cat >> /etc/rc.d/init.d/livesys << EOF - - -# disable gnome-software automatically downloading updates -cat >> /usr/share/glib-2.0/schemas/org.gnome.software.gschema.override << FOE -[org.gnome.software] -download-updates=false -FOE - -# don't autostart gnome-software session service -rm -f /etc/xdg/autostart/gnome-software-service.desktop - -# disable the gnome-software shell search provider -cat >> /usr/share/gnome-shell/search-providers/org.gnome.Software-search-provider.ini << FOE -DefaultDisabled=true -FOE - -# don't run gnome-initial-setup -mkdir ~liveuser/.config -touch ~liveuser/.config/gnome-initial-setup-done - -# suppress anaconda spokes redundant with gnome-initial-setup -cat >> /etc/sysconfig/anaconda << FOE -[NetworkSpoke] -visited=1 - -[PasswordSpoke] -visited=1 - -[UserSpoke] -visited=1 -FOE - -# make the installer show up -if [ -f /usr/share/applications/liveinst.desktop ]; then - # Show harddisk install in shell dash - sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop "" - # need to move it to anaconda.desktop to make shell happy - mv /usr/share/applications/liveinst.desktop /usr/share/applications/anaconda.desktop - - cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE -[org.gnome.shell] -favorite-apps=['firefox.desktop', 'evolution.desktop', 'org.gnome.Nautilus.desktop', 'anaconda.desktop'] -FOE - - # Make the welcome screen show up - if [ -f /usr/share/anaconda/gnome/fedora-welcome.desktop ]; then - mkdir -p ~liveuser/.config/autostart - cp /usr/share/anaconda/gnome/fedora-welcome.desktop /usr/share/applications/ - cp /usr/share/anaconda/gnome/fedora-welcome.desktop ~liveuser/.config/autostart/ - fi - - # Disable GNOME welcome tour so it doesn't overlap with Fedora welcome screen - cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE -welcome-dialog-last-shown-version='4294967295' -FOE - - # Copy Anaconda branding in place - if [ -d /usr/share/lorax/product/usr/share/anaconda ]; then - cp -a /usr/share/lorax/product/* / - fi -fi - -# rebuild schema cache with any overrides we installed -glib-compile-schemas /usr/share/glib-2.0/schemas - -# set up auto-login -cat > /etc/gdm/custom.conf << FOE -[daemon] -AutomaticLoginEnable=True -AutomaticLogin=liveuser -FOE - -# Turn off PackageKit-command-not-found while uninstalled -if [ -f /etc/PackageKit/CommandNotFound.conf ]; then - sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf -fi - -# make sure to set the right permissions and selinux contexts -chown -R liveuser:liveuser /home/liveuser/ -restorecon -R /home/liveuser/ -restorecon -R / - -EOF +sed -i 's/^livesys_session=.*/livesys_session="gnome"/' /etc/sysconfig/livesys %end diff --git a/live/9/aarch64/stage/rocky-live-workstation.ks b/live/9/aarch64/stage/rocky-live-workstation.ks index 7266a6f..3a5c9b5 100644 --- a/live/9/aarch64/stage/rocky-live-workstation.ks +++ b/live/9/aarch64/stage/rocky-live-workstation.ks @@ -13,90 +13,6 @@ part / --size 7750 %post -cat >> /etc/rc.d/init.d/livesys << EOF - - -# disable gnome-software automatically downloading updates -cat >> /usr/share/glib-2.0/schemas/org.gnome.software.gschema.override << FOE -[org.gnome.software] -allow-updates=false -download-updates=false -FOE - -# don't autostart gnome-software session service -rm -f /etc/xdg/autostart/gnome-software-service.desktop - -# disable the gnome-software shell search provider -cat >> /usr/share/gnome-shell/search-providers/org.gnome.Software-search-provider.ini << FOE -DefaultDisabled=true -FOE - -# don't run gnome-initial-setup -mkdir ~liveuser/.config -touch ~liveuser/.config/gnome-initial-setup-done - -# suppress anaconda spokes redundant with gnome-initial-setup -cat >> /etc/sysconfig/anaconda << FOE -[NetworkSpoke] -visited=1 - -[PasswordSpoke] -visited=1 - -[UserSpoke] -visited=1 -FOE - -# make the installer show up -if [ -f /usr/share/applications/liveinst.desktop ]; then - # Show harddisk install in shell dash - sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop "" - # need to move it to anaconda.desktop to make shell happy - mv /usr/share/applications/liveinst.desktop /usr/share/applications/anaconda.desktop - - cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE -[org.gnome.shell] -favorite-apps=['firefox.desktop', 'evolution.desktop', 'org.gnome.Nautilus.desktop', 'anaconda.desktop'] -FOE - - # Make the welcome screen show up - if [ -f /usr/share/anaconda/gnome/fedora-welcome.desktop ]; then - mkdir -p ~liveuser/.config/autostart - cp /usr/share/anaconda/gnome/fedora-welcome.desktop /usr/share/applications/ - cp /usr/share/anaconda/gnome/fedora-welcome.desktop ~liveuser/.config/autostart/ - fi - - # Disable GNOME welcome tour so it doesn't overlap with Fedora welcome screen - cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE -welcome-dialog-last-shown-version='4294967295' -FOE - - # Copy Anaconda branding in place - if [ -d /usr/share/lorax/product/usr/share/anaconda ]; then - cp -a /usr/share/lorax/product/* / - fi -fi - -# rebuild schema cache with any overrides we installed -glib-compile-schemas /usr/share/glib-2.0/schemas - -# set up auto-login -cat > /etc/gdm/custom.conf << FOE -[daemon] -AutomaticLoginEnable=True -AutomaticLogin=liveuser -FOE - -# Turn off PackageKit-command-not-found while uninstalled -if [ -f /etc/PackageKit/CommandNotFound.conf ]; then - sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf -fi - -# make sure to set the right permissions and selinux contexts -chown -R liveuser:liveuser /home/liveuser/ -restorecon -R /home/liveuser/ -restorecon -R / - -EOF +sed -i 's/^livesys_session=.*/livesys_session="gnome"/' /etc/sysconfig/livesys %end diff --git a/live/9/aarch64/stage/rocky-live-xfce.ks b/live/9/aarch64/stage/rocky-live-xfce.ks index 6f6a94f..3e4c5b7 100644 --- a/live/9/aarch64/stage/rocky-live-xfce.ks +++ b/live/9/aarch64/stage/rocky-live-xfce.ks @@ -16,49 +16,6 @@ PREFERRED=/usr/bin/startxfce4 DISPLAYMANAGER=/usr/sbin/lightdm EOF -cat >> /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 - # set default background cat > /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml < @@ -78,36 +35,7 @@ cat > /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml < XFCEEOF -# 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 - -cat > ~liveuser/.profile << PROFILE_EOF -export XDG_DATA_DIRS="\\\${XDG_DATA_DIRS}:\\\${HOME}/Desktop" -PROFILE_EOF - -# 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 -restorecon -R / - -EOF +sed -i 's/^livesys_session=.*/livesys_session="xfce"/' /etc/sysconfig/livesys # this doesn't come up automatically. not sure why. systemctl enable --force lightdm.service diff --git a/live/9/ppc64le/peridot/rocky-live-base-spin.ks b/live/9/ppc64le/peridot/rocky-live-base-spin.ks index 68b0622..fda7792 100644 --- a/live/9/ppc64le/peridot/rocky-live-base-spin.ks +++ b/live/9/ppc64le/peridot/rocky-live-base-spin.ks @@ -38,6 +38,7 @@ kernel-modules-extra anaconda anaconda-install-env-deps anaconda-live +livesys-scripts @anaconda-tools efi-filesystem grub2-common @@ -76,231 +77,8 @@ epel-release %end %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 <\ - %if exists(f):\ - install ${f} ${LIVEDIR}/${f|basename}\ - %endif\ - ' /usr/share/lorax/templates.d/99-generic/live/x86.tmpl -fi - -%end diff --git a/live/9/ppc64le/peridot/rocky-live-base.ks b/live/9/ppc64le/peridot/rocky-live-base.ks index b0b2925..17a0ebd 100644 --- a/live/9/ppc64le/peridot/rocky-live-base.ks +++ b/live/9/ppc64le/peridot/rocky-live-base.ks @@ -37,6 +37,7 @@ kernel-modules-extra anaconda anaconda-install-env-deps anaconda-live +livesys-scripts @anaconda-tools efi-filesystem grub2-common @@ -72,231 +73,8 @@ chkconfig %end %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 <\ - %if exists(f):\ - install ${f} ${LIVEDIR}/${f|basename}\ - %endif\ - ' /usr/share/lorax/templates.d/99-generic/live/x86.tmpl -fi - -%end diff --git a/live/9/ppc64le/peridot/rocky-live-cinnamon.ks b/live/9/ppc64le/peridot/rocky-live-cinnamon.ks index b86fe38..9a5c562 100644 --- a/live/9/ppc64le/peridot/rocky-live-cinnamon.ks +++ b/live/9/ppc64le/peridot/rocky-live-cinnamon.ks @@ -13,47 +13,7 @@ PREFERRED=/usr/bin/cinnamon-session DISPLAYMANAGER=/usr/sbin/lightdm EOF -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 -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 +sed -i 's/^livesys_session=.*/livesys_session="cinnamon"/' /etc/sysconfig/livesys # this doesn't come up automatically. not sure why. systemctl enable --force lightdm.service diff --git a/live/9/ppc64le/peridot/rocky-live-kde-base.ks b/live/9/ppc64le/peridot/rocky-live-kde-base.ks index 4da7880..4550987 100644 --- a/live/9/ppc64le/peridot/rocky-live-kde-base.ks +++ b/live/9/ppc64le/peridot/rocky-live-kde-base.ks @@ -5,6 +5,8 @@ %post +sed -i 's/^livesys_session=.*/livesys_session="kde"/' /etc/sysconfig/livesys + # set default GTK+ theme for root (see #683855, #689070, #808062) cat > /root/.gtkrc-2.0 << EOF include "/usr/share/themes/Adwaita/gtk-2.0/gtkrc" @@ -20,105 +22,6 @@ 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 - -# are we *not* able to use wayland sessions? -if strstr "\`cat /proc/cmdline\`" nomodeset ; then -PLASMA_SESSION_FILE="plasmax11.desktop" -else -PLASMA_SESSION_FILE="plasma.desktop" -fi - -# set up autologin for user liveuser -if [ -f /etc/sddm.conf ]; then -sed -i 's/^#User=.*/User=liveuser/' /etc/sddm.conf -sed -i "s/^#Session=.*/Session=\${PLASMA_SESSION_FILE}/" /etc/sddm.conf -else -cat > /etc/sddm.conf << SDDM_EOF -[Autologin] -User=liveuser -Session=\${PLASMA_SESSION_FILE} -SDDM_EOF -fi - -# add liveinst.desktop to favorites menu -mkdir -p /home/liveuser/.config/ -cat > /home/liveuser/.config/kickoffrc << MENU_EOF -[Favorites] -FavoriteURLs=/usr/share/applications/firefox.desktop,/usr/share/applications/org.kde.dolphin.desktop,/usr/share/applications/systemsettings.desktop,/usr/share/applications/org.kde.konsole.desktop,/usr/share/applications/liveinst.desktop -MENU_EOF - -# show liveinst.desktop on desktop and in menu -sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop -# set executable bit disable KDE security warning -chmod +x /usr/share/applications/liveinst.desktop -mkdir /home/liveuser/Desktop -cp -a /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 - -# Set akonadi backend -mkdir -p /home/liveuser/.config/akonadi -cat > /home/liveuser/.config/akonadi/akonadiserverrc << AKONADI_EOF -[%General] -Driver=QSQLITE3 -AKONADI_EOF - -# "Disable plasma-discover-notifier" -mkdir -p /home/liveuser/.config/autostart -cp -a /etc/xdg/autostart/org.kde.discover.notifier.desktop /home/liveuser/.config/autostart/ -echo 'Hidden=true' >> /home/liveuser/.config/autostart/org.kde.discover.notifier.desktop - -# Disable baloo -cat > /home/liveuser/.config/baloofilerc << BALOO_EOF -[Basic Settings] -Indexing-Enabled=false -BALOO_EOF - -# Disable kres-migrator -cat > /home/liveuser/.kde/share/config/kres-migratorrc << KRES_EOF -[Migration] -Enabled=false -KRES_EOF - -# Disable kwallet migrator -cat > /home/liveuser/.config/kwalletrc << KWALLET_EOL -[Migration] -alreadyMigrated=true -KWALLET_EOL -# Disable automount of 'known' devices -# https://bugzilla.redhat.com/show_bug.cgi?id=2073708 -cat > /home/liveuser/.config/kded_device_automounterrc << AUTOMOUNTER_EOF -[General] -AutomountEnabled=false -AutomountOnLogin=false -AutomountOnPlugin=false -AUTOMOUNTER_EOF - -# disable kdeconnect -cat > /home/liveuser/.config/autostart/org.kde.kdeconnect.daemon.desktop << KDECONNECT_EOF -[Desktop Entry] -Hidden=true -KDECONNECT_EOF -mkdir -p /home/liveuser/.local/share/dbus-1/services/ -cat > /home/liveuser/.local/share/dbus-1/services/org.kde.kdeconnect.service << DBUS_EOF -[D-BUS Service] -Name=org.kde.kdeconnect -Exec=/usr/bin/false -DBUS_EOF - -# make sure to set the right permissions and selinux contexts -chown -R liveuser:liveuser /home/liveuser/ -restorecon -R /home/liveuser/ -restorecon -R / - -EOF - systemctl enable --force sddm.service dnf config-manager --set-enabled crb diff --git a/live/9/ppc64le/peridot/rocky-live-mate.ks b/live/9/ppc64le/peridot/rocky-live-mate.ks index 5bb4105..3154533 100644 --- a/live/9/ppc64le/peridot/rocky-live-mate.ks +++ b/live/9/ppc64le/peridot/rocky-live-mate.ks @@ -9,50 +9,7 @@ part / --size 7168 %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 +sed -i 's/^livesys_session=.*/livesys_session="mate"/' /etc/sysconfig/livesys # this doesn't come up automatically. not sure why. systemctl enable --force lightdm.service diff --git a/live/9/ppc64le/peridot/rocky-live-workstation-lite.ks b/live/9/ppc64le/peridot/rocky-live-workstation-lite.ks index f9511ee..28f8f96 100644 --- a/live/9/ppc64le/peridot/rocky-live-workstation-lite.ks +++ b/live/9/ppc64le/peridot/rocky-live-workstation-lite.ks @@ -13,89 +13,6 @@ part / --size 7750 %post -cat >> /etc/rc.d/init.d/livesys << EOF - - -# disable gnome-software automatically downloading updates -cat >> /usr/share/glib-2.0/schemas/org.gnome.software.gschema.override << FOE -[org.gnome.software] -download-updates=false -FOE - -# don't autostart gnome-software session service -rm -f /etc/xdg/autostart/gnome-software-service.desktop - -# disable the gnome-software shell search provider -cat >> /usr/share/gnome-shell/search-providers/org.gnome.Software-search-provider.ini << FOE -DefaultDisabled=true -FOE - -# don't run gnome-initial-setup -mkdir ~liveuser/.config -touch ~liveuser/.config/gnome-initial-setup-done - -# suppress anaconda spokes redundant with gnome-initial-setup -cat >> /etc/sysconfig/anaconda << FOE -[NetworkSpoke] -visited=1 - -[PasswordSpoke] -visited=1 - -[UserSpoke] -visited=1 -FOE - -# make the installer show up -if [ -f /usr/share/applications/liveinst.desktop ]; then - # Show harddisk install in shell dash - sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop "" - # need to move it to anaconda.desktop to make shell happy - mv /usr/share/applications/liveinst.desktop /usr/share/applications/anaconda.desktop - - cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE -[org.gnome.shell] -favorite-apps=['firefox.desktop', 'evolution.desktop', 'org.gnome.Nautilus.desktop', 'anaconda.desktop'] -FOE - - # Make the welcome screen show up - if [ -f /usr/share/anaconda/gnome/fedora-welcome.desktop ]; then - mkdir -p ~liveuser/.config/autostart - cp /usr/share/anaconda/gnome/fedora-welcome.desktop /usr/share/applications/ - cp /usr/share/anaconda/gnome/fedora-welcome.desktop ~liveuser/.config/autostart/ - fi - - # Disable GNOME welcome tour so it doesn't overlap with Fedora welcome screen - cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE -welcome-dialog-last-shown-version='4294967295' -FOE - - # Copy Anaconda branding in place - if [ -d /usr/share/lorax/product/usr/share/anaconda ]; then - cp -a /usr/share/lorax/product/* / - fi -fi - -# rebuild schema cache with any overrides we installed -glib-compile-schemas /usr/share/glib-2.0/schemas - -# set up auto-login -cat > /etc/gdm/custom.conf << FOE -[daemon] -AutomaticLoginEnable=True -AutomaticLogin=liveuser -FOE - -# Turn off PackageKit-command-not-found while uninstalled -if [ -f /etc/PackageKit/CommandNotFound.conf ]; then - sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf -fi - -# make sure to set the right permissions and selinux contexts -chown -R liveuser:liveuser /home/liveuser/ -restorecon -R /home/liveuser/ -restorecon -R / - -EOF +sed -i 's/^livesys_session=.*/livesys_session="gnome"/' /etc/sysconfig/livesys %end diff --git a/live/9/ppc64le/peridot/rocky-live-workstation.ks b/live/9/ppc64le/peridot/rocky-live-workstation.ks index 7266a6f..3a5c9b5 100644 --- a/live/9/ppc64le/peridot/rocky-live-workstation.ks +++ b/live/9/ppc64le/peridot/rocky-live-workstation.ks @@ -13,90 +13,6 @@ part / --size 7750 %post -cat >> /etc/rc.d/init.d/livesys << EOF - - -# disable gnome-software automatically downloading updates -cat >> /usr/share/glib-2.0/schemas/org.gnome.software.gschema.override << FOE -[org.gnome.software] -allow-updates=false -download-updates=false -FOE - -# don't autostart gnome-software session service -rm -f /etc/xdg/autostart/gnome-software-service.desktop - -# disable the gnome-software shell search provider -cat >> /usr/share/gnome-shell/search-providers/org.gnome.Software-search-provider.ini << FOE -DefaultDisabled=true -FOE - -# don't run gnome-initial-setup -mkdir ~liveuser/.config -touch ~liveuser/.config/gnome-initial-setup-done - -# suppress anaconda spokes redundant with gnome-initial-setup -cat >> /etc/sysconfig/anaconda << FOE -[NetworkSpoke] -visited=1 - -[PasswordSpoke] -visited=1 - -[UserSpoke] -visited=1 -FOE - -# make the installer show up -if [ -f /usr/share/applications/liveinst.desktop ]; then - # Show harddisk install in shell dash - sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop "" - # need to move it to anaconda.desktop to make shell happy - mv /usr/share/applications/liveinst.desktop /usr/share/applications/anaconda.desktop - - cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE -[org.gnome.shell] -favorite-apps=['firefox.desktop', 'evolution.desktop', 'org.gnome.Nautilus.desktop', 'anaconda.desktop'] -FOE - - # Make the welcome screen show up - if [ -f /usr/share/anaconda/gnome/fedora-welcome.desktop ]; then - mkdir -p ~liveuser/.config/autostart - cp /usr/share/anaconda/gnome/fedora-welcome.desktop /usr/share/applications/ - cp /usr/share/anaconda/gnome/fedora-welcome.desktop ~liveuser/.config/autostart/ - fi - - # Disable GNOME welcome tour so it doesn't overlap with Fedora welcome screen - cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE -welcome-dialog-last-shown-version='4294967295' -FOE - - # Copy Anaconda branding in place - if [ -d /usr/share/lorax/product/usr/share/anaconda ]; then - cp -a /usr/share/lorax/product/* / - fi -fi - -# rebuild schema cache with any overrides we installed -glib-compile-schemas /usr/share/glib-2.0/schemas - -# set up auto-login -cat > /etc/gdm/custom.conf << FOE -[daemon] -AutomaticLoginEnable=True -AutomaticLogin=liveuser -FOE - -# Turn off PackageKit-command-not-found while uninstalled -if [ -f /etc/PackageKit/CommandNotFound.conf ]; then - sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf -fi - -# make sure to set the right permissions and selinux contexts -chown -R liveuser:liveuser /home/liveuser/ -restorecon -R /home/liveuser/ -restorecon -R / - -EOF +sed -i 's/^livesys_session=.*/livesys_session="gnome"/' /etc/sysconfig/livesys %end diff --git a/live/9/ppc64le/peridot/rocky-live-xfce.ks b/live/9/ppc64le/peridot/rocky-live-xfce.ks index 6f6a94f..3e4c5b7 100644 --- a/live/9/ppc64le/peridot/rocky-live-xfce.ks +++ b/live/9/ppc64le/peridot/rocky-live-xfce.ks @@ -16,49 +16,6 @@ PREFERRED=/usr/bin/startxfce4 DISPLAYMANAGER=/usr/sbin/lightdm EOF -cat >> /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 - # set default background cat > /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml < @@ -78,36 +35,7 @@ cat > /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml < XFCEEOF -# 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 - -cat > ~liveuser/.profile << PROFILE_EOF -export XDG_DATA_DIRS="\\\${XDG_DATA_DIRS}:\\\${HOME}/Desktop" -PROFILE_EOF - -# 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 -restorecon -R / - -EOF +sed -i 's/^livesys_session=.*/livesys_session="xfce"/' /etc/sysconfig/livesys # this doesn't come up automatically. not sure why. systemctl enable --force lightdm.service diff --git a/live/9/ppc64le/prod/rocky-live-base-spin.ks b/live/9/ppc64le/prod/rocky-live-base-spin.ks index 68b0622..fda7792 100644 --- a/live/9/ppc64le/prod/rocky-live-base-spin.ks +++ b/live/9/ppc64le/prod/rocky-live-base-spin.ks @@ -38,6 +38,7 @@ kernel-modules-extra anaconda anaconda-install-env-deps anaconda-live +livesys-scripts @anaconda-tools efi-filesystem grub2-common @@ -76,231 +77,8 @@ epel-release %end %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 <\ - %if exists(f):\ - install ${f} ${LIVEDIR}/${f|basename}\ - %endif\ - ' /usr/share/lorax/templates.d/99-generic/live/x86.tmpl -fi - -%end diff --git a/live/9/ppc64le/prod/rocky-live-base.ks b/live/9/ppc64le/prod/rocky-live-base.ks index b0b2925..17a0ebd 100644 --- a/live/9/ppc64le/prod/rocky-live-base.ks +++ b/live/9/ppc64le/prod/rocky-live-base.ks @@ -37,6 +37,7 @@ kernel-modules-extra anaconda anaconda-install-env-deps anaconda-live +livesys-scripts @anaconda-tools efi-filesystem grub2-common @@ -72,231 +73,8 @@ chkconfig %end %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 <\ - %if exists(f):\ - install ${f} ${LIVEDIR}/${f|basename}\ - %endif\ - ' /usr/share/lorax/templates.d/99-generic/live/x86.tmpl -fi - -%end diff --git a/live/9/ppc64le/prod/rocky-live-cinnamon.ks b/live/9/ppc64le/prod/rocky-live-cinnamon.ks index b86fe38..9a5c562 100644 --- a/live/9/ppc64le/prod/rocky-live-cinnamon.ks +++ b/live/9/ppc64le/prod/rocky-live-cinnamon.ks @@ -13,47 +13,7 @@ PREFERRED=/usr/bin/cinnamon-session DISPLAYMANAGER=/usr/sbin/lightdm EOF -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 -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 +sed -i 's/^livesys_session=.*/livesys_session="cinnamon"/' /etc/sysconfig/livesys # this doesn't come up automatically. not sure why. systemctl enable --force lightdm.service diff --git a/live/9/ppc64le/prod/rocky-live-kde-base.ks b/live/9/ppc64le/prod/rocky-live-kde-base.ks index 4da7880..4550987 100644 --- a/live/9/ppc64le/prod/rocky-live-kde-base.ks +++ b/live/9/ppc64le/prod/rocky-live-kde-base.ks @@ -5,6 +5,8 @@ %post +sed -i 's/^livesys_session=.*/livesys_session="kde"/' /etc/sysconfig/livesys + # set default GTK+ theme for root (see #683855, #689070, #808062) cat > /root/.gtkrc-2.0 << EOF include "/usr/share/themes/Adwaita/gtk-2.0/gtkrc" @@ -20,105 +22,6 @@ 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 - -# are we *not* able to use wayland sessions? -if strstr "\`cat /proc/cmdline\`" nomodeset ; then -PLASMA_SESSION_FILE="plasmax11.desktop" -else -PLASMA_SESSION_FILE="plasma.desktop" -fi - -# set up autologin for user liveuser -if [ -f /etc/sddm.conf ]; then -sed -i 's/^#User=.*/User=liveuser/' /etc/sddm.conf -sed -i "s/^#Session=.*/Session=\${PLASMA_SESSION_FILE}/" /etc/sddm.conf -else -cat > /etc/sddm.conf << SDDM_EOF -[Autologin] -User=liveuser -Session=\${PLASMA_SESSION_FILE} -SDDM_EOF -fi - -# add liveinst.desktop to favorites menu -mkdir -p /home/liveuser/.config/ -cat > /home/liveuser/.config/kickoffrc << MENU_EOF -[Favorites] -FavoriteURLs=/usr/share/applications/firefox.desktop,/usr/share/applications/org.kde.dolphin.desktop,/usr/share/applications/systemsettings.desktop,/usr/share/applications/org.kde.konsole.desktop,/usr/share/applications/liveinst.desktop -MENU_EOF - -# show liveinst.desktop on desktop and in menu -sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop -# set executable bit disable KDE security warning -chmod +x /usr/share/applications/liveinst.desktop -mkdir /home/liveuser/Desktop -cp -a /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 - -# Set akonadi backend -mkdir -p /home/liveuser/.config/akonadi -cat > /home/liveuser/.config/akonadi/akonadiserverrc << AKONADI_EOF -[%General] -Driver=QSQLITE3 -AKONADI_EOF - -# "Disable plasma-discover-notifier" -mkdir -p /home/liveuser/.config/autostart -cp -a /etc/xdg/autostart/org.kde.discover.notifier.desktop /home/liveuser/.config/autostart/ -echo 'Hidden=true' >> /home/liveuser/.config/autostart/org.kde.discover.notifier.desktop - -# Disable baloo -cat > /home/liveuser/.config/baloofilerc << BALOO_EOF -[Basic Settings] -Indexing-Enabled=false -BALOO_EOF - -# Disable kres-migrator -cat > /home/liveuser/.kde/share/config/kres-migratorrc << KRES_EOF -[Migration] -Enabled=false -KRES_EOF - -# Disable kwallet migrator -cat > /home/liveuser/.config/kwalletrc << KWALLET_EOL -[Migration] -alreadyMigrated=true -KWALLET_EOL -# Disable automount of 'known' devices -# https://bugzilla.redhat.com/show_bug.cgi?id=2073708 -cat > /home/liveuser/.config/kded_device_automounterrc << AUTOMOUNTER_EOF -[General] -AutomountEnabled=false -AutomountOnLogin=false -AutomountOnPlugin=false -AUTOMOUNTER_EOF - -# disable kdeconnect -cat > /home/liveuser/.config/autostart/org.kde.kdeconnect.daemon.desktop << KDECONNECT_EOF -[Desktop Entry] -Hidden=true -KDECONNECT_EOF -mkdir -p /home/liveuser/.local/share/dbus-1/services/ -cat > /home/liveuser/.local/share/dbus-1/services/org.kde.kdeconnect.service << DBUS_EOF -[D-BUS Service] -Name=org.kde.kdeconnect -Exec=/usr/bin/false -DBUS_EOF - -# make sure to set the right permissions and selinux contexts -chown -R liveuser:liveuser /home/liveuser/ -restorecon -R /home/liveuser/ -restorecon -R / - -EOF - systemctl enable --force sddm.service dnf config-manager --set-enabled crb diff --git a/live/9/ppc64le/prod/rocky-live-mate.ks b/live/9/ppc64le/prod/rocky-live-mate.ks index 5bb4105..3154533 100644 --- a/live/9/ppc64le/prod/rocky-live-mate.ks +++ b/live/9/ppc64le/prod/rocky-live-mate.ks @@ -9,50 +9,7 @@ part / --size 7168 %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 +sed -i 's/^livesys_session=.*/livesys_session="mate"/' /etc/sysconfig/livesys # this doesn't come up automatically. not sure why. systemctl enable --force lightdm.service diff --git a/live/9/ppc64le/prod/rocky-live-workstation-lite.ks b/live/9/ppc64le/prod/rocky-live-workstation-lite.ks index f9511ee..28f8f96 100644 --- a/live/9/ppc64le/prod/rocky-live-workstation-lite.ks +++ b/live/9/ppc64le/prod/rocky-live-workstation-lite.ks @@ -13,89 +13,6 @@ part / --size 7750 %post -cat >> /etc/rc.d/init.d/livesys << EOF - - -# disable gnome-software automatically downloading updates -cat >> /usr/share/glib-2.0/schemas/org.gnome.software.gschema.override << FOE -[org.gnome.software] -download-updates=false -FOE - -# don't autostart gnome-software session service -rm -f /etc/xdg/autostart/gnome-software-service.desktop - -# disable the gnome-software shell search provider -cat >> /usr/share/gnome-shell/search-providers/org.gnome.Software-search-provider.ini << FOE -DefaultDisabled=true -FOE - -# don't run gnome-initial-setup -mkdir ~liveuser/.config -touch ~liveuser/.config/gnome-initial-setup-done - -# suppress anaconda spokes redundant with gnome-initial-setup -cat >> /etc/sysconfig/anaconda << FOE -[NetworkSpoke] -visited=1 - -[PasswordSpoke] -visited=1 - -[UserSpoke] -visited=1 -FOE - -# make the installer show up -if [ -f /usr/share/applications/liveinst.desktop ]; then - # Show harddisk install in shell dash - sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop "" - # need to move it to anaconda.desktop to make shell happy - mv /usr/share/applications/liveinst.desktop /usr/share/applications/anaconda.desktop - - cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE -[org.gnome.shell] -favorite-apps=['firefox.desktop', 'evolution.desktop', 'org.gnome.Nautilus.desktop', 'anaconda.desktop'] -FOE - - # Make the welcome screen show up - if [ -f /usr/share/anaconda/gnome/fedora-welcome.desktop ]; then - mkdir -p ~liveuser/.config/autostart - cp /usr/share/anaconda/gnome/fedora-welcome.desktop /usr/share/applications/ - cp /usr/share/anaconda/gnome/fedora-welcome.desktop ~liveuser/.config/autostart/ - fi - - # Disable GNOME welcome tour so it doesn't overlap with Fedora welcome screen - cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE -welcome-dialog-last-shown-version='4294967295' -FOE - - # Copy Anaconda branding in place - if [ -d /usr/share/lorax/product/usr/share/anaconda ]; then - cp -a /usr/share/lorax/product/* / - fi -fi - -# rebuild schema cache with any overrides we installed -glib-compile-schemas /usr/share/glib-2.0/schemas - -# set up auto-login -cat > /etc/gdm/custom.conf << FOE -[daemon] -AutomaticLoginEnable=True -AutomaticLogin=liveuser -FOE - -# Turn off PackageKit-command-not-found while uninstalled -if [ -f /etc/PackageKit/CommandNotFound.conf ]; then - sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf -fi - -# make sure to set the right permissions and selinux contexts -chown -R liveuser:liveuser /home/liveuser/ -restorecon -R /home/liveuser/ -restorecon -R / - -EOF +sed -i 's/^livesys_session=.*/livesys_session="gnome"/' /etc/sysconfig/livesys %end diff --git a/live/9/ppc64le/prod/rocky-live-workstation.ks b/live/9/ppc64le/prod/rocky-live-workstation.ks index 7266a6f..3a5c9b5 100644 --- a/live/9/ppc64le/prod/rocky-live-workstation.ks +++ b/live/9/ppc64le/prod/rocky-live-workstation.ks @@ -13,90 +13,6 @@ part / --size 7750 %post -cat >> /etc/rc.d/init.d/livesys << EOF - - -# disable gnome-software automatically downloading updates -cat >> /usr/share/glib-2.0/schemas/org.gnome.software.gschema.override << FOE -[org.gnome.software] -allow-updates=false -download-updates=false -FOE - -# don't autostart gnome-software session service -rm -f /etc/xdg/autostart/gnome-software-service.desktop - -# disable the gnome-software shell search provider -cat >> /usr/share/gnome-shell/search-providers/org.gnome.Software-search-provider.ini << FOE -DefaultDisabled=true -FOE - -# don't run gnome-initial-setup -mkdir ~liveuser/.config -touch ~liveuser/.config/gnome-initial-setup-done - -# suppress anaconda spokes redundant with gnome-initial-setup -cat >> /etc/sysconfig/anaconda << FOE -[NetworkSpoke] -visited=1 - -[PasswordSpoke] -visited=1 - -[UserSpoke] -visited=1 -FOE - -# make the installer show up -if [ -f /usr/share/applications/liveinst.desktop ]; then - # Show harddisk install in shell dash - sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop "" - # need to move it to anaconda.desktop to make shell happy - mv /usr/share/applications/liveinst.desktop /usr/share/applications/anaconda.desktop - - cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE -[org.gnome.shell] -favorite-apps=['firefox.desktop', 'evolution.desktop', 'org.gnome.Nautilus.desktop', 'anaconda.desktop'] -FOE - - # Make the welcome screen show up - if [ -f /usr/share/anaconda/gnome/fedora-welcome.desktop ]; then - mkdir -p ~liveuser/.config/autostart - cp /usr/share/anaconda/gnome/fedora-welcome.desktop /usr/share/applications/ - cp /usr/share/anaconda/gnome/fedora-welcome.desktop ~liveuser/.config/autostart/ - fi - - # Disable GNOME welcome tour so it doesn't overlap with Fedora welcome screen - cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE -welcome-dialog-last-shown-version='4294967295' -FOE - - # Copy Anaconda branding in place - if [ -d /usr/share/lorax/product/usr/share/anaconda ]; then - cp -a /usr/share/lorax/product/* / - fi -fi - -# rebuild schema cache with any overrides we installed -glib-compile-schemas /usr/share/glib-2.0/schemas - -# set up auto-login -cat > /etc/gdm/custom.conf << FOE -[daemon] -AutomaticLoginEnable=True -AutomaticLogin=liveuser -FOE - -# Turn off PackageKit-command-not-found while uninstalled -if [ -f /etc/PackageKit/CommandNotFound.conf ]; then - sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf -fi - -# make sure to set the right permissions and selinux contexts -chown -R liveuser:liveuser /home/liveuser/ -restorecon -R /home/liveuser/ -restorecon -R / - -EOF +sed -i 's/^livesys_session=.*/livesys_session="gnome"/' /etc/sysconfig/livesys %end diff --git a/live/9/ppc64le/prod/rocky-live-xfce.ks b/live/9/ppc64le/prod/rocky-live-xfce.ks index 6f6a94f..3e4c5b7 100644 --- a/live/9/ppc64le/prod/rocky-live-xfce.ks +++ b/live/9/ppc64le/prod/rocky-live-xfce.ks @@ -16,49 +16,6 @@ PREFERRED=/usr/bin/startxfce4 DISPLAYMANAGER=/usr/sbin/lightdm EOF -cat >> /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 - # set default background cat > /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml < @@ -78,36 +35,7 @@ cat > /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml < XFCEEOF -# 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 - -cat > ~liveuser/.profile << PROFILE_EOF -export XDG_DATA_DIRS="\\\${XDG_DATA_DIRS}:\\\${HOME}/Desktop" -PROFILE_EOF - -# 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 -restorecon -R / - -EOF +sed -i 's/^livesys_session=.*/livesys_session="xfce"/' /etc/sysconfig/livesys # this doesn't come up automatically. not sure why. systemctl enable --force lightdm.service diff --git a/live/9/ppc64le/stage/rocky-live-base-spin.ks b/live/9/ppc64le/stage/rocky-live-base-spin.ks index 68b0622..fda7792 100644 --- a/live/9/ppc64le/stage/rocky-live-base-spin.ks +++ b/live/9/ppc64le/stage/rocky-live-base-spin.ks @@ -38,6 +38,7 @@ kernel-modules-extra anaconda anaconda-install-env-deps anaconda-live +livesys-scripts @anaconda-tools efi-filesystem grub2-common @@ -76,231 +77,8 @@ epel-release %end %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 <\ - %if exists(f):\ - install ${f} ${LIVEDIR}/${f|basename}\ - %endif\ - ' /usr/share/lorax/templates.d/99-generic/live/x86.tmpl -fi - -%end diff --git a/live/9/ppc64le/stage/rocky-live-base.ks b/live/9/ppc64le/stage/rocky-live-base.ks index b0b2925..17a0ebd 100644 --- a/live/9/ppc64le/stage/rocky-live-base.ks +++ b/live/9/ppc64le/stage/rocky-live-base.ks @@ -37,6 +37,7 @@ kernel-modules-extra anaconda anaconda-install-env-deps anaconda-live +livesys-scripts @anaconda-tools efi-filesystem grub2-common @@ -72,231 +73,8 @@ chkconfig %end %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 <\ - %if exists(f):\ - install ${f} ${LIVEDIR}/${f|basename}\ - %endif\ - ' /usr/share/lorax/templates.d/99-generic/live/x86.tmpl -fi - -%end diff --git a/live/9/ppc64le/stage/rocky-live-cinnamon.ks b/live/9/ppc64le/stage/rocky-live-cinnamon.ks index b86fe38..9a5c562 100644 --- a/live/9/ppc64le/stage/rocky-live-cinnamon.ks +++ b/live/9/ppc64le/stage/rocky-live-cinnamon.ks @@ -13,47 +13,7 @@ PREFERRED=/usr/bin/cinnamon-session DISPLAYMANAGER=/usr/sbin/lightdm EOF -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 -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 +sed -i 's/^livesys_session=.*/livesys_session="cinnamon"/' /etc/sysconfig/livesys # this doesn't come up automatically. not sure why. systemctl enable --force lightdm.service diff --git a/live/9/ppc64le/stage/rocky-live-kde-base.ks b/live/9/ppc64le/stage/rocky-live-kde-base.ks index 4da7880..4550987 100644 --- a/live/9/ppc64le/stage/rocky-live-kde-base.ks +++ b/live/9/ppc64le/stage/rocky-live-kde-base.ks @@ -5,6 +5,8 @@ %post +sed -i 's/^livesys_session=.*/livesys_session="kde"/' /etc/sysconfig/livesys + # set default GTK+ theme for root (see #683855, #689070, #808062) cat > /root/.gtkrc-2.0 << EOF include "/usr/share/themes/Adwaita/gtk-2.0/gtkrc" @@ -20,105 +22,6 @@ 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 - -# are we *not* able to use wayland sessions? -if strstr "\`cat /proc/cmdline\`" nomodeset ; then -PLASMA_SESSION_FILE="plasmax11.desktop" -else -PLASMA_SESSION_FILE="plasma.desktop" -fi - -# set up autologin for user liveuser -if [ -f /etc/sddm.conf ]; then -sed -i 's/^#User=.*/User=liveuser/' /etc/sddm.conf -sed -i "s/^#Session=.*/Session=\${PLASMA_SESSION_FILE}/" /etc/sddm.conf -else -cat > /etc/sddm.conf << SDDM_EOF -[Autologin] -User=liveuser -Session=\${PLASMA_SESSION_FILE} -SDDM_EOF -fi - -# add liveinst.desktop to favorites menu -mkdir -p /home/liveuser/.config/ -cat > /home/liveuser/.config/kickoffrc << MENU_EOF -[Favorites] -FavoriteURLs=/usr/share/applications/firefox.desktop,/usr/share/applications/org.kde.dolphin.desktop,/usr/share/applications/systemsettings.desktop,/usr/share/applications/org.kde.konsole.desktop,/usr/share/applications/liveinst.desktop -MENU_EOF - -# show liveinst.desktop on desktop and in menu -sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop -# set executable bit disable KDE security warning -chmod +x /usr/share/applications/liveinst.desktop -mkdir /home/liveuser/Desktop -cp -a /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 - -# Set akonadi backend -mkdir -p /home/liveuser/.config/akonadi -cat > /home/liveuser/.config/akonadi/akonadiserverrc << AKONADI_EOF -[%General] -Driver=QSQLITE3 -AKONADI_EOF - -# "Disable plasma-discover-notifier" -mkdir -p /home/liveuser/.config/autostart -cp -a /etc/xdg/autostart/org.kde.discover.notifier.desktop /home/liveuser/.config/autostart/ -echo 'Hidden=true' >> /home/liveuser/.config/autostart/org.kde.discover.notifier.desktop - -# Disable baloo -cat > /home/liveuser/.config/baloofilerc << BALOO_EOF -[Basic Settings] -Indexing-Enabled=false -BALOO_EOF - -# Disable kres-migrator -cat > /home/liveuser/.kde/share/config/kres-migratorrc << KRES_EOF -[Migration] -Enabled=false -KRES_EOF - -# Disable kwallet migrator -cat > /home/liveuser/.config/kwalletrc << KWALLET_EOL -[Migration] -alreadyMigrated=true -KWALLET_EOL -# Disable automount of 'known' devices -# https://bugzilla.redhat.com/show_bug.cgi?id=2073708 -cat > /home/liveuser/.config/kded_device_automounterrc << AUTOMOUNTER_EOF -[General] -AutomountEnabled=false -AutomountOnLogin=false -AutomountOnPlugin=false -AUTOMOUNTER_EOF - -# disable kdeconnect -cat > /home/liveuser/.config/autostart/org.kde.kdeconnect.daemon.desktop << KDECONNECT_EOF -[Desktop Entry] -Hidden=true -KDECONNECT_EOF -mkdir -p /home/liveuser/.local/share/dbus-1/services/ -cat > /home/liveuser/.local/share/dbus-1/services/org.kde.kdeconnect.service << DBUS_EOF -[D-BUS Service] -Name=org.kde.kdeconnect -Exec=/usr/bin/false -DBUS_EOF - -# make sure to set the right permissions and selinux contexts -chown -R liveuser:liveuser /home/liveuser/ -restorecon -R /home/liveuser/ -restorecon -R / - -EOF - systemctl enable --force sddm.service dnf config-manager --set-enabled crb diff --git a/live/9/ppc64le/stage/rocky-live-mate.ks b/live/9/ppc64le/stage/rocky-live-mate.ks index 5bb4105..3154533 100644 --- a/live/9/ppc64le/stage/rocky-live-mate.ks +++ b/live/9/ppc64le/stage/rocky-live-mate.ks @@ -9,50 +9,7 @@ part / --size 7168 %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 +sed -i 's/^livesys_session=.*/livesys_session="mate"/' /etc/sysconfig/livesys # this doesn't come up automatically. not sure why. systemctl enable --force lightdm.service diff --git a/live/9/ppc64le/stage/rocky-live-workstation-lite.ks b/live/9/ppc64le/stage/rocky-live-workstation-lite.ks index f9511ee..28f8f96 100644 --- a/live/9/ppc64le/stage/rocky-live-workstation-lite.ks +++ b/live/9/ppc64le/stage/rocky-live-workstation-lite.ks @@ -13,89 +13,6 @@ part / --size 7750 %post -cat >> /etc/rc.d/init.d/livesys << EOF - - -# disable gnome-software automatically downloading updates -cat >> /usr/share/glib-2.0/schemas/org.gnome.software.gschema.override << FOE -[org.gnome.software] -download-updates=false -FOE - -# don't autostart gnome-software session service -rm -f /etc/xdg/autostart/gnome-software-service.desktop - -# disable the gnome-software shell search provider -cat >> /usr/share/gnome-shell/search-providers/org.gnome.Software-search-provider.ini << FOE -DefaultDisabled=true -FOE - -# don't run gnome-initial-setup -mkdir ~liveuser/.config -touch ~liveuser/.config/gnome-initial-setup-done - -# suppress anaconda spokes redundant with gnome-initial-setup -cat >> /etc/sysconfig/anaconda << FOE -[NetworkSpoke] -visited=1 - -[PasswordSpoke] -visited=1 - -[UserSpoke] -visited=1 -FOE - -# make the installer show up -if [ -f /usr/share/applications/liveinst.desktop ]; then - # Show harddisk install in shell dash - sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop "" - # need to move it to anaconda.desktop to make shell happy - mv /usr/share/applications/liveinst.desktop /usr/share/applications/anaconda.desktop - - cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE -[org.gnome.shell] -favorite-apps=['firefox.desktop', 'evolution.desktop', 'org.gnome.Nautilus.desktop', 'anaconda.desktop'] -FOE - - # Make the welcome screen show up - if [ -f /usr/share/anaconda/gnome/fedora-welcome.desktop ]; then - mkdir -p ~liveuser/.config/autostart - cp /usr/share/anaconda/gnome/fedora-welcome.desktop /usr/share/applications/ - cp /usr/share/anaconda/gnome/fedora-welcome.desktop ~liveuser/.config/autostart/ - fi - - # Disable GNOME welcome tour so it doesn't overlap with Fedora welcome screen - cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE -welcome-dialog-last-shown-version='4294967295' -FOE - - # Copy Anaconda branding in place - if [ -d /usr/share/lorax/product/usr/share/anaconda ]; then - cp -a /usr/share/lorax/product/* / - fi -fi - -# rebuild schema cache with any overrides we installed -glib-compile-schemas /usr/share/glib-2.0/schemas - -# set up auto-login -cat > /etc/gdm/custom.conf << FOE -[daemon] -AutomaticLoginEnable=True -AutomaticLogin=liveuser -FOE - -# Turn off PackageKit-command-not-found while uninstalled -if [ -f /etc/PackageKit/CommandNotFound.conf ]; then - sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf -fi - -# make sure to set the right permissions and selinux contexts -chown -R liveuser:liveuser /home/liveuser/ -restorecon -R /home/liveuser/ -restorecon -R / - -EOF +sed -i 's/^livesys_session=.*/livesys_session="gnome"/' /etc/sysconfig/livesys %end diff --git a/live/9/ppc64le/stage/rocky-live-workstation.ks b/live/9/ppc64le/stage/rocky-live-workstation.ks index 7266a6f..3a5c9b5 100644 --- a/live/9/ppc64le/stage/rocky-live-workstation.ks +++ b/live/9/ppc64le/stage/rocky-live-workstation.ks @@ -13,90 +13,6 @@ part / --size 7750 %post -cat >> /etc/rc.d/init.d/livesys << EOF - - -# disable gnome-software automatically downloading updates -cat >> /usr/share/glib-2.0/schemas/org.gnome.software.gschema.override << FOE -[org.gnome.software] -allow-updates=false -download-updates=false -FOE - -# don't autostart gnome-software session service -rm -f /etc/xdg/autostart/gnome-software-service.desktop - -# disable the gnome-software shell search provider -cat >> /usr/share/gnome-shell/search-providers/org.gnome.Software-search-provider.ini << FOE -DefaultDisabled=true -FOE - -# don't run gnome-initial-setup -mkdir ~liveuser/.config -touch ~liveuser/.config/gnome-initial-setup-done - -# suppress anaconda spokes redundant with gnome-initial-setup -cat >> /etc/sysconfig/anaconda << FOE -[NetworkSpoke] -visited=1 - -[PasswordSpoke] -visited=1 - -[UserSpoke] -visited=1 -FOE - -# make the installer show up -if [ -f /usr/share/applications/liveinst.desktop ]; then - # Show harddisk install in shell dash - sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop "" - # need to move it to anaconda.desktop to make shell happy - mv /usr/share/applications/liveinst.desktop /usr/share/applications/anaconda.desktop - - cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE -[org.gnome.shell] -favorite-apps=['firefox.desktop', 'evolution.desktop', 'org.gnome.Nautilus.desktop', 'anaconda.desktop'] -FOE - - # Make the welcome screen show up - if [ -f /usr/share/anaconda/gnome/fedora-welcome.desktop ]; then - mkdir -p ~liveuser/.config/autostart - cp /usr/share/anaconda/gnome/fedora-welcome.desktop /usr/share/applications/ - cp /usr/share/anaconda/gnome/fedora-welcome.desktop ~liveuser/.config/autostart/ - fi - - # Disable GNOME welcome tour so it doesn't overlap with Fedora welcome screen - cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE -welcome-dialog-last-shown-version='4294967295' -FOE - - # Copy Anaconda branding in place - if [ -d /usr/share/lorax/product/usr/share/anaconda ]; then - cp -a /usr/share/lorax/product/* / - fi -fi - -# rebuild schema cache with any overrides we installed -glib-compile-schemas /usr/share/glib-2.0/schemas - -# set up auto-login -cat > /etc/gdm/custom.conf << FOE -[daemon] -AutomaticLoginEnable=True -AutomaticLogin=liveuser -FOE - -# Turn off PackageKit-command-not-found while uninstalled -if [ -f /etc/PackageKit/CommandNotFound.conf ]; then - sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf -fi - -# make sure to set the right permissions and selinux contexts -chown -R liveuser:liveuser /home/liveuser/ -restorecon -R /home/liveuser/ -restorecon -R / - -EOF +sed -i 's/^livesys_session=.*/livesys_session="gnome"/' /etc/sysconfig/livesys %end diff --git a/live/9/ppc64le/stage/rocky-live-xfce.ks b/live/9/ppc64le/stage/rocky-live-xfce.ks index 6f6a94f..3e4c5b7 100644 --- a/live/9/ppc64le/stage/rocky-live-xfce.ks +++ b/live/9/ppc64le/stage/rocky-live-xfce.ks @@ -16,49 +16,6 @@ PREFERRED=/usr/bin/startxfce4 DISPLAYMANAGER=/usr/sbin/lightdm EOF -cat >> /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 - # set default background cat > /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml < @@ -78,36 +35,7 @@ cat > /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml < XFCEEOF -# 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 - -cat > ~liveuser/.profile << PROFILE_EOF -export XDG_DATA_DIRS="\\\${XDG_DATA_DIRS}:\\\${HOME}/Desktop" -PROFILE_EOF - -# 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 -restorecon -R / - -EOF +sed -i 's/^livesys_session=.*/livesys_session="xfce"/' /etc/sysconfig/livesys # this doesn't come up automatically. not sure why. systemctl enable --force lightdm.service diff --git a/live/9/x86_64/peridot/mainline/rocky-live-base.ks b/live/9/x86_64/peridot/mainline/rocky-live-base.ks index 01a2c24..de8bd41 100644 --- a/live/9/x86_64/peridot/mainline/rocky-live-base.ks +++ b/live/9/x86_64/peridot/mainline/rocky-live-base.ks @@ -39,6 +39,7 @@ memtest86+ anaconda anaconda-install-env-deps anaconda-live +livesys-scripts @anaconda-tools # Required for SVG rnotes images diff --git a/live/9/x86_64/peridot/rocky-live-base-spin.ks b/live/9/x86_64/peridot/rocky-live-base-spin.ks index 6bc0360..8987163 100644 --- a/live/9/x86_64/peridot/rocky-live-base-spin.ks +++ b/live/9/x86_64/peridot/rocky-live-base-spin.ks @@ -39,6 +39,7 @@ memtest86+ anaconda anaconda-install-env-deps anaconda-live +livesys-scripts @anaconda-tools efi-filesystem efivar-libs @@ -74,231 +75,8 @@ epel-release %end %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 <\ - %if exists(f):\ - install ${f} ${LIVEDIR}/${f|basename}\ - %endif\ - ' /usr/share/lorax/templates.d/99-generic/live/x86.tmpl -fi - -%end diff --git a/live/9/x86_64/peridot/rocky-live-base.ks b/live/9/x86_64/peridot/rocky-live-base.ks index c7a5805..079379a 100644 --- a/live/9/x86_64/peridot/rocky-live-base.ks +++ b/live/9/x86_64/peridot/rocky-live-base.ks @@ -38,6 +38,7 @@ memtest86+ anaconda anaconda-install-env-deps anaconda-live +livesys-scripts @anaconda-tools efi-filesystem efivar-libs @@ -70,231 +71,8 @@ chkconfig %end %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 <\ - %if exists(f):\ - install ${f} ${LIVEDIR}/${f|basename}\ - %endif\ - ' /usr/share/lorax/templates.d/99-generic/live/x86.tmpl -fi - -%end diff --git a/live/9/x86_64/peridot/rocky-live-cinnamon.ks b/live/9/x86_64/peridot/rocky-live-cinnamon.ks index b86fe38..9a5c562 100644 --- a/live/9/x86_64/peridot/rocky-live-cinnamon.ks +++ b/live/9/x86_64/peridot/rocky-live-cinnamon.ks @@ -13,47 +13,7 @@ PREFERRED=/usr/bin/cinnamon-session DISPLAYMANAGER=/usr/sbin/lightdm EOF -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 -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 +sed -i 's/^livesys_session=.*/livesys_session="cinnamon"/' /etc/sysconfig/livesys # this doesn't come up automatically. not sure why. systemctl enable --force lightdm.service 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 4da7880..4550987 100644 --- a/live/9/x86_64/peridot/rocky-live-kde-base.ks +++ b/live/9/x86_64/peridot/rocky-live-kde-base.ks @@ -5,6 +5,8 @@ %post +sed -i 's/^livesys_session=.*/livesys_session="kde"/' /etc/sysconfig/livesys + # set default GTK+ theme for root (see #683855, #689070, #808062) cat > /root/.gtkrc-2.0 << EOF include "/usr/share/themes/Adwaita/gtk-2.0/gtkrc" @@ -20,105 +22,6 @@ 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 - -# are we *not* able to use wayland sessions? -if strstr "\`cat /proc/cmdline\`" nomodeset ; then -PLASMA_SESSION_FILE="plasmax11.desktop" -else -PLASMA_SESSION_FILE="plasma.desktop" -fi - -# set up autologin for user liveuser -if [ -f /etc/sddm.conf ]; then -sed -i 's/^#User=.*/User=liveuser/' /etc/sddm.conf -sed -i "s/^#Session=.*/Session=\${PLASMA_SESSION_FILE}/" /etc/sddm.conf -else -cat > /etc/sddm.conf << SDDM_EOF -[Autologin] -User=liveuser -Session=\${PLASMA_SESSION_FILE} -SDDM_EOF -fi - -# add liveinst.desktop to favorites menu -mkdir -p /home/liveuser/.config/ -cat > /home/liveuser/.config/kickoffrc << MENU_EOF -[Favorites] -FavoriteURLs=/usr/share/applications/firefox.desktop,/usr/share/applications/org.kde.dolphin.desktop,/usr/share/applications/systemsettings.desktop,/usr/share/applications/org.kde.konsole.desktop,/usr/share/applications/liveinst.desktop -MENU_EOF - -# show liveinst.desktop on desktop and in menu -sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop -# set executable bit disable KDE security warning -chmod +x /usr/share/applications/liveinst.desktop -mkdir /home/liveuser/Desktop -cp -a /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 - -# Set akonadi backend -mkdir -p /home/liveuser/.config/akonadi -cat > /home/liveuser/.config/akonadi/akonadiserverrc << AKONADI_EOF -[%General] -Driver=QSQLITE3 -AKONADI_EOF - -# "Disable plasma-discover-notifier" -mkdir -p /home/liveuser/.config/autostart -cp -a /etc/xdg/autostart/org.kde.discover.notifier.desktop /home/liveuser/.config/autostart/ -echo 'Hidden=true' >> /home/liveuser/.config/autostart/org.kde.discover.notifier.desktop - -# Disable baloo -cat > /home/liveuser/.config/baloofilerc << BALOO_EOF -[Basic Settings] -Indexing-Enabled=false -BALOO_EOF - -# Disable kres-migrator -cat > /home/liveuser/.kde/share/config/kres-migratorrc << KRES_EOF -[Migration] -Enabled=false -KRES_EOF - -# Disable kwallet migrator -cat > /home/liveuser/.config/kwalletrc << KWALLET_EOL -[Migration] -alreadyMigrated=true -KWALLET_EOL -# Disable automount of 'known' devices -# https://bugzilla.redhat.com/show_bug.cgi?id=2073708 -cat > /home/liveuser/.config/kded_device_automounterrc << AUTOMOUNTER_EOF -[General] -AutomountEnabled=false -AutomountOnLogin=false -AutomountOnPlugin=false -AUTOMOUNTER_EOF - -# disable kdeconnect -cat > /home/liveuser/.config/autostart/org.kde.kdeconnect.daemon.desktop << KDECONNECT_EOF -[Desktop Entry] -Hidden=true -KDECONNECT_EOF -mkdir -p /home/liveuser/.local/share/dbus-1/services/ -cat > /home/liveuser/.local/share/dbus-1/services/org.kde.kdeconnect.service << DBUS_EOF -[D-BUS Service] -Name=org.kde.kdeconnect -Exec=/usr/bin/false -DBUS_EOF - -# make sure to set the right permissions and selinux contexts -chown -R liveuser:liveuser /home/liveuser/ -restorecon -R /home/liveuser/ -restorecon -R / - -EOF - systemctl enable --force sddm.service dnf config-manager --set-enabled crb diff --git a/live/9/x86_64/peridot/rocky-live-mate.ks b/live/9/x86_64/peridot/rocky-live-mate.ks index 5bb4105..3154533 100644 --- a/live/9/x86_64/peridot/rocky-live-mate.ks +++ b/live/9/x86_64/peridot/rocky-live-mate.ks @@ -9,50 +9,7 @@ part / --size 7168 %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 +sed -i 's/^livesys_session=.*/livesys_session="mate"/' /etc/sysconfig/livesys # this doesn't come up automatically. not sure why. systemctl enable --force lightdm.service diff --git a/live/9/x86_64/peridot/rocky-live-workstation-lite.ks b/live/9/x86_64/peridot/rocky-live-workstation-lite.ks index f9511ee..28f8f96 100644 --- a/live/9/x86_64/peridot/rocky-live-workstation-lite.ks +++ b/live/9/x86_64/peridot/rocky-live-workstation-lite.ks @@ -13,89 +13,6 @@ part / --size 7750 %post -cat >> /etc/rc.d/init.d/livesys << EOF - - -# disable gnome-software automatically downloading updates -cat >> /usr/share/glib-2.0/schemas/org.gnome.software.gschema.override << FOE -[org.gnome.software] -download-updates=false -FOE - -# don't autostart gnome-software session service -rm -f /etc/xdg/autostart/gnome-software-service.desktop - -# disable the gnome-software shell search provider -cat >> /usr/share/gnome-shell/search-providers/org.gnome.Software-search-provider.ini << FOE -DefaultDisabled=true -FOE - -# don't run gnome-initial-setup -mkdir ~liveuser/.config -touch ~liveuser/.config/gnome-initial-setup-done - -# suppress anaconda spokes redundant with gnome-initial-setup -cat >> /etc/sysconfig/anaconda << FOE -[NetworkSpoke] -visited=1 - -[PasswordSpoke] -visited=1 - -[UserSpoke] -visited=1 -FOE - -# make the installer show up -if [ -f /usr/share/applications/liveinst.desktop ]; then - # Show harddisk install in shell dash - sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop "" - # need to move it to anaconda.desktop to make shell happy - mv /usr/share/applications/liveinst.desktop /usr/share/applications/anaconda.desktop - - cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE -[org.gnome.shell] -favorite-apps=['firefox.desktop', 'evolution.desktop', 'org.gnome.Nautilus.desktop', 'anaconda.desktop'] -FOE - - # Make the welcome screen show up - if [ -f /usr/share/anaconda/gnome/fedora-welcome.desktop ]; then - mkdir -p ~liveuser/.config/autostart - cp /usr/share/anaconda/gnome/fedora-welcome.desktop /usr/share/applications/ - cp /usr/share/anaconda/gnome/fedora-welcome.desktop ~liveuser/.config/autostart/ - fi - - # Disable GNOME welcome tour so it doesn't overlap with Fedora welcome screen - cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE -welcome-dialog-last-shown-version='4294967295' -FOE - - # Copy Anaconda branding in place - if [ -d /usr/share/lorax/product/usr/share/anaconda ]; then - cp -a /usr/share/lorax/product/* / - fi -fi - -# rebuild schema cache with any overrides we installed -glib-compile-schemas /usr/share/glib-2.0/schemas - -# set up auto-login -cat > /etc/gdm/custom.conf << FOE -[daemon] -AutomaticLoginEnable=True -AutomaticLogin=liveuser -FOE - -# Turn off PackageKit-command-not-found while uninstalled -if [ -f /etc/PackageKit/CommandNotFound.conf ]; then - sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf -fi - -# make sure to set the right permissions and selinux contexts -chown -R liveuser:liveuser /home/liveuser/ -restorecon -R /home/liveuser/ -restorecon -R / - -EOF +sed -i 's/^livesys_session=.*/livesys_session="gnome"/' /etc/sysconfig/livesys %end diff --git a/live/9/x86_64/peridot/rocky-live-workstation.ks b/live/9/x86_64/peridot/rocky-live-workstation.ks index 7266a6f..3a5c9b5 100644 --- a/live/9/x86_64/peridot/rocky-live-workstation.ks +++ b/live/9/x86_64/peridot/rocky-live-workstation.ks @@ -13,90 +13,6 @@ part / --size 7750 %post -cat >> /etc/rc.d/init.d/livesys << EOF - - -# disable gnome-software automatically downloading updates -cat >> /usr/share/glib-2.0/schemas/org.gnome.software.gschema.override << FOE -[org.gnome.software] -allow-updates=false -download-updates=false -FOE - -# don't autostart gnome-software session service -rm -f /etc/xdg/autostart/gnome-software-service.desktop - -# disable the gnome-software shell search provider -cat >> /usr/share/gnome-shell/search-providers/org.gnome.Software-search-provider.ini << FOE -DefaultDisabled=true -FOE - -# don't run gnome-initial-setup -mkdir ~liveuser/.config -touch ~liveuser/.config/gnome-initial-setup-done - -# suppress anaconda spokes redundant with gnome-initial-setup -cat >> /etc/sysconfig/anaconda << FOE -[NetworkSpoke] -visited=1 - -[PasswordSpoke] -visited=1 - -[UserSpoke] -visited=1 -FOE - -# make the installer show up -if [ -f /usr/share/applications/liveinst.desktop ]; then - # Show harddisk install in shell dash - sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop "" - # need to move it to anaconda.desktop to make shell happy - mv /usr/share/applications/liveinst.desktop /usr/share/applications/anaconda.desktop - - cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE -[org.gnome.shell] -favorite-apps=['firefox.desktop', 'evolution.desktop', 'org.gnome.Nautilus.desktop', 'anaconda.desktop'] -FOE - - # Make the welcome screen show up - if [ -f /usr/share/anaconda/gnome/fedora-welcome.desktop ]; then - mkdir -p ~liveuser/.config/autostart - cp /usr/share/anaconda/gnome/fedora-welcome.desktop /usr/share/applications/ - cp /usr/share/anaconda/gnome/fedora-welcome.desktop ~liveuser/.config/autostart/ - fi - - # Disable GNOME welcome tour so it doesn't overlap with Fedora welcome screen - cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE -welcome-dialog-last-shown-version='4294967295' -FOE - - # Copy Anaconda branding in place - if [ -d /usr/share/lorax/product/usr/share/anaconda ]; then - cp -a /usr/share/lorax/product/* / - fi -fi - -# rebuild schema cache with any overrides we installed -glib-compile-schemas /usr/share/glib-2.0/schemas - -# set up auto-login -cat > /etc/gdm/custom.conf << FOE -[daemon] -AutomaticLoginEnable=True -AutomaticLogin=liveuser -FOE - -# Turn off PackageKit-command-not-found while uninstalled -if [ -f /etc/PackageKit/CommandNotFound.conf ]; then - sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf -fi - -# make sure to set the right permissions and selinux contexts -chown -R liveuser:liveuser /home/liveuser/ -restorecon -R /home/liveuser/ -restorecon -R / - -EOF +sed -i 's/^livesys_session=.*/livesys_session="gnome"/' /etc/sysconfig/livesys %end diff --git a/live/9/x86_64/peridot/rocky-live-xfce.ks b/live/9/x86_64/peridot/rocky-live-xfce.ks index 6f6a94f..3e4c5b7 100644 --- a/live/9/x86_64/peridot/rocky-live-xfce.ks +++ b/live/9/x86_64/peridot/rocky-live-xfce.ks @@ -16,49 +16,6 @@ PREFERRED=/usr/bin/startxfce4 DISPLAYMANAGER=/usr/sbin/lightdm EOF -cat >> /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 - # set default background cat > /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml < @@ -78,36 +35,7 @@ cat > /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml < XFCEEOF -# 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 - -cat > ~liveuser/.profile << PROFILE_EOF -export XDG_DATA_DIRS="\\\${XDG_DATA_DIRS}:\\\${HOME}/Desktop" -PROFILE_EOF - -# 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 -restorecon -R / - -EOF +sed -i 's/^livesys_session=.*/livesys_session="xfce"/' /etc/sysconfig/livesys # this doesn't come up automatically. not sure why. systemctl enable --force lightdm.service diff --git a/live/9/x86_64/prod/mainline/rocky-live-base.ks b/live/9/x86_64/prod/mainline/rocky-live-base.ks index c1539eb..dec5b6a 100644 --- a/live/9/x86_64/prod/mainline/rocky-live-base.ks +++ b/live/9/x86_64/prod/mainline/rocky-live-base.ks @@ -40,6 +40,7 @@ memtest86+ anaconda anaconda-install-env-deps anaconda-live +livesys-scripts @anaconda-tools # Required for SVG rnotes images diff --git a/live/9/x86_64/prod/rocky-live-base-spin.ks b/live/9/x86_64/prod/rocky-live-base-spin.ks index 6bc0360..8987163 100644 --- a/live/9/x86_64/prod/rocky-live-base-spin.ks +++ b/live/9/x86_64/prod/rocky-live-base-spin.ks @@ -39,6 +39,7 @@ memtest86+ anaconda anaconda-install-env-deps anaconda-live +livesys-scripts @anaconda-tools efi-filesystem efivar-libs @@ -74,231 +75,8 @@ epel-release %end %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 <\ - %if exists(f):\ - install ${f} ${LIVEDIR}/${f|basename}\ - %endif\ - ' /usr/share/lorax/templates.d/99-generic/live/x86.tmpl -fi - -%end diff --git a/live/9/x86_64/prod/rocky-live-base.ks b/live/9/x86_64/prod/rocky-live-base.ks index c7a5805..079379a 100644 --- a/live/9/x86_64/prod/rocky-live-base.ks +++ b/live/9/x86_64/prod/rocky-live-base.ks @@ -38,6 +38,7 @@ memtest86+ anaconda anaconda-install-env-deps anaconda-live +livesys-scripts @anaconda-tools efi-filesystem efivar-libs @@ -70,231 +71,8 @@ chkconfig %end %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 <\ - %if exists(f):\ - install ${f} ${LIVEDIR}/${f|basename}\ - %endif\ - ' /usr/share/lorax/templates.d/99-generic/live/x86.tmpl -fi - -%end diff --git a/live/9/x86_64/prod/rocky-live-cinnamon.ks b/live/9/x86_64/prod/rocky-live-cinnamon.ks index b86fe38..9a5c562 100644 --- a/live/9/x86_64/prod/rocky-live-cinnamon.ks +++ b/live/9/x86_64/prod/rocky-live-cinnamon.ks @@ -13,47 +13,7 @@ PREFERRED=/usr/bin/cinnamon-session DISPLAYMANAGER=/usr/sbin/lightdm EOF -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 -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 +sed -i 's/^livesys_session=.*/livesys_session="cinnamon"/' /etc/sysconfig/livesys # this doesn't come up automatically. not sure why. systemctl enable --force lightdm.service 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 4da7880..4550987 100644 --- a/live/9/x86_64/prod/rocky-live-kde-base.ks +++ b/live/9/x86_64/prod/rocky-live-kde-base.ks @@ -5,6 +5,8 @@ %post +sed -i 's/^livesys_session=.*/livesys_session="kde"/' /etc/sysconfig/livesys + # set default GTK+ theme for root (see #683855, #689070, #808062) cat > /root/.gtkrc-2.0 << EOF include "/usr/share/themes/Adwaita/gtk-2.0/gtkrc" @@ -20,105 +22,6 @@ 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 - -# are we *not* able to use wayland sessions? -if strstr "\`cat /proc/cmdline\`" nomodeset ; then -PLASMA_SESSION_FILE="plasmax11.desktop" -else -PLASMA_SESSION_FILE="plasma.desktop" -fi - -# set up autologin for user liveuser -if [ -f /etc/sddm.conf ]; then -sed -i 's/^#User=.*/User=liveuser/' /etc/sddm.conf -sed -i "s/^#Session=.*/Session=\${PLASMA_SESSION_FILE}/" /etc/sddm.conf -else -cat > /etc/sddm.conf << SDDM_EOF -[Autologin] -User=liveuser -Session=\${PLASMA_SESSION_FILE} -SDDM_EOF -fi - -# add liveinst.desktop to favorites menu -mkdir -p /home/liveuser/.config/ -cat > /home/liveuser/.config/kickoffrc << MENU_EOF -[Favorites] -FavoriteURLs=/usr/share/applications/firefox.desktop,/usr/share/applications/org.kde.dolphin.desktop,/usr/share/applications/systemsettings.desktop,/usr/share/applications/org.kde.konsole.desktop,/usr/share/applications/liveinst.desktop -MENU_EOF - -# show liveinst.desktop on desktop and in menu -sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop -# set executable bit disable KDE security warning -chmod +x /usr/share/applications/liveinst.desktop -mkdir /home/liveuser/Desktop -cp -a /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 - -# Set akonadi backend -mkdir -p /home/liveuser/.config/akonadi -cat > /home/liveuser/.config/akonadi/akonadiserverrc << AKONADI_EOF -[%General] -Driver=QSQLITE3 -AKONADI_EOF - -# "Disable plasma-discover-notifier" -mkdir -p /home/liveuser/.config/autostart -cp -a /etc/xdg/autostart/org.kde.discover.notifier.desktop /home/liveuser/.config/autostart/ -echo 'Hidden=true' >> /home/liveuser/.config/autostart/org.kde.discover.notifier.desktop - -# Disable baloo -cat > /home/liveuser/.config/baloofilerc << BALOO_EOF -[Basic Settings] -Indexing-Enabled=false -BALOO_EOF - -# Disable kres-migrator -cat > /home/liveuser/.kde/share/config/kres-migratorrc << KRES_EOF -[Migration] -Enabled=false -KRES_EOF - -# Disable kwallet migrator -cat > /home/liveuser/.config/kwalletrc << KWALLET_EOL -[Migration] -alreadyMigrated=true -KWALLET_EOL -# Disable automount of 'known' devices -# https://bugzilla.redhat.com/show_bug.cgi?id=2073708 -cat > /home/liveuser/.config/kded_device_automounterrc << AUTOMOUNTER_EOF -[General] -AutomountEnabled=false -AutomountOnLogin=false -AutomountOnPlugin=false -AUTOMOUNTER_EOF - -# disable kdeconnect -cat > /home/liveuser/.config/autostart/org.kde.kdeconnect.daemon.desktop << KDECONNECT_EOF -[Desktop Entry] -Hidden=true -KDECONNECT_EOF -mkdir -p /home/liveuser/.local/share/dbus-1/services/ -cat > /home/liveuser/.local/share/dbus-1/services/org.kde.kdeconnect.service << DBUS_EOF -[D-BUS Service] -Name=org.kde.kdeconnect -Exec=/usr/bin/false -DBUS_EOF - -# make sure to set the right permissions and selinux contexts -chown -R liveuser:liveuser /home/liveuser/ -restorecon -R /home/liveuser/ -restorecon -R / - -EOF - systemctl enable --force sddm.service dnf config-manager --set-enabled crb diff --git a/live/9/x86_64/prod/rocky-live-mate.ks b/live/9/x86_64/prod/rocky-live-mate.ks index 5bb4105..3154533 100644 --- a/live/9/x86_64/prod/rocky-live-mate.ks +++ b/live/9/x86_64/prod/rocky-live-mate.ks @@ -9,50 +9,7 @@ part / --size 7168 %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 +sed -i 's/^livesys_session=.*/livesys_session="mate"/' /etc/sysconfig/livesys # this doesn't come up automatically. not sure why. systemctl enable --force lightdm.service diff --git a/live/9/x86_64/prod/rocky-live-workstation-lite.ks b/live/9/x86_64/prod/rocky-live-workstation-lite.ks index f9511ee..28f8f96 100644 --- a/live/9/x86_64/prod/rocky-live-workstation-lite.ks +++ b/live/9/x86_64/prod/rocky-live-workstation-lite.ks @@ -13,89 +13,6 @@ part / --size 7750 %post -cat >> /etc/rc.d/init.d/livesys << EOF - - -# disable gnome-software automatically downloading updates -cat >> /usr/share/glib-2.0/schemas/org.gnome.software.gschema.override << FOE -[org.gnome.software] -download-updates=false -FOE - -# don't autostart gnome-software session service -rm -f /etc/xdg/autostart/gnome-software-service.desktop - -# disable the gnome-software shell search provider -cat >> /usr/share/gnome-shell/search-providers/org.gnome.Software-search-provider.ini << FOE -DefaultDisabled=true -FOE - -# don't run gnome-initial-setup -mkdir ~liveuser/.config -touch ~liveuser/.config/gnome-initial-setup-done - -# suppress anaconda spokes redundant with gnome-initial-setup -cat >> /etc/sysconfig/anaconda << FOE -[NetworkSpoke] -visited=1 - -[PasswordSpoke] -visited=1 - -[UserSpoke] -visited=1 -FOE - -# make the installer show up -if [ -f /usr/share/applications/liveinst.desktop ]; then - # Show harddisk install in shell dash - sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop "" - # need to move it to anaconda.desktop to make shell happy - mv /usr/share/applications/liveinst.desktop /usr/share/applications/anaconda.desktop - - cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE -[org.gnome.shell] -favorite-apps=['firefox.desktop', 'evolution.desktop', 'org.gnome.Nautilus.desktop', 'anaconda.desktop'] -FOE - - # Make the welcome screen show up - if [ -f /usr/share/anaconda/gnome/fedora-welcome.desktop ]; then - mkdir -p ~liveuser/.config/autostart - cp /usr/share/anaconda/gnome/fedora-welcome.desktop /usr/share/applications/ - cp /usr/share/anaconda/gnome/fedora-welcome.desktop ~liveuser/.config/autostart/ - fi - - # Disable GNOME welcome tour so it doesn't overlap with Fedora welcome screen - cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE -welcome-dialog-last-shown-version='4294967295' -FOE - - # Copy Anaconda branding in place - if [ -d /usr/share/lorax/product/usr/share/anaconda ]; then - cp -a /usr/share/lorax/product/* / - fi -fi - -# rebuild schema cache with any overrides we installed -glib-compile-schemas /usr/share/glib-2.0/schemas - -# set up auto-login -cat > /etc/gdm/custom.conf << FOE -[daemon] -AutomaticLoginEnable=True -AutomaticLogin=liveuser -FOE - -# Turn off PackageKit-command-not-found while uninstalled -if [ -f /etc/PackageKit/CommandNotFound.conf ]; then - sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf -fi - -# make sure to set the right permissions and selinux contexts -chown -R liveuser:liveuser /home/liveuser/ -restorecon -R /home/liveuser/ -restorecon -R / - -EOF +sed -i 's/^livesys_session=.*/livesys_session="gnome"/' /etc/sysconfig/livesys %end diff --git a/live/9/x86_64/prod/rocky-live-workstation.ks b/live/9/x86_64/prod/rocky-live-workstation.ks index 7266a6f..3a5c9b5 100644 --- a/live/9/x86_64/prod/rocky-live-workstation.ks +++ b/live/9/x86_64/prod/rocky-live-workstation.ks @@ -13,90 +13,6 @@ part / --size 7750 %post -cat >> /etc/rc.d/init.d/livesys << EOF - - -# disable gnome-software automatically downloading updates -cat >> /usr/share/glib-2.0/schemas/org.gnome.software.gschema.override << FOE -[org.gnome.software] -allow-updates=false -download-updates=false -FOE - -# don't autostart gnome-software session service -rm -f /etc/xdg/autostart/gnome-software-service.desktop - -# disable the gnome-software shell search provider -cat >> /usr/share/gnome-shell/search-providers/org.gnome.Software-search-provider.ini << FOE -DefaultDisabled=true -FOE - -# don't run gnome-initial-setup -mkdir ~liveuser/.config -touch ~liveuser/.config/gnome-initial-setup-done - -# suppress anaconda spokes redundant with gnome-initial-setup -cat >> /etc/sysconfig/anaconda << FOE -[NetworkSpoke] -visited=1 - -[PasswordSpoke] -visited=1 - -[UserSpoke] -visited=1 -FOE - -# make the installer show up -if [ -f /usr/share/applications/liveinst.desktop ]; then - # Show harddisk install in shell dash - sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop "" - # need to move it to anaconda.desktop to make shell happy - mv /usr/share/applications/liveinst.desktop /usr/share/applications/anaconda.desktop - - cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE -[org.gnome.shell] -favorite-apps=['firefox.desktop', 'evolution.desktop', 'org.gnome.Nautilus.desktop', 'anaconda.desktop'] -FOE - - # Make the welcome screen show up - if [ -f /usr/share/anaconda/gnome/fedora-welcome.desktop ]; then - mkdir -p ~liveuser/.config/autostart - cp /usr/share/anaconda/gnome/fedora-welcome.desktop /usr/share/applications/ - cp /usr/share/anaconda/gnome/fedora-welcome.desktop ~liveuser/.config/autostart/ - fi - - # Disable GNOME welcome tour so it doesn't overlap with Fedora welcome screen - cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE -welcome-dialog-last-shown-version='4294967295' -FOE - - # Copy Anaconda branding in place - if [ -d /usr/share/lorax/product/usr/share/anaconda ]; then - cp -a /usr/share/lorax/product/* / - fi -fi - -# rebuild schema cache with any overrides we installed -glib-compile-schemas /usr/share/glib-2.0/schemas - -# set up auto-login -cat > /etc/gdm/custom.conf << FOE -[daemon] -AutomaticLoginEnable=True -AutomaticLogin=liveuser -FOE - -# Turn off PackageKit-command-not-found while uninstalled -if [ -f /etc/PackageKit/CommandNotFound.conf ]; then - sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf -fi - -# make sure to set the right permissions and selinux contexts -chown -R liveuser:liveuser /home/liveuser/ -restorecon -R /home/liveuser/ -restorecon -R / - -EOF +sed -i 's/^livesys_session=.*/livesys_session="gnome"/' /etc/sysconfig/livesys %end diff --git a/live/9/x86_64/prod/rocky-live-xfce.ks b/live/9/x86_64/prod/rocky-live-xfce.ks index 6f6a94f..3e4c5b7 100644 --- a/live/9/x86_64/prod/rocky-live-xfce.ks +++ b/live/9/x86_64/prod/rocky-live-xfce.ks @@ -16,49 +16,6 @@ PREFERRED=/usr/bin/startxfce4 DISPLAYMANAGER=/usr/sbin/lightdm EOF -cat >> /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 - # set default background cat > /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml < @@ -78,36 +35,7 @@ cat > /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml < XFCEEOF -# 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 - -cat > ~liveuser/.profile << PROFILE_EOF -export XDG_DATA_DIRS="\\\${XDG_DATA_DIRS}:\\\${HOME}/Desktop" -PROFILE_EOF - -# 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 -restorecon -R / - -EOF +sed -i 's/^livesys_session=.*/livesys_session="xfce"/' /etc/sysconfig/livesys # this doesn't come up automatically. not sure why. systemctl enable --force lightdm.service diff --git a/live/9/x86_64/stage/mainline/rocky-live-base.ks b/live/9/x86_64/stage/mainline/rocky-live-base.ks index 01a2c24..de8bd41 100644 --- a/live/9/x86_64/stage/mainline/rocky-live-base.ks +++ b/live/9/x86_64/stage/mainline/rocky-live-base.ks @@ -39,6 +39,7 @@ memtest86+ anaconda anaconda-install-env-deps anaconda-live +livesys-scripts @anaconda-tools # Required for SVG rnotes images diff --git a/live/9/x86_64/stage/rocky-live-base-spin.ks b/live/9/x86_64/stage/rocky-live-base-spin.ks index 6bc0360..8987163 100644 --- a/live/9/x86_64/stage/rocky-live-base-spin.ks +++ b/live/9/x86_64/stage/rocky-live-base-spin.ks @@ -39,6 +39,7 @@ memtest86+ anaconda anaconda-install-env-deps anaconda-live +livesys-scripts @anaconda-tools efi-filesystem efivar-libs @@ -74,231 +75,8 @@ epel-release %end %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 <\ - %if exists(f):\ - install ${f} ${LIVEDIR}/${f|basename}\ - %endif\ - ' /usr/share/lorax/templates.d/99-generic/live/x86.tmpl -fi - -%end diff --git a/live/9/x86_64/stage/rocky-live-base.ks b/live/9/x86_64/stage/rocky-live-base.ks index c7a5805..079379a 100644 --- a/live/9/x86_64/stage/rocky-live-base.ks +++ b/live/9/x86_64/stage/rocky-live-base.ks @@ -38,6 +38,7 @@ memtest86+ anaconda anaconda-install-env-deps anaconda-live +livesys-scripts @anaconda-tools efi-filesystem efivar-libs @@ -70,231 +71,8 @@ chkconfig %end %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 <\ - %if exists(f):\ - install ${f} ${LIVEDIR}/${f|basename}\ - %endif\ - ' /usr/share/lorax/templates.d/99-generic/live/x86.tmpl -fi - -%end diff --git a/live/9/x86_64/stage/rocky-live-cinnamon.ks b/live/9/x86_64/stage/rocky-live-cinnamon.ks index b86fe38..9a5c562 100644 --- a/live/9/x86_64/stage/rocky-live-cinnamon.ks +++ b/live/9/x86_64/stage/rocky-live-cinnamon.ks @@ -13,47 +13,7 @@ PREFERRED=/usr/bin/cinnamon-session DISPLAYMANAGER=/usr/sbin/lightdm EOF -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 -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 +sed -i 's/^livesys_session=.*/livesys_session="cinnamon"/' /etc/sysconfig/livesys # this doesn't come up automatically. not sure why. systemctl enable --force lightdm.service 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 4da7880..4550987 100644 --- a/live/9/x86_64/stage/rocky-live-kde-base.ks +++ b/live/9/x86_64/stage/rocky-live-kde-base.ks @@ -5,6 +5,8 @@ %post +sed -i 's/^livesys_session=.*/livesys_session="kde"/' /etc/sysconfig/livesys + # set default GTK+ theme for root (see #683855, #689070, #808062) cat > /root/.gtkrc-2.0 << EOF include "/usr/share/themes/Adwaita/gtk-2.0/gtkrc" @@ -20,105 +22,6 @@ 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 - -# are we *not* able to use wayland sessions? -if strstr "\`cat /proc/cmdline\`" nomodeset ; then -PLASMA_SESSION_FILE="plasmax11.desktop" -else -PLASMA_SESSION_FILE="plasma.desktop" -fi - -# set up autologin for user liveuser -if [ -f /etc/sddm.conf ]; then -sed -i 's/^#User=.*/User=liveuser/' /etc/sddm.conf -sed -i "s/^#Session=.*/Session=\${PLASMA_SESSION_FILE}/" /etc/sddm.conf -else -cat > /etc/sddm.conf << SDDM_EOF -[Autologin] -User=liveuser -Session=\${PLASMA_SESSION_FILE} -SDDM_EOF -fi - -# add liveinst.desktop to favorites menu -mkdir -p /home/liveuser/.config/ -cat > /home/liveuser/.config/kickoffrc << MENU_EOF -[Favorites] -FavoriteURLs=/usr/share/applications/firefox.desktop,/usr/share/applications/org.kde.dolphin.desktop,/usr/share/applications/systemsettings.desktop,/usr/share/applications/org.kde.konsole.desktop,/usr/share/applications/liveinst.desktop -MENU_EOF - -# show liveinst.desktop on desktop and in menu -sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop -# set executable bit disable KDE security warning -chmod +x /usr/share/applications/liveinst.desktop -mkdir /home/liveuser/Desktop -cp -a /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 - -# Set akonadi backend -mkdir -p /home/liveuser/.config/akonadi -cat > /home/liveuser/.config/akonadi/akonadiserverrc << AKONADI_EOF -[%General] -Driver=QSQLITE3 -AKONADI_EOF - -# "Disable plasma-discover-notifier" -mkdir -p /home/liveuser/.config/autostart -cp -a /etc/xdg/autostart/org.kde.discover.notifier.desktop /home/liveuser/.config/autostart/ -echo 'Hidden=true' >> /home/liveuser/.config/autostart/org.kde.discover.notifier.desktop - -# Disable baloo -cat > /home/liveuser/.config/baloofilerc << BALOO_EOF -[Basic Settings] -Indexing-Enabled=false -BALOO_EOF - -# Disable kres-migrator -cat > /home/liveuser/.kde/share/config/kres-migratorrc << KRES_EOF -[Migration] -Enabled=false -KRES_EOF - -# Disable kwallet migrator -cat > /home/liveuser/.config/kwalletrc << KWALLET_EOL -[Migration] -alreadyMigrated=true -KWALLET_EOL -# Disable automount of 'known' devices -# https://bugzilla.redhat.com/show_bug.cgi?id=2073708 -cat > /home/liveuser/.config/kded_device_automounterrc << AUTOMOUNTER_EOF -[General] -AutomountEnabled=false -AutomountOnLogin=false -AutomountOnPlugin=false -AUTOMOUNTER_EOF - -# disable kdeconnect -cat > /home/liveuser/.config/autostart/org.kde.kdeconnect.daemon.desktop << KDECONNECT_EOF -[Desktop Entry] -Hidden=true -KDECONNECT_EOF -mkdir -p /home/liveuser/.local/share/dbus-1/services/ -cat > /home/liveuser/.local/share/dbus-1/services/org.kde.kdeconnect.service << DBUS_EOF -[D-BUS Service] -Name=org.kde.kdeconnect -Exec=/usr/bin/false -DBUS_EOF - -# make sure to set the right permissions and selinux contexts -chown -R liveuser:liveuser /home/liveuser/ -restorecon -R /home/liveuser/ -restorecon -R / - -EOF - systemctl enable --force sddm.service dnf config-manager --set-enabled crb diff --git a/live/9/x86_64/stage/rocky-live-mate.ks b/live/9/x86_64/stage/rocky-live-mate.ks index 5bb4105..3154533 100644 --- a/live/9/x86_64/stage/rocky-live-mate.ks +++ b/live/9/x86_64/stage/rocky-live-mate.ks @@ -9,50 +9,7 @@ part / --size 7168 %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 +sed -i 's/^livesys_session=.*/livesys_session="mate"/' /etc/sysconfig/livesys # this doesn't come up automatically. not sure why. systemctl enable --force lightdm.service diff --git a/live/9/x86_64/stage/rocky-live-workstation-lite.ks b/live/9/x86_64/stage/rocky-live-workstation-lite.ks index f9511ee..28f8f96 100644 --- a/live/9/x86_64/stage/rocky-live-workstation-lite.ks +++ b/live/9/x86_64/stage/rocky-live-workstation-lite.ks @@ -13,89 +13,6 @@ part / --size 7750 %post -cat >> /etc/rc.d/init.d/livesys << EOF - - -# disable gnome-software automatically downloading updates -cat >> /usr/share/glib-2.0/schemas/org.gnome.software.gschema.override << FOE -[org.gnome.software] -download-updates=false -FOE - -# don't autostart gnome-software session service -rm -f /etc/xdg/autostart/gnome-software-service.desktop - -# disable the gnome-software shell search provider -cat >> /usr/share/gnome-shell/search-providers/org.gnome.Software-search-provider.ini << FOE -DefaultDisabled=true -FOE - -# don't run gnome-initial-setup -mkdir ~liveuser/.config -touch ~liveuser/.config/gnome-initial-setup-done - -# suppress anaconda spokes redundant with gnome-initial-setup -cat >> /etc/sysconfig/anaconda << FOE -[NetworkSpoke] -visited=1 - -[PasswordSpoke] -visited=1 - -[UserSpoke] -visited=1 -FOE - -# make the installer show up -if [ -f /usr/share/applications/liveinst.desktop ]; then - # Show harddisk install in shell dash - sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop "" - # need to move it to anaconda.desktop to make shell happy - mv /usr/share/applications/liveinst.desktop /usr/share/applications/anaconda.desktop - - cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE -[org.gnome.shell] -favorite-apps=['firefox.desktop', 'evolution.desktop', 'org.gnome.Nautilus.desktop', 'anaconda.desktop'] -FOE - - # Make the welcome screen show up - if [ -f /usr/share/anaconda/gnome/fedora-welcome.desktop ]; then - mkdir -p ~liveuser/.config/autostart - cp /usr/share/anaconda/gnome/fedora-welcome.desktop /usr/share/applications/ - cp /usr/share/anaconda/gnome/fedora-welcome.desktop ~liveuser/.config/autostart/ - fi - - # Disable GNOME welcome tour so it doesn't overlap with Fedora welcome screen - cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE -welcome-dialog-last-shown-version='4294967295' -FOE - - # Copy Anaconda branding in place - if [ -d /usr/share/lorax/product/usr/share/anaconda ]; then - cp -a /usr/share/lorax/product/* / - fi -fi - -# rebuild schema cache with any overrides we installed -glib-compile-schemas /usr/share/glib-2.0/schemas - -# set up auto-login -cat > /etc/gdm/custom.conf << FOE -[daemon] -AutomaticLoginEnable=True -AutomaticLogin=liveuser -FOE - -# Turn off PackageKit-command-not-found while uninstalled -if [ -f /etc/PackageKit/CommandNotFound.conf ]; then - sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf -fi - -# make sure to set the right permissions and selinux contexts -chown -R liveuser:liveuser /home/liveuser/ -restorecon -R /home/liveuser/ -restorecon -R / - -EOF +sed -i 's/^livesys_session=.*/livesys_session="gnome"/' /etc/sysconfig/livesys %end diff --git a/live/9/x86_64/stage/rocky-live-workstation.ks b/live/9/x86_64/stage/rocky-live-workstation.ks index 7266a6f..3a5c9b5 100644 --- a/live/9/x86_64/stage/rocky-live-workstation.ks +++ b/live/9/x86_64/stage/rocky-live-workstation.ks @@ -13,90 +13,6 @@ part / --size 7750 %post -cat >> /etc/rc.d/init.d/livesys << EOF - - -# disable gnome-software automatically downloading updates -cat >> /usr/share/glib-2.0/schemas/org.gnome.software.gschema.override << FOE -[org.gnome.software] -allow-updates=false -download-updates=false -FOE - -# don't autostart gnome-software session service -rm -f /etc/xdg/autostart/gnome-software-service.desktop - -# disable the gnome-software shell search provider -cat >> /usr/share/gnome-shell/search-providers/org.gnome.Software-search-provider.ini << FOE -DefaultDisabled=true -FOE - -# don't run gnome-initial-setup -mkdir ~liveuser/.config -touch ~liveuser/.config/gnome-initial-setup-done - -# suppress anaconda spokes redundant with gnome-initial-setup -cat >> /etc/sysconfig/anaconda << FOE -[NetworkSpoke] -visited=1 - -[PasswordSpoke] -visited=1 - -[UserSpoke] -visited=1 -FOE - -# make the installer show up -if [ -f /usr/share/applications/liveinst.desktop ]; then - # Show harddisk install in shell dash - sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop "" - # need to move it to anaconda.desktop to make shell happy - mv /usr/share/applications/liveinst.desktop /usr/share/applications/anaconda.desktop - - cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE -[org.gnome.shell] -favorite-apps=['firefox.desktop', 'evolution.desktop', 'org.gnome.Nautilus.desktop', 'anaconda.desktop'] -FOE - - # Make the welcome screen show up - if [ -f /usr/share/anaconda/gnome/fedora-welcome.desktop ]; then - mkdir -p ~liveuser/.config/autostart - cp /usr/share/anaconda/gnome/fedora-welcome.desktop /usr/share/applications/ - cp /usr/share/anaconda/gnome/fedora-welcome.desktop ~liveuser/.config/autostart/ - fi - - # Disable GNOME welcome tour so it doesn't overlap with Fedora welcome screen - cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE -welcome-dialog-last-shown-version='4294967295' -FOE - - # Copy Anaconda branding in place - if [ -d /usr/share/lorax/product/usr/share/anaconda ]; then - cp -a /usr/share/lorax/product/* / - fi -fi - -# rebuild schema cache with any overrides we installed -glib-compile-schemas /usr/share/glib-2.0/schemas - -# set up auto-login -cat > /etc/gdm/custom.conf << FOE -[daemon] -AutomaticLoginEnable=True -AutomaticLogin=liveuser -FOE - -# Turn off PackageKit-command-not-found while uninstalled -if [ -f /etc/PackageKit/CommandNotFound.conf ]; then - sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf -fi - -# make sure to set the right permissions and selinux contexts -chown -R liveuser:liveuser /home/liveuser/ -restorecon -R /home/liveuser/ -restorecon -R / - -EOF +sed -i 's/^livesys_session=.*/livesys_session="gnome"/' /etc/sysconfig/livesys %end diff --git a/live/9/x86_64/stage/rocky-live-xfce.ks b/live/9/x86_64/stage/rocky-live-xfce.ks index 6f6a94f..3e4c5b7 100644 --- a/live/9/x86_64/stage/rocky-live-xfce.ks +++ b/live/9/x86_64/stage/rocky-live-xfce.ks @@ -16,49 +16,6 @@ PREFERRED=/usr/bin/startxfce4 DISPLAYMANAGER=/usr/sbin/lightdm EOF -cat >> /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 - # set default background cat > /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml < @@ -78,36 +35,7 @@ cat > /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml < XFCEEOF -# 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 - -cat > ~liveuser/.profile << PROFILE_EOF -export XDG_DATA_DIRS="\\\${XDG_DATA_DIRS}:\\\${HOME}/Desktop" -PROFILE_EOF - -# 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 -restorecon -R / - -EOF +sed -i 's/^livesys_session=.*/livesys_session="xfce"/' /etc/sysconfig/livesys # this doesn't come up automatically. not sure why. systemctl enable --force lightdm.service