From 51d4c8ee451d9659c93faf00a099f1141e476235 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 25 Feb 2015 12:50:20 -0500 Subject: [PATCH 01/16] atomic: Change the URLs to point to F22 content --- fedora-cloud-atomic.ks | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fedora-cloud-atomic.ks b/fedora-cloud-atomic.ks index 46e192c..cc83d8c 100644 --- a/fedora-cloud-atomic.ks +++ b/fedora-cloud-atomic.ks @@ -30,14 +30,14 @@ volgroup atomicos pv.01 logvol / --size=3000 --fstype="xfs" --name=root --vgname=atomicos # Equivalent of %include fedora-repo.ks -ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=http://kojipkgs.fedoraproject.org/mash/atomic/rawhide/ --ref=fedora-atomic/rawhide/x86_64/docker-host +ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=http://kojipkgs.fedoraproject.org/mash/atomic/22/ --ref=fedora-atomic/f22/x86_64/docker-host reboot %post --erroronfail # See https://github.com/projectatomic/rpm-ostree/issues/42 ostree remote delete fedora-atomic -ostree remote add --set=gpg-verify=false fedora-atomic 'http://dl.fedoraproject.org/pub/fedora/linux/atomic/rawhide/' +ostree remote add --set=gpg-verify=false fedora-atomic 'http://dl.fedoraproject.org/pub/fedora/linux/atomic/22/' # older versions of livecd-tools do not follow "rootpw --lock" line above # https://bugzilla.redhat.com/show_bug.cgi?id=964299 From ee4bc19ae7737fe1e426011feab81c832c70c9ea Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 25 Feb 2015 17:26:42 -0500 Subject: [PATCH 02/16] fedora-cloud-atomic-vagrant: New file for Changes/Vagrant_Box_Atomic See https://fedoraproject.org/wiki/Changes/Vagrant_Box_Atomic --- fedora-cloud-atomic-vagrant.ks | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 fedora-cloud-atomic-vagrant.ks diff --git a/fedora-cloud-atomic-vagrant.ks b/fedora-cloud-atomic-vagrant.ks new file mode 100644 index 0000000..caea274 --- /dev/null +++ b/fedora-cloud-atomic-vagrant.ks @@ -0,0 +1,28 @@ +# Like the Atomic cloud image, but tuned for vagrant. Enable +# the vagrant user, disable cloud-init. + +%include fedora-cloud-atomic.ks + +services --disabled=cloud-init,cloud-init-local,cloud-config,cloud-final + +user --name=vagrant --password=vagrant + +%post --erroronfail + +# Work around cloud-init being both disabled and enabled; need +# to refactor to a common base. +rm /etc/systemd/system/multi-user.target.wants/cloud-init* /etc/systemd/system/multi-user.target.wants/cloud-config* + +# Vagrant setup +sed -i 's,Defaults\\s*requiretty,Defaults !requiretty,' /etc/sudoers +echo 'vagrant ALL=NOPASSWD: ALL' > /etc/sudoers.d/vagrant-nopasswd +sed -i 's/.*UseDNS.*/UseDNS no/' /etc/ssh/sshd_config +mkdir -m 0700 -p ~vagrant/.ssh +cat > ~vagrant/.ssh/authorized_keys << EOKEYS +ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ== vagrant insecure public key +EOKEYS +chmod 600 ~vagrant/.ssh/authorized_keys +chown -R vagrant:vagrant ~vagrant/.ssh/ + +%end + From eae3708bcac2697e0b6e0e562898514455d0ef31 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 25 Feb 2015 19:04:26 -0600 Subject: [PATCH 03/16] add arm server image --- fedora-arm-server.ks | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 fedora-arm-server.ks diff --git a/fedora-arm-server.ks b/fedora-arm-server.ks new file mode 100644 index 0000000..a5190d8 --- /dev/null +++ b/fedora-arm-server.ks @@ -0,0 +1,29 @@ +%include fedora-arm-base.ks + +%packages +-@fedora-release-nonproduct +-@dial-up +# install the default groups for the server evironment since installing the environment is not working +@server-product +@standard +@headless-management +@container-management +@domain-client +-initial-setup-gui +-generic-release* +%end + +%post + +# setup systemd to boot to the right runlevel +echo -n "Setting default runlevel to multiuser text mode" +rm -f /etc/systemd/system/default.target +ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target +echo . + +echo -n "Enabling initial-setup text mode on startup" +ln -s /usr/lib/systemd/system/initial-setup-text.service /etc/systemd/system/multi-user.target.wants/initial-setup-text.service +echo . + +%end + From 9eed55b9e5be21a0c2837465c24f2b25ee926147 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 25 Feb 2015 22:20:42 -0500 Subject: [PATCH 04/16] cloud-atomic-pxetolive: New file For the Atomic Host PXE-to-Live feature. --- fedora-cloud-atomic-pxetolive.ks | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 fedora-cloud-atomic-pxetolive.ks diff --git a/fedora-cloud-atomic-pxetolive.ks b/fedora-cloud-atomic-pxetolive.ks new file mode 100644 index 0000000..48dd31c --- /dev/null +++ b/fedora-cloud-atomic-pxetolive.ks @@ -0,0 +1,30 @@ +# PXE-to-Live Atomic: PXE boot directly into a running Atomic Host +# https://fedoraproject.org/wiki/Changes/AtomicHost + +lang en_US.UTF-8 +keyboard us +timezone America/New_York +zerombr +clearpart --all --initlabel +rootpw --lock --iscrypted locked +user --name=none +bootloader --timeout=1 +network --bootproto=dhcp --device=link --activate +# We are only able to install atomic with separate /boot partition currently +part / --fstype="ext4" --size=6000 +part /boot --size=500 --fstype="ext4" +shutdown +services --disabled=docker-storage-setup,network + +ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=http://kojipkgs.fedoraproject.org/mash/atomic/22/ --ref=fedora-atomic/f22/x86_64/docker-host + +%post + +# Ensure the root password is locked, we use cloud-init +passwd -l root +userdel -r none + +# We copy content of separate /boot partition to root part when building live squashfs image, +# and we don't want systemd to try to mount it when pxe booting +cat /dev/null > /etc/fstab +%end From 75e15f1dd2b46265d31c69631ae133d6f84321e6 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Thu, 26 Feb 2015 20:06:59 +0100 Subject: [PATCH 05/16] fedora-live-kde-base.ks: Change the autologin Session to plasma.desktop. Plasma 5 uses plasma.desktop instead of kde-plasma.desktop. --- fedora-live-kde-base.ks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-live-kde-base.ks b/fedora-live-kde-base.ks index 61de5a2..587b37c 100644 --- a/fedora-live-kde-base.ks +++ b/fedora-live-kde-base.ks @@ -47,7 +47,7 @@ else cat > /etc/sddm.conf << SDDM_EOF [Autologin] User=liveuser -Session=kde-plasma.desktop +Session=plasma.desktop SDDM_EOF fi From a8e9553e5cc44f9ec39be71616b29d1e02458cf2 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Fri, 27 Feb 2015 20:09:04 -0800 Subject: [PATCH 06/16] design-suite: add design team and suite page shortcut --- fedora-live-design_suite.ks | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/fedora-live-design_suite.ks b/fedora-live-design_suite.ks index 621071b..3afe599 100644 --- a/fedora-live-design_suite.ks +++ b/fedora-live-design_suite.ks @@ -107,6 +107,35 @@ Categories=Graphics;Documentation; FOE chmod a+x /usr/share/applications/list-design-tutorials.desktop +<<<<<<< HEAD +======= +# Add information about Fedora Design Suite +cat >> /usr/share/applications/fedora-design-suite.desktop << FOE +[Desktop Entry] +Name=About Design Team +GenericName=About Design Team +Comment=Wiki page of Design Team +Exec=xdg-open http://fedoraproject.org/wiki/Design_Suite +Type=Application +Icon=applications-internet +Categories=Documentation; +FOE +chmod a+x /usr/share/applications/fedora-design-suite.desktop + +# Add information about Fedora Design Team +cat >> /usr/share/applications/fedora-design-team.desktop << FOE +[Desktop Entry] +Name=About Design Suite +GenericName=About Design Suite Wiki Page +Comment=Wiki page of Design Team +Exec=xdg-open http://fedoraproject.org/wiki/Design +Type=Application +Icon=applications-internet +Categories=Documentation; +FOE +chmod a+x /usr/share/applications/fedora-design-team.desktop + +>>>>>>> d07dcbc... design-suite: add design team and suite page shortcut # rebuild schema cache with any overrides we installed glib-compile-schemas /usr/share/glib-2.0/schemas From 37dc4aa02f3f4924e9a3aace738e2fd5c266a868 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Fri, 27 Feb 2015 20:12:21 -0800 Subject: [PATCH 07/16] design-suite: add design team and suite page minor revision --- fedora-live-design_suite.ks | 2 -- 1 file changed, 2 deletions(-) diff --git a/fedora-live-design_suite.ks b/fedora-live-design_suite.ks index 3afe599..22a1b9f 100644 --- a/fedora-live-design_suite.ks +++ b/fedora-live-design_suite.ks @@ -139,7 +139,5 @@ chmod a+x /usr/share/applications/fedora-design-team.desktop # rebuild schema cache with any overrides we installed glib-compile-schemas /usr/share/glib-2.0/schemas -#EOF - %end From 9c52c11e9a0b1aa0f90d18855bb9aa3f35b87529 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Fri, 27 Feb 2015 20:15:15 -0800 Subject: [PATCH 08/16] design-suite: remove conflict text in ks --- fedora-live-design_suite.ks | 3 --- 1 file changed, 3 deletions(-) diff --git a/fedora-live-design_suite.ks b/fedora-live-design_suite.ks index 22a1b9f..58b8827 100644 --- a/fedora-live-design_suite.ks +++ b/fedora-live-design_suite.ks @@ -107,8 +107,6 @@ Categories=Graphics;Documentation; FOE chmod a+x /usr/share/applications/list-design-tutorials.desktop -<<<<<<< HEAD -======= # Add information about Fedora Design Suite cat >> /usr/share/applications/fedora-design-suite.desktop << FOE [Desktop Entry] @@ -135,7 +133,6 @@ Categories=Documentation; FOE chmod a+x /usr/share/applications/fedora-design-team.desktop ->>>>>>> d07dcbc... design-suite: add design team and suite page shortcut # rebuild schema cache with any overrides we installed glib-compile-schemas /usr/share/glib-2.0/schemas From b1c14531ce6ad7e3b737e76d6f2f7765c0408bee Mon Sep 17 00:00:00 2001 From: raveit65 Date: Sun, 1 Mar 2015 03:49:03 +0100 Subject: [PATCH 09/16] Mate: add libreoffice suite + drop some removes --- fedora-livecd-mate_compiz.ks | 53 ++++++------------------------------ 1 file changed, 9 insertions(+), 44 deletions(-) diff --git a/fedora-livecd-mate_compiz.ks b/fedora-livecd-mate_compiz.ks index 2603b70..f7497e3 100644 --- a/fedora-livecd-mate_compiz.ks +++ b/fedora-livecd-mate_compiz.ks @@ -17,12 +17,17 @@ mate-netspeed system-config-printer system-config-printer-applet - # audio player audacious +# office +@libreoffice + +# dsl tools +rp-pppoe + # First, no office --planner +#-planner # Drop things for size -@3d-printing @@ -39,43 +44,21 @@ audacious -gnome-icon-theme-symbolic -gnome-software -gnome-themes +-gnome-themes-standard -gnome-user-docs --gstreamer1-plugins-good --gstreamer1-plugins-bad-free --gstreamer-plugins-good --gstreamer-plugins-bad-free --gstreamer-plugins-espeak --@guest-desktop-agents --@libreoffice + -@mate-applications -mate-icon-theme-faenza -NetworkManager-bluetooth --samba-client --ibus-chewing --libical --OpenEXR-libs # Drop oversized fonts that aren't needed --gnu-free-mono-fonts --gnu-free-fonts-common --gnu-free-serif-fonts --gnu-free-sans-fonts --stix-fonts - -# Drop the Java plugin --icedtea-web --java-1.8.0-openjdk # Drop things that pull in perl --linux-atm # Dictionaries are big # we're going to try keeping hunspell-* after notting, davidz, and ajax voiced # strong preference to giving it a go on #fedora-desktop. # also see http://bugzilla.gnome.org/681084 --aspell-* --man-pages* --words # Help and art can be big, too -gnome-user-docs @@ -84,24 +67,6 @@ audacious -*backgrounds-extras # Legacy cmdline things we don't want --krb5-auth-dialog --krb5-workstation --pam_krb5 - --minicom - --jwhois --mtr --pinfo --rsh --ypbind --yp-tools --ntsysv - -# Drop some system-config things --system-config-rootpassword --system-config-services --policycoreutils-gui %end From 341e2f56f958d74b322771ad5b0198894846e3f8 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Sun, 1 Mar 2015 13:32:10 -0500 Subject: [PATCH 10/16] atomic-pxetolive: Enable cloud-init Now that it's properly disabled by default in the package, we need to enable it here. --- fedora-cloud-atomic-pxetolive.ks | 1 + 1 file changed, 1 insertion(+) diff --git a/fedora-cloud-atomic-pxetolive.ks b/fedora-cloud-atomic-pxetolive.ks index 48dd31c..4c67673 100644 --- a/fedora-cloud-atomic-pxetolive.ks +++ b/fedora-cloud-atomic-pxetolive.ks @@ -15,6 +15,7 @@ part / --fstype="ext4" --size=6000 part /boot --size=500 --fstype="ext4" shutdown services --disabled=docker-storage-setup,network +services --enabled=NetworkManager,sshd,cloud-init,cloud-init-local,cloud-config,cloud-final ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=http://kojipkgs.fedoraproject.org/mash/atomic/22/ --ref=fedora-atomic/f22/x86_64/docker-host From 66b3b50b895e66c7c00ec66fba0babaa2edcc65c Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 2 Mar 2015 18:22:30 -0800 Subject: [PATCH 11/16] fedora-live-kde-base.ks: follow-up to autologin session fix There's *two* places where the session name is referenced, Kev only fixed one. --- fedora-live-kde-base.ks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-live-kde-base.ks b/fedora-live-kde-base.ks index 587b37c..e71bcea 100644 --- a/fedora-live-kde-base.ks +++ b/fedora-live-kde-base.ks @@ -42,7 +42,7 @@ chown liveuser:liveuser /home/liveuser/.xsession # 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=kde-plasma.desktop/' /etc/sddm.conf +sed -i 's/^#Session=.*/Session=plasma.desktop/' /etc/sddm.conf else cat > /etc/sddm.conf << SDDM_EOF [Autologin] From 7c328c99654a2c429d652ad83dfcf3003e454cbc Mon Sep 17 00:00:00 2001 From: Amit Saha Date: Wed, 4 Mar 2015 12:01:25 +1000 Subject: [PATCH 12/16] Fedora Scientific: Remove the translation packages for now Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1197940 --- fedora-livedvd-scientific_kde.ks | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fedora-livedvd-scientific_kde.ks b/fedora-livedvd-scientific_kde.ks index 84f24c7..0bf13f5 100644 --- a/fedora-livedvd-scientific_kde.ks +++ b/fedora-livedvd-scientific_kde.ks @@ -171,6 +171,10 @@ hevea #Include Mozilla Firefox firefox +# Omit KDE 4 translations for now: https://bugzilla.redhat.com/show_bug.cgi?id=1197940 +-kde-l10n-* +-calligra-l10n-* + %end %post From 264303aac17fc131aa67152f39330bf4dcef4bbe Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 4 Mar 2015 11:58:01 -0500 Subject: [PATCH 13/16] atomic-vagrant: Mask cloud-init instead of using rm on /etc Now that cloud-init is enabled in the systemd unit, that change goes in /usr/lib...which we can't easily change. There are two potentially sane solutions: - Refactor the kickstarts here - Some support for systemd presets in kickstart files would allow us to have a later override here --- fedora-cloud-atomic-vagrant.ks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-cloud-atomic-vagrant.ks b/fedora-cloud-atomic-vagrant.ks index caea274..b91c01f 100644 --- a/fedora-cloud-atomic-vagrant.ks +++ b/fedora-cloud-atomic-vagrant.ks @@ -11,7 +11,7 @@ user --name=vagrant --password=vagrant # Work around cloud-init being both disabled and enabled; need # to refactor to a common base. -rm /etc/systemd/system/multi-user.target.wants/cloud-init* /etc/systemd/system/multi-user.target.wants/cloud-config* +systemctl mask cloud-init cloud-init-local cloud-config cloud-final # Vagrant setup sed -i 's,Defaults\\s*requiretty,Defaults !requiretty,' /etc/sudoers From 16b8801b8edcbf482f20cfa6e4daca8d4627285c Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 6 Mar 2015 13:17:41 -0700 Subject: [PATCH 14/16] Try this as a fix for ldconfig being so slow on boot on live media. bug 1195998 --- fedora-live-base.ks | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fedora-live-base.ks b/fedora-live-base.ks index 8f2ddc2..f0e94c7 100644 --- a/fedora-live-base.ks +++ b/fedora-live-base.ks @@ -305,6 +305,9 @@ if [ -x /usr/bin/fc-cache ] ; then fc-cache -f fi +echo 'File created by kickstart. See systemd-update-done.service(8).' \ + | tee /etc/.updated >/var/.updated + %end From db8c33a53f1d7ad1bdd98723889b9fb4942ab9ef Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Mar 2015 11:12:24 -0600 Subject: [PATCH 15/16] switch teh docker base image to dnf --- fedora-docker-base.ks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-docker-base.ks b/fedora-docker-base.ks index d9597eb..378bff2 100644 --- a/fedora-docker-base.ks +++ b/fedora-docker-base.ks @@ -21,7 +21,7 @@ bash fedora-release rootfiles vim-minimal -yum +dnf #fakesystemd #TODO: waiting for review https://bugzilla.redhat.com/show_bug.cgi?id=1118740 -kernel From d4d001c54999e8f5401ca3f7b5d9b6a2d0132093 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Sun, 8 Mar 2015 15:13:15 +0100 Subject: [PATCH 16/16] Mate: add more packages --- fedora-livecd-mate_compiz.ks | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/fedora-livecd-mate_compiz.ks b/fedora-livecd-mate_compiz.ks index f7497e3..5836305 100644 --- a/fedora-livecd-mate_compiz.ks +++ b/fedora-livecd-mate_compiz.ks @@ -12,6 +12,12 @@ caja-actions mate-disk-usage-analyzer mate-netspeed +mate-themes-extras + +# more backgrounds +f22-backgrounds-mate +f21-backgrounds-extras-base +f21-backgrounds-extras-mate # system tools system-config-printer @@ -26,17 +32,12 @@ audacious # dsl tools rp-pppoe -# First, no office -#-planner - # Drop things for size -@3d-printing -brasero -bluez -bluez-cups -colord --@dial-up --espeak -fedora-icon-theme -GConf2 -gnome-bluetooth-libs @@ -63,10 +64,9 @@ rp-pppoe # Help and art can be big, too -gnome-user-docs -evolution-help --desktop-backgrounds-basic --*backgrounds-extras # Legacy cmdline things we don't want +-telnet %end