From 09657bc1101fa63c0780d1ab0532dfc6d12df050 Mon Sep 17 00:00:00 2001 From: Justin W. Flory (he/him) Date: Oct 20 2020 18:42:57 +0000 Subject: Cleanup: Remove exported docs, flatten/simplify directory hierarchy This commit is in response to recent Pull Requests to the i3-sig/docs repo. It removes the Ideas.md and Kickstarts/README.adoc files from this repo. They now exist in the docs repo: https://pagure.io/i3-sig/docs/pull-request/4 https://pagure.io/i3-sig/docs/pull-request/6 I also removed the old LXDE/XFCE kickstarts since they are unused. I moved the `flat-i3.ks` kickstart to the root directory, since it is the only file remaining. cc: @nasirhm @x3mboy @defolos Signed-off-by: Justin W. Flory (he/him) --- diff --git a/Ideas.md b/Ideas.md deleted file mode 100644 index ae9fed8..0000000 --- a/Ideas.md +++ /dev/null @@ -1,58 +0,0 @@ -Spin Goals -=== - -* tiling window manager by default -* convenience integrations on par with gnome spin (eg laptop buttons, network manager, etc) -* targeted at minimal computing environments -* sensible defaults - -*** - -Which wm? -- - * i3 - * i3-gaps (?) (is that still a thing?) - * xmonad - -Integrations -- - * laptop buttons - * some kind of hotkey configuration? (having to edit a text file to set keybindings is kind of a drag for novice users) - * some sort of minimal window panel - * dzen2? - * not sure what Manjaro i3 uses but it does work well and worth looking into - -Defaults -- -* terminal -* launcher - * dmenu? - * Rofi? (it's really cool!) -* gui network manager - * Yes, please! This is the biggest reason I cannot use i3 on Fedora at the moment: Setting up networking just too difficult for me; I use Manjaro i3 primarily because it comes with a minimal taskbar already configured for basic functions like sound control, network management, clipboard management, etc. -* gui audio interface -* firefox -* mousepad text editor (?) - * know it's from XFCE, but Bryan uses this on Manjaro i3 because it allows hiding of the menubar for frame-only text editing window (bliss) -* Suggestions CLI applications pre-installed - * abcde (audio extractor if people want this? It rocks) - * w3m (best-in-class CLI browsing!) - * nano (curses-based text editing) - * irssi (IRC? necessary?) - * newsboat (CLI RSS and a daily go-to for Bryan) - * midnight commander (file management at terminal—can access remote systems via SSH and SFTP) - * cmus (best CLI music manager and player!) - * moc (people tend to like this CLI music manager/player but I think cmus is better) - * wordgrinder (CLI word processor and the very best one at that) - -Design Inspirations ---- -* Current Fedora recommendations - * Fedora Magazine offers this tutorial for installing and configuring i3, but the result is fairly barebones and lacks polish; still useful however for seeing the settings and applications the author recommends -* Regolith Linux - * Seems close to Michael's vision for this Fedora spin (robust GNOME base with tiling wm on top, sane defaults, neat customizations like a launcher and color-coded desktops), but almost appears too bloated (all the GNOME software is there on fresh install) and maybe a little too resource intensive; it's simply built on Ubuntu; lots of neat little enhancement here (keybindings are custom and very straightforward, for example, in well-commented i3 config file) -* Manjaro i3 - * Much more minimal implementation; some of the defaults are questionable (Pale Moon browser? The GIMP by default?), but it's closer to the minimalistic implementation that Michael describes; built on Arch as base so pretty overwhelming to non-technical users (says this non-technical user!); uses Ranger file manager (did not like; installed midnight commander immediately) -* Gnome Material Shell - * Looks like an attempt to introduce tiling into Gnome via plugin/extension - diff --git a/Kickstarts/README.adoc b/Kickstarts/README.adoc deleted file mode 100644 index e4028b0..0000000 --- a/Kickstarts/README.adoc +++ /dev/null @@ -1,42 +0,0 @@ -= Fedora i3 - Kickstart Files -Maintained by link:https://fedoraproject.org/wiki/SIGs/i3[i3 SiG] - -Fedora i3's Kickstart files are used in composing Fedora i3 Release images. - -*Note:* The i3 kickstart files are currently in development and not yet ready for production/release. - -== Current Workflow: - -== Changelog - -=== With respin 20200710 : - -We now have a flat i3 with lightdm-gtk as a Display manager and the live works fine on QEMU/KVM. -The ks is initially brached off from XFCE and hence still have some bits that needs to be removed without breaking the live. -The respin seems to cause some issues while installing with `liveinst` on urxvt with a GTK erorr. - -=== With respin 20200615 -For now, we've started with flattening/forking two widely used spins: `xfce` and `lxde` and adding the i3 packages there to ensure stability among packages. -A compose build was made as `F32-20200615` with the help of folks from the Respins SiG. - -The kickstart files that are available are: - -* `flat-i3-lxde.ks` which is flattened from `flat-live-lxde.ks` which we branched for F32 instead of rawhide. -* `flat-i3-xfce.ks` whichi is flattened from `flat-live-xfce.ks` which is also branched for F32. - -Both of them were modified in order to add the link:https://fedoraproject.org/wiki/SIGs/i3/Brainstorm#i3-minimal[i3-minimal] packages along with the packages used by the specific DE. - -== Future Workflow: - -We are working on cleaning the ks files in order to reach a minimal i3 kickstart. -Which can be used to build a compose in which the Window Manager is by default set to i3. - -Or Maybe, Once we understand how things behave behind the curtains, we can create a custom kickstart too. - -== End Goal: - -Our end goal is to be able to create and maintain the kickstart file which can be composed as a Fedora having i3 as it's deault window manager. - -== Want to help - -We would love to have you here, Come chat with us at #fedora-i3 on Freenode. diff --git a/Kickstarts/fedora-live-lxde-not-rawhide.ks b/Kickstarts/fedora-live-lxde-not-rawhide.ks deleted file mode 100644 index 25da788..0000000 --- a/Kickstarts/fedora-live-lxde-not-rawhide.ks +++ /dev/null @@ -1,64 +0,0 @@ -# fedora-livecd-lxde.ks -# -# Description: -# - Fedora Live Spin with the light-weight LXDE Desktop Environment -# -# Maintainer(s): -# - Christoph Wickert - -%include fedora-live-base-not-rawhide.ks -%include fedora-live-minimization.ks -%include fedora-lxde-common.ks - -%post -# LXDE and LXDM configuration - -# create /etc/sysconfig/desktop (needed for installation) -cat > /etc/sysconfig/desktop <> /etc/rc.d/init.d/livesys << EOF -# disable screensaver locking and make sure gamin gets started -cat > /etc/xdg/lxsession/LXDE/autostart << FOE -/usr/libexec/gam_server -@lxpanel --profile LXDE -@pcmanfm --desktop --profile LXDE -/usr/libexec/notification-daemon -FOE - -# set up preferred apps -cat > /etc/xdg/libfm/pref-apps.conf << FOE -[Preferred Applications] -WebBrowser=firefox.desktop -MailClient=sylpheed.desktop -FOE - -# set up auto-login for liveuser -sed -i 's/# autologin=.*/autologin=liveuser/g' /etc/lxdm/lxdm.conf - -# 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 - -# create default config for clipit, otherwise it displays a dialog on startup -mkdir -p /home/liveuser/.config/clipit -cat > /home/liveuser/.config/clipit/clipitrc << FOE -[rc] -use_copy=true -save_uris=true -save_history=false -statics_show=true -single_line=true -FOE - -# this goes at the end after all other changes. -chown -R liveuser:liveuser /home/liveuser -restorecon -R /home/liveuser - -EOF - -%end - diff --git a/Kickstarts/fedora-live-xfce-not-rawhide.ks b/Kickstarts/fedora-live-xfce-not-rawhide.ks deleted file mode 100644 index 98b1f6f..0000000 --- a/Kickstarts/fedora-live-xfce-not-rawhide.ks +++ /dev/null @@ -1,76 +0,0 @@ -# fedora-livecd-xfce.ks -# -# Description: -# - Fedora Live Spin with the light-weight XFCE Desktop Environment -# -# Maintainer(s): -# - Rahul Sundaram -# - Christoph Wickert -# - Kevin Fenzi -# - Adam Miller - -%include fedora-live-base-not-rawhide.ks -%include fedora-live-minimization.ks -%include fedora-xfce-common.ks - -%post -# xfce configuration - -# create /etc/sysconfig/desktop (needed for installation) - -cat > /etc/sysconfig/desktop <> /etc/rc.d/init.d/livesys << EOF - -mkdir -p /home/liveuser/.config/xfce4 - -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 - -# 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 - -# 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 - -# this goes at the end after all other changes. -chown -R liveuser:liveuser /home/liveuser -restorecon -R /home/liveuser - -EOF - -%end - diff --git a/Kickstarts/flat-i3.ks b/Kickstarts/flat-i3.ks deleted file mode 100644 index a09d3ab..0000000 --- a/Kickstarts/flat-i3.ks +++ /dev/null @@ -1,439 +0,0 @@ -#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 -# System authorization information -auth --useshadow --passalgo=sha512 -# Firewall configuration -firewall --enabled --service=mdns -repo --name="fedora" --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch -repo --name="updates" --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch -# Use network installation -url --mirrorlist="https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch" -# System timezone -timezone US/Eastern -# SELinux configuration -selinux --enforcing - -# System services -services --disabled="sshd" --enabled="NetworkManager,ModemManager" -# System bootloader configuration -bootloader --location=none -# Clear the Master Boot Record -zerombr -# Partition clearing information -clearpart --all -# Disk partitioning information -part / --fstype="ext4" --size=5120 - -%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 swaps 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 - -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 -} - -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 - -# if we have a persistent /home, then we want to go ahead and mount it -if ! strstr "\`cat /proc/cmdline\`" nopersistenthome && [ -n "\$homedev" ] ; then - action "Mounting persistent /home" mountPersistentHome -fi - -if [ -n "\$configdone" ]; then - exit 0 -fi - -# add liveuser user with no passwd -action "Adding live user" useradd \$USERADDARGS -c "Live System User" liveuser -passwd -d liveuser > /dev/null -usermod -aG wheel liveuser > /dev/null - -# Remove root password lock -passwd -d root > /dev/null - -# turn off firstboot for livecd boots -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 || : - -# don't use prelink on a running live image -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 || : - -# don't enable the gnome-settings-daemon packagekit plugin -gsettings set org.gnome.software download-updates 'false' || : - -# don't start cron/at as they tend to spawn things which are -# disk intensive that are painful on a live image -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 || : - -# turn off abrtd on a live image -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 - -# bah, hal starts way too 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 variables out of /proc/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 anaconda -if strstr "\`cat /proc/cmdline\`" liveinst ; then - plymouth --quit - /usr/sbin/liveinst \$ks -fi -if strstr "\`cat /proc/cmdline\`" textinst ; then - plymouth --quit - /usr/sbin/liveinst --text \$ks -fi - -# configure X, allowing user to override xdriver -if [ -n "\$xdriver" ]; then - cat > /etc/X11/xorg.conf.d/00-xdriver.conf <> /etc/fstab << EOF -vartmp /var/tmp tmpfs defaults 0 0 -EOF - -# work around for poor key import UI in PackageKit -rm -f /var/lib/rpm/__db* -releasever=$(rpm -q --qf '%{version}\n' --whatprovides system-release) -basearch=$(uname -i) -rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch -echo "Packages within this LiveCD" -rpm -qa -# Note that running rpm recreates the rpm db files which aren't needed or wanted -rm -f /var/lib/rpm/__db* - -# go ahead and pre-make the man -k cache (#455968) -/usr/bin/mandb - -# make sure there aren't core files lying around -rm -f /core* - -# remove random seed, the newly installed instance should make it's own -rm -f /var/lib/systemd/random-seed - -# convince readahead not to collect -# FIXME: for systemd - -echo 'File created by kickstart. See systemd-update-done.service(8).' \ - | tee /etc/.updated >/var/.updated - -# Drop the rescue kernel and initramfs, we don't need them on the live media itself. -# See bug 1317709 -rm -f /boot/*-rescue* - -# Disable network service here, as doing it in the services line -# fails due to RHBZ #1369794 -/sbin/chkconfig network off - -# Remove machine-id on pre generated images -rm -f /etc/machine-id -touch /etc/machine-id -%end - -%post --nochroot -cp $INSTALL_ROOT/usr/share/licenses/*-release/* $LIVE_ROOT/ - -# only works on x86, x86_64 -if [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ]; then - # For livecd-creator builds - if [ ! -d $LIVE_ROOT/LiveOS ]; then mkdir -p $LIVE_ROOT/LiveOS ; fi - cp /usr/bin/livecd-iso-to-disk $LIVE_ROOT/LiveOS - - # For lorax/livemedia-creator builds - sed -i ' - /## make boot.iso/ i\ - # Add livecd-iso-to-disk script to .iso filesystem at /LiveOS/\ - <% f = "usr/bin/livecd-iso-to-disk" %>\ - %if exists(f):\ - install ${f} ${LIVEDIR}/${f|basename}\ - %endif\ - ' /usr/share/lorax/templates.d/99-generic/live/x86.tmpl -fi -%end - -%post -# xfce configuration -# create /etc/sysconfig/desktop (needed for installation) - -cat > /etc/sysconfig/desktop <> /etc/rc.d/init.d/livesys << EOF - -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 i3 as default session, otherwise login will fail -sed -i 's/^#user-session=.*/user-session=i3/' /etc/lightdm/lightdm.conf - -# 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 - -# set background on LiveOS using feh by adding it .profile -echo "/usr/bin/feh --bg-scale /usr/share/backgrounds/default.png" >> /home/liveuser/.profile - -# this goes at the end after all other changes. -chown -R liveuser:liveuser /home/liveuser -restorecon -R /home/liveuser - - - -EOF - -%end - -%packages -@admin-tools -@anaconda-tools -@base-x -@core -@dial-up -@fonts -@guest-desktop-agents -@hardware-support -@input-methods -@multimedia -@networkmanager-submodules -@printing -@standard -azote -lightdm-gtk -aajohan-comfortaa-fonts -anaconda -anaconda-install-env-deps -anaconda-live -chkconfig -dracut-live -firefox -gedit -glibc-all-langpacks -gnome-keyring-pam -initscripts -kernel -kernel-modules -kernel-modules-extra -memtest86+ -syslinux -system-config-printer -wget -xscreensaver-extras --acpid --aspell-* --autofs --desktop-backgrounds-basic --gimp-help --hplip --isdn4k-utils --mpage --sane-backends --xsane --xsane-gimp - -# i3 Packages -i3 -i3lock -i3status -dunst -brightlight -feh -%end diff --git a/flat-i3.ks b/flat-i3.ks new file mode 100644 index 0000000..a09d3ab --- /dev/null +++ b/flat-i3.ks @@ -0,0 +1,439 @@ +#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 +# System authorization information +auth --useshadow --passalgo=sha512 +# Firewall configuration +firewall --enabled --service=mdns +repo --name="fedora" --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch +repo --name="updates" --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch +# Use network installation +url --mirrorlist="https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch" +# System timezone +timezone US/Eastern +# SELinux configuration +selinux --enforcing + +# System services +services --disabled="sshd" --enabled="NetworkManager,ModemManager" +# System bootloader configuration +bootloader --location=none +# Clear the Master Boot Record +zerombr +# Partition clearing information +clearpart --all +# Disk partitioning information +part / --fstype="ext4" --size=5120 + +%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 swaps 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 + +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 +} + +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 + +# if we have a persistent /home, then we want to go ahead and mount it +if ! strstr "\`cat /proc/cmdline\`" nopersistenthome && [ -n "\$homedev" ] ; then + action "Mounting persistent /home" mountPersistentHome +fi + +if [ -n "\$configdone" ]; then + exit 0 +fi + +# add liveuser user with no passwd +action "Adding live user" useradd \$USERADDARGS -c "Live System User" liveuser +passwd -d liveuser > /dev/null +usermod -aG wheel liveuser > /dev/null + +# Remove root password lock +passwd -d root > /dev/null + +# turn off firstboot for livecd boots +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 || : + +# don't use prelink on a running live image +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 || : + +# don't enable the gnome-settings-daemon packagekit plugin +gsettings set org.gnome.software download-updates 'false' || : + +# don't start cron/at as they tend to spawn things which are +# disk intensive that are painful on a live image +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 || : + +# turn off abrtd on a live image +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 + +# bah, hal starts way too 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 variables out of /proc/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 anaconda +if strstr "\`cat /proc/cmdline\`" liveinst ; then + plymouth --quit + /usr/sbin/liveinst \$ks +fi +if strstr "\`cat /proc/cmdline\`" textinst ; then + plymouth --quit + /usr/sbin/liveinst --text \$ks +fi + +# configure X, allowing user to override xdriver +if [ -n "\$xdriver" ]; then + cat > /etc/X11/xorg.conf.d/00-xdriver.conf <> /etc/fstab << EOF +vartmp /var/tmp tmpfs defaults 0 0 +EOF + +# work around for poor key import UI in PackageKit +rm -f /var/lib/rpm/__db* +releasever=$(rpm -q --qf '%{version}\n' --whatprovides system-release) +basearch=$(uname -i) +rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch +echo "Packages within this LiveCD" +rpm -qa +# Note that running rpm recreates the rpm db files which aren't needed or wanted +rm -f /var/lib/rpm/__db* + +# go ahead and pre-make the man -k cache (#455968) +/usr/bin/mandb + +# make sure there aren't core files lying around +rm -f /core* + +# remove random seed, the newly installed instance should make it's own +rm -f /var/lib/systemd/random-seed + +# convince readahead not to collect +# FIXME: for systemd + +echo 'File created by kickstart. See systemd-update-done.service(8).' \ + | tee /etc/.updated >/var/.updated + +# Drop the rescue kernel and initramfs, we don't need them on the live media itself. +# See bug 1317709 +rm -f /boot/*-rescue* + +# Disable network service here, as doing it in the services line +# fails due to RHBZ #1369794 +/sbin/chkconfig network off + +# Remove machine-id on pre generated images +rm -f /etc/machine-id +touch /etc/machine-id +%end + +%post --nochroot +cp $INSTALL_ROOT/usr/share/licenses/*-release/* $LIVE_ROOT/ + +# only works on x86, x86_64 +if [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ]; then + # For livecd-creator builds + if [ ! -d $LIVE_ROOT/LiveOS ]; then mkdir -p $LIVE_ROOT/LiveOS ; fi + cp /usr/bin/livecd-iso-to-disk $LIVE_ROOT/LiveOS + + # For lorax/livemedia-creator builds + sed -i ' + /## make boot.iso/ i\ + # Add livecd-iso-to-disk script to .iso filesystem at /LiveOS/\ + <% f = "usr/bin/livecd-iso-to-disk" %>\ + %if exists(f):\ + install ${f} ${LIVEDIR}/${f|basename}\ + %endif\ + ' /usr/share/lorax/templates.d/99-generic/live/x86.tmpl +fi +%end + +%post +# xfce configuration +# create /etc/sysconfig/desktop (needed for installation) + +cat > /etc/sysconfig/desktop <> /etc/rc.d/init.d/livesys << EOF + +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 i3 as default session, otherwise login will fail +sed -i 's/^#user-session=.*/user-session=i3/' /etc/lightdm/lightdm.conf + +# 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 + +# set background on LiveOS using feh by adding it .profile +echo "/usr/bin/feh --bg-scale /usr/share/backgrounds/default.png" >> /home/liveuser/.profile + +# this goes at the end after all other changes. +chown -R liveuser:liveuser /home/liveuser +restorecon -R /home/liveuser + + + +EOF + +%end + +%packages +@admin-tools +@anaconda-tools +@base-x +@core +@dial-up +@fonts +@guest-desktop-agents +@hardware-support +@input-methods +@multimedia +@networkmanager-submodules +@printing +@standard +azote +lightdm-gtk +aajohan-comfortaa-fonts +anaconda +anaconda-install-env-deps +anaconda-live +chkconfig +dracut-live +firefox +gedit +glibc-all-langpacks +gnome-keyring-pam +initscripts +kernel +kernel-modules +kernel-modules-extra +memtest86+ +syslinux +system-config-printer +wget +xscreensaver-extras +-acpid +-aspell-* +-autofs +-desktop-backgrounds-basic +-gimp-help +-hplip +-isdn4k-utils +-mpage +-sane-backends +-xsane +-xsane-gimp + +# i3 Packages +i3 +i3lock +i3status +dunst +brightlight +feh +%end