From a355ff602c8e5d6a0355b71d63995c9ba665a269 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 19 Oct 2015 16:35:38 +0200 Subject: [PATCH 01/23] workstation: Include cached metadata for PackageKit Instead of taking the metadata from PackageKit-cached-metadata package as we were doing previously, copy it over directly during the compose from https://kojipkgs.fedoraproject.org/mash/ This makes it much less error prone as we always get the very latest metadata, and makes maintenance much simpler as we don't need to roll PackageKit-cached-metadata by hand. Users are also going to appreciate this because it makes post-GA updates smaller as they won't have to download updates for the PackageKit-cached-metadata subpackage each time PackageKit gets updated. --- fedora-live-workstation.ks | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/fedora-live-workstation.ks b/fedora-live-workstation.ks index 9038413..6857b86 100644 --- a/fedora-live-workstation.ks +++ b/fedora-live-workstation.ks @@ -12,6 +12,36 @@ part / --size 6144 # This is a huge file and things work ok without it rm -f /usr/share/icons/HighContrast/icon-theme.cache +# Copy initial metadata for PackageKit +PK_PREFIX=`mktemp -d` +mkdir -p $PK_PREFIX/etc/yum.repos.d +if [ -f /etc/yum.repos.d/fedora.repo ] ; then + cp /etc/yum.repos.d/fedora.repo $PK_PREFIX/etc/yum.repos.d/ + sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch|baseurl=https://kojipkgs.fedoraproject.org/mash/branched/$basearch/os/|' \ + $PK_PREFIX/etc/yum.repos.d/fedora.repo +fi +if [ -f /etc/yum.repos.d/fedora-updates.repo ] ; then + cp /etc/yum.repos.d/fedora-updates.repo $PK_PREFIX/etc/yum.repos.d/ + sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch|baseurl=https://kojipkgs.fedoraproject.org/mash/updates/f$releasever-updates/$basearch/|' \ + $PK_PREFIX/etc/yum.repos.d/fedora-updates.repo +fi +if [ -f /etc/yum.repos.d/fedora-updates-testing.repo ] ; then + cp /etc/yum.repos.d/fedora-updates-testing.repo $PK_PREFIX/etc/yum.repos.d/ + sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch|baseurl=https://kojipkgs.fedoraproject.org/mash/updates/f$releasever-updates-testing/$basearch/|' \ + $PK_PREFIX/etc/yum.repos.d/fedora-updates-testing.repo +fi +if [ -f /etc/yum.repos.d/fedora-rawhide.repo ] ; then + cp /etc/yum.repos.d/fedora-rawhide.repo $PK_PREFIX/etc/yum.repos.d/ + sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch|baseurl=https://kojipkgs.fedoraproject.org/mash/rawhide/$basearch/os/|' \ + $PK_PREFIX/etc/yum.repos.d/fedora-rawhide.repo +fi +rpm --root=$PK_PREFIX --initdb +DESTDIR=$PK_PREFIX /usr/libexec/packagekit-direct refresh +if [ -d /var/cache/PackageKit ] ; then + mv $PK_PREFIX/var/cache/PackageKit/* /var/cache/PackageKit/ +fi +rm -rf $PK_PREFIX + cat >> /etc/rc.d/init.d/livesys << EOF From 9fe671fe49123a2592bcd86e61a3ae5df9f875eb Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 20 Oct 2015 08:41:12 -0500 Subject: [PATCH 02/23] kde: Plasma session notifies for available updates See also http://bugzilla.redhat.com/1262600 --- fedora-live-kde-base.ks | 1 + 1 file changed, 1 insertion(+) diff --git a/fedora-live-kde-base.ks b/fedora-live-kde-base.ks index 611b2e0..4819a2f 100644 --- a/fedora-live-kde-base.ks +++ b/fedora-live-kde-base.ks @@ -58,6 +58,7 @@ AKONADI_EOF # Disable plasma-pk-updates sed -i \ -e "s|^X-KDE-PluginInfo-EnabledByDefault=true|X-KDE-PluginInfo-EnabledByDefault=false|g" \ + /usr/share/plasma/plasmoids/org.kde.plasma.pkupdates/metadata.desktop \ /usr/share/kservices5/plasma-applet-org.kde.plasma.pkupdates.desktop # Disable baloo From 6817b9661fff75dfa915a3842ce1b2a5da8dc935 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 19 Oct 2015 14:56:27 -0500 Subject: [PATCH 03/23] split pk cached metadata hack into include'able snippet and add to -kde-base --- fedora-live-kde-base.ks | 2 ++ fedora-live-workstation.ks | 30 +--------------------------- fedora-packagekit-cached-metadata.ks | 30 ++++++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 29 deletions(-) create mode 100644 fedora-packagekit-cached-metadata.ks diff --git a/fedora-live-kde-base.ks b/fedora-live-kde-base.ks index 4819a2f..1d5ed5c 100644 --- a/fedora-live-kde-base.ks +++ b/fedora-live-kde-base.ks @@ -19,6 +19,8 @@ cat > /root/.config/gtk-3.0/settings.ini << EOF gtk-theme-name = Adwaita EOF +%include fedora-packagekit-cached-metadata.ks + # add initscript cat >> /etc/rc.d/init.d/livesys << EOF diff --git a/fedora-live-workstation.ks b/fedora-live-workstation.ks index 6857b86..cc8ef57 100644 --- a/fedora-live-workstation.ks +++ b/fedora-live-workstation.ks @@ -12,35 +12,7 @@ part / --size 6144 # This is a huge file and things work ok without it rm -f /usr/share/icons/HighContrast/icon-theme.cache -# Copy initial metadata for PackageKit -PK_PREFIX=`mktemp -d` -mkdir -p $PK_PREFIX/etc/yum.repos.d -if [ -f /etc/yum.repos.d/fedora.repo ] ; then - cp /etc/yum.repos.d/fedora.repo $PK_PREFIX/etc/yum.repos.d/ - sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch|baseurl=https://kojipkgs.fedoraproject.org/mash/branched/$basearch/os/|' \ - $PK_PREFIX/etc/yum.repos.d/fedora.repo -fi -if [ -f /etc/yum.repos.d/fedora-updates.repo ] ; then - cp /etc/yum.repos.d/fedora-updates.repo $PK_PREFIX/etc/yum.repos.d/ - sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch|baseurl=https://kojipkgs.fedoraproject.org/mash/updates/f$releasever-updates/$basearch/|' \ - $PK_PREFIX/etc/yum.repos.d/fedora-updates.repo -fi -if [ -f /etc/yum.repos.d/fedora-updates-testing.repo ] ; then - cp /etc/yum.repos.d/fedora-updates-testing.repo $PK_PREFIX/etc/yum.repos.d/ - sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch|baseurl=https://kojipkgs.fedoraproject.org/mash/updates/f$releasever-updates-testing/$basearch/|' \ - $PK_PREFIX/etc/yum.repos.d/fedora-updates-testing.repo -fi -if [ -f /etc/yum.repos.d/fedora-rawhide.repo ] ; then - cp /etc/yum.repos.d/fedora-rawhide.repo $PK_PREFIX/etc/yum.repos.d/ - sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch|baseurl=https://kojipkgs.fedoraproject.org/mash/rawhide/$basearch/os/|' \ - $PK_PREFIX/etc/yum.repos.d/fedora-rawhide.repo -fi -rpm --root=$PK_PREFIX --initdb -DESTDIR=$PK_PREFIX /usr/libexec/packagekit-direct refresh -if [ -d /var/cache/PackageKit ] ; then - mv $PK_PREFIX/var/cache/PackageKit/* /var/cache/PackageKit/ -fi -rm -rf $PK_PREFIX +%include fedora-packagekit-cached-metadata.ks cat >> /etc/rc.d/init.d/livesys << EOF diff --git a/fedora-packagekit-cached-metadata.ks b/fedora-packagekit-cached-metadata.ks new file mode 100644 index 0000000..d2ef0f1 --- /dev/null +++ b/fedora-packagekit-cached-metadata.ks @@ -0,0 +1,30 @@ +# Copy initial metadata for PackageKit +PK_PREFIX=`mktemp -d` +mkdir -p $PK_PREFIX/etc/yum.repos.d +if [ -f /etc/yum.repos.d/fedora.repo ] ; then + cp /etc/yum.repos.d/fedora.repo $PK_PREFIX/etc/yum.repos.d/ + sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch|baseurl=https://kojipkgs.fedoraproject.org/mash/branched/$basearch/os/|' \ + $PK_PREFIX/etc/yum.repos.d/fedora.repo +fi +if [ -f /etc/yum.repos.d/fedora-updates.repo ] ; then + cp /etc/yum.repos.d/fedora-updates.repo $PK_PREFIX/etc/yum.repos.d/ + sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch|baseurl=https://kojipkgs.fedoraproject.org/mash/updates/f$releasever-updates/$basearch/|' \ + $PK_PREFIX/etc/yum.repos.d/fedora-updates.repo +fi +if [ -f /etc/yum.repos.d/fedora-updates-testing.repo ] ; then + cp /etc/yum.repos.d/fedora-updates-testing.repo $PK_PREFIX/etc/yum.repos.d/ + sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch|baseurl=https://kojipkgs.fedoraproject.org/mash/updates/f$releasever-updates-testing/$basearch/|' \ + $PK_PREFIX/etc/yum.repos.d/fedora-updates-testing.repo +fi +if [ -f /etc/yum.repos.d/fedora-rawhide.repo ] ; then + cp /etc/yum.repos.d/fedora-rawhide.repo $PK_PREFIX/etc/yum.repos.d/ + sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch|baseurl=https://kojipkgs.fedoraproject.org/mash/rawhide/$basearch/os/|' \ + $PK_PREFIX/etc/yum.repos.d/fedora-rawhide.repo +fi +rpm --root=$PK_PREFIX --initdb +DESTDIR=$PK_PREFIX /usr/libexec/packagekit-direct refresh +if [ -d /var/cache/PackageKit ] ; then + mv $PK_PREFIX/var/cache/PackageKit/* /var/cache/PackageKit/ +fi +rm -rf $PK_PREFIX + From 2459d8254be561f0167398e5d1e10ccb8a3f0cb8 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 20 Oct 2015 20:17:29 +0200 Subject: [PATCH 04/23] Move packagekit-cached-metadata.ks to snippets/ ... and make it a top-level script wrapped in %post ... %end. --- fedora-live-kde-base.ks | 3 +-- fedora-live-workstation.ks | 3 +-- .../packagekit-cached-metadata.ks | 6 +++++- 3 files changed, 7 insertions(+), 5 deletions(-) rename fedora-packagekit-cached-metadata.ks => snippets/packagekit-cached-metadata.ks (96%) diff --git a/fedora-live-kde-base.ks b/fedora-live-kde-base.ks index 1d5ed5c..3e1d26a 100644 --- a/fedora-live-kde-base.ks +++ b/fedora-live-kde-base.ks @@ -4,6 +4,7 @@ %include fedora-live-base.ks %include fedora-kde-packages.ks +%include snippets/packagekit-cached-metadata.ks %post @@ -19,8 +20,6 @@ cat > /root/.config/gtk-3.0/settings.ini << EOF gtk-theme-name = Adwaita EOF -%include fedora-packagekit-cached-metadata.ks - # add initscript cat >> /etc/rc.d/init.d/livesys << EOF diff --git a/fedora-live-workstation.ks b/fedora-live-workstation.ks index cc8ef57..376ee72 100644 --- a/fedora-live-workstation.ks +++ b/fedora-live-workstation.ks @@ -4,6 +4,7 @@ %include fedora-live-base.ks %include fedora-workstation-packages.ks +%include snippets/packagekit-cached-metadata.ks part / --size 6144 @@ -12,8 +13,6 @@ part / --size 6144 # This is a huge file and things work ok without it rm -f /usr/share/icons/HighContrast/icon-theme.cache -%include fedora-packagekit-cached-metadata.ks - cat >> /etc/rc.d/init.d/livesys << EOF diff --git a/fedora-packagekit-cached-metadata.ks b/snippets/packagekit-cached-metadata.ks similarity index 96% rename from fedora-packagekit-cached-metadata.ks rename to snippets/packagekit-cached-metadata.ks index d2ef0f1..140d5e5 100644 --- a/fedora-packagekit-cached-metadata.ks +++ b/snippets/packagekit-cached-metadata.ks @@ -1,4 +1,7 @@ -# Copy initial metadata for PackageKit +# %post script to include initial metadata for PackageKit + +%post + PK_PREFIX=`mktemp -d` mkdir -p $PK_PREFIX/etc/yum.repos.d if [ -f /etc/yum.repos.d/fedora.repo ] ; then @@ -28,3 +31,4 @@ if [ -d /var/cache/PackageKit ] ; then fi rm -rf $PK_PREFIX +%end From d293e561f4fda68698fc5537789d9f4ae31dbedc Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 20 Oct 2015 20:18:58 +0200 Subject: [PATCH 05/23] packagekit-cached-metadata.ks: Use http for kojipkgs.fedoraproject.org It turns out that koji builders can't access kojipkgs.fedoraproject.org over https, but plain http works just fine. --- snippets/packagekit-cached-metadata.ks | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/snippets/packagekit-cached-metadata.ks b/snippets/packagekit-cached-metadata.ks index 140d5e5..163f2cb 100644 --- a/snippets/packagekit-cached-metadata.ks +++ b/snippets/packagekit-cached-metadata.ks @@ -6,22 +6,22 @@ PK_PREFIX=`mktemp -d` mkdir -p $PK_PREFIX/etc/yum.repos.d if [ -f /etc/yum.repos.d/fedora.repo ] ; then cp /etc/yum.repos.d/fedora.repo $PK_PREFIX/etc/yum.repos.d/ - sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch|baseurl=https://kojipkgs.fedoraproject.org/mash/branched/$basearch/os/|' \ + sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch|baseurl=http://kojipkgs.fedoraproject.org/mash/branched/$basearch/os/|' \ $PK_PREFIX/etc/yum.repos.d/fedora.repo fi if [ -f /etc/yum.repos.d/fedora-updates.repo ] ; then cp /etc/yum.repos.d/fedora-updates.repo $PK_PREFIX/etc/yum.repos.d/ - sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch|baseurl=https://kojipkgs.fedoraproject.org/mash/updates/f$releasever-updates/$basearch/|' \ + sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch|baseurl=http://kojipkgs.fedoraproject.org/mash/updates/f$releasever-updates/$basearch/|' \ $PK_PREFIX/etc/yum.repos.d/fedora-updates.repo fi if [ -f /etc/yum.repos.d/fedora-updates-testing.repo ] ; then cp /etc/yum.repos.d/fedora-updates-testing.repo $PK_PREFIX/etc/yum.repos.d/ - sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch|baseurl=https://kojipkgs.fedoraproject.org/mash/updates/f$releasever-updates-testing/$basearch/|' \ + sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch|baseurl=http://kojipkgs.fedoraproject.org/mash/updates/f$releasever-updates-testing/$basearch/|' \ $PK_PREFIX/etc/yum.repos.d/fedora-updates-testing.repo fi if [ -f /etc/yum.repos.d/fedora-rawhide.repo ] ; then cp /etc/yum.repos.d/fedora-rawhide.repo $PK_PREFIX/etc/yum.repos.d/ - sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch|baseurl=https://kojipkgs.fedoraproject.org/mash/rawhide/$basearch/os/|' \ + sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch|baseurl=http://kojipkgs.fedoraproject.org/mash/rawhide/$basearch/os/|' \ $PK_PREFIX/etc/yum.repos.d/fedora-rawhide.repo fi rpm --root=$PK_PREFIX --initdb From a6d3b1c4561db37fc209fa1fc0ce45cb3935c107 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 20 Oct 2015 20:23:23 +0200 Subject: [PATCH 06/23] packagekit-cached-metadata.ks: Set up resolv.conf and hosts files Copy over host system's /etc/resolv.conf and /etc/hosts to make it possible to resolve kojipkgs.fedoraproject.org inside the chroot. --- snippets/packagekit-cached-metadata.ks | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/snippets/packagekit-cached-metadata.ks b/snippets/packagekit-cached-metadata.ks index 163f2cb..af206b0 100644 --- a/snippets/packagekit-cached-metadata.ks +++ b/snippets/packagekit-cached-metadata.ks @@ -1,7 +1,20 @@ # %post script to include initial metadata for PackageKit +%post --nochroot +# Copy over files needed for networking inside the chroot +for f in /etc/resolv.conf /etc/hosts ; do + test -f $f && cp -a $f ${INSTALL_ROOT}${f}.kickstart +done +%end + %post +# Use host machine's resolv.conf and hosts files +for f in /etc/resolv.conf /etc/hosts ; do + test -f $f && mv $f $f.orig + test -f $f.kickstart && mv -f $f.kickstart $f +done + PK_PREFIX=`mktemp -d` mkdir -p $PK_PREFIX/etc/yum.repos.d if [ -f /etc/yum.repos.d/fedora.repo ] ; then @@ -31,4 +44,10 @@ if [ -d /var/cache/PackageKit ] ; then fi rm -rf $PK_PREFIX +# Restore original resolv.conf and hosts files +for f in /etc/resolv.conf /etc/hosts ; do + rm -f $f + test -f $f.orig && mv $f.orig $f +done + %end From 098f03f685839f0d7f92763521abe5b829e0c15c Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 21 Oct 2015 09:47:44 +0100 Subject: [PATCH 07/23] arm: fix up boot partitions --- fedora-arm-base.ks | 2 +- fedora-arm-minimal.ks | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/fedora-arm-base.ks b/fedora-arm-base.ks index e0a7537..a64b980 100644 --- a/fedora-arm-base.ks +++ b/fedora-arm-base.ks @@ -7,7 +7,7 @@ firewall --enabled --service=mdns,ssh # configure extlinux bootloader bootloader extlinux -part /boot --size=300 --fstype ext3 +part /boot --size=512 --fstype ext4 part swap --size=512 --fstype swap part / --size=3000 --fstype ext4 diff --git a/fedora-arm-minimal.ks b/fedora-arm-minimal.ks index afd7d9b..86f4e38 100644 --- a/fedora-arm-minimal.ks +++ b/fedora-arm-minimal.ks @@ -1,5 +1,6 @@ %include fedora-arm-base.ks +part /boot --size=300 --fstype ext4 part swap --size=256 --fstype swap part / --size=1200 --fstype ext4 From b773ad0ff90f500550fe45e0aecbba97e5d48122 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 22 Oct 2015 13:46:48 +0200 Subject: [PATCH 08/23] live base: Migrate yum's yumdb over to dnf As livecd-creator is still yum based, we only get yum's yumdb during live image composes. To work this around, this commit adds a %post script to fedora-live-base.ks to migrate yum's yumdb over to dnf. https://bugzilla.redhat.com/show_bug.cgi?id=1274319 --- fedora-live-base.ks | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/fedora-live-base.ks b/fedora-live-base.ks index 0d38791..2a22a6d 100644 --- a/fedora-live-base.ks +++ b/fedora-live-base.ks @@ -275,6 +275,15 @@ chmod 755 /etc/rc.d/init.d/livesys-late # enable tmpfs for /tmp systemctl enable tmp.mount +# As livecd-creator is still yum based, we only get yum's yumdb during the +# image compose. Migrate this over to dnf so that dnf and PackageKit can keep +# track where packages came from. +if [ ! -d /var/lib/dnf ]; then + mkdir -p /var/lib/dnf + mv /var/lib/yum/yumdb /var/lib/dnf/ + rm -rf /var/lib/yum/ +fi + # make it so that we don't do writing to the overlay for things which # are just tmpdirs/caches # note https://bugzilla.redhat.com/show_bug.cgi?id=1135475 From da8521bafab4a52b2598060532884bbc2dbbd0bb Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Sat, 24 Oct 2015 12:03:28 -0500 Subject: [PATCH 09/23] Games: needed to save more space Fedora has gotten significantly bigger since we started doing final TCs and even between final RCs. I am not sure why. But this cut will get the Games spin safely under 4 GiB. --- fedora-live-games.ks | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fedora-live-games.ks b/fedora-live-games.ks index aaff586..1ae3f75 100644 --- a/fedora-live-games.ks +++ b/fedora-live-games.ks @@ -35,13 +35,13 @@ armacycles-ad asc asc-music astromenace -beneath-a-steel-sky-cd +# beneath-a-steel-sky-cd scummvm games cut for size boswars btanks bzflag crossfire-client extremetuxracer -flight-of-the-amazon-queen-cd +# flight-of-the-amazon-queen-cd scummvm games cut for size freeciv freecol freedoom @@ -91,7 +91,7 @@ lbrickbuster2 # liquidwar # Would pull in fluid-soundfont-lite-patches londonlaw lordsawar -lure +# lure scummvm games cut for size # machineball # Would pull in fluid-soundfont-lite-patches nethack openlierox From 0b4dd5958be9252aec86bbe323ade444064b6319 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Mon, 26 Oct 2015 19:18:17 +0100 Subject: [PATCH 10/23] fedora-live-kde-base.ks: Don't shipped cached PackageKit metadata. This effectively reverts the recent change by rdieter, without undoing the refactoring. As per the IRC discussion, it looks like caching the metadata is not all that helpful with Apper or Muon (and I doubt it is actually helpful with ANY frontend, because updates will necessarily be outdated, and even the Everything repo usually changes one last time after the last RC, to officially push packages that the RC took from a side repo), we would only be increasing our spin size with stale metadata. --- fedora-live-kde-base.ks | 1 - 1 file changed, 1 deletion(-) diff --git a/fedora-live-kde-base.ks b/fedora-live-kde-base.ks index 3e1d26a..4819a2f 100644 --- a/fedora-live-kde-base.ks +++ b/fedora-live-kde-base.ks @@ -4,7 +4,6 @@ %include fedora-live-base.ks %include fedora-kde-packages.ks -%include snippets/packagekit-cached-metadata.ks %post From ee22a9c00c250e6b141094dfadc6a45a1ec7f7b2 Mon Sep 17 00:00:00 2001 From: Jan Pazdziora Date: Fri, 30 Oct 2015 15:06:48 +0100 Subject: [PATCH 11/23] Add sssd-client with .so's for easy integration with SSSD container. --- fedora-docker-base.ks | 1 + 1 file changed, 1 insertion(+) diff --git a/fedora-docker-base.ks b/fedora-docker-base.ks index 93cfbf5..4990a43 100644 --- a/fedora-docker-base.ks +++ b/fedora-docker-base.ks @@ -35,6 +35,7 @@ rootfiles vim-minimal dnf dnf-yum # https://fedorahosted.org/fesco/ticket/1312#comment:29 +sssd-client #fakesystemd #TODO: waiting for review https://bugzilla.redhat.com/show_bug.cgi?id=1118740 -kernel From d69335cb693a005815cc1eed1318a527ce41ca9f Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 4 Nov 2015 13:40:42 +0000 Subject: [PATCH 12/23] SoaS: minor updates --- fedora-live-soas.ks | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fedora-live-soas.ks b/fedora-live-soas.ks index 64f3ba6..3830ee4 100644 --- a/fedora-live-soas.ks +++ b/fedora-live-soas.ks @@ -51,6 +51,7 @@ org.laptop.StopWatchActivity org.laptop.community.Finance org.laptop.community.TypingTurtle org.laptop.sugar.Jukebox +org.laptop.Words org.eq.FotoToon org.gnome.Labyrinth com.laptop.Ruler @@ -58,6 +59,7 @@ org.sugarlabs.AbacusActivity org.sugarlabs.IRC org.sugarlabs.InfoSlicer org.sugarlabs.PortfolioActivity +org.sugarlabs.StoryActivity org.sugarlabs.VisualMatchActivity com.garycmartin.Moon mulawa.Countries From db62fb95bbba3d41c0c58b919a680cf1e487bb7f Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 4 Nov 2015 12:56:21 -0800 Subject: [PATCH 13/23] drop forced fontconfig cache generation, should not be needed Per discussion on #1169979, fontconfig upstream think they have the bugs licked, so this shouldn't be needed any more. We need to check the nightly lives after this and see if their caches are now correct. --- fedora-live-base.ks | 6 ------ 1 file changed, 6 deletions(-) diff --git a/fedora-live-base.ks b/fedora-live-base.ks index 2a22a6d..fb201d3 100644 --- a/fedora-live-base.ks +++ b/fedora-live-base.ks @@ -313,12 +313,6 @@ rm -f /core* # convince readahead not to collect # FIXME: for systemd -# forcibly regenerate fontconfig cache (so long as this live image has -# fontconfig) - see #1169979 -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 From 45f095ea8ca7f2b603de37498447ba42e54e339a Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 5 Nov 2015 09:36:56 -0700 Subject: [PATCH 14/23] Add some packages to Xfce spin. firefox and rfkill --- fedora-xfce-packages.ks | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fedora-xfce-packages.ks b/fedora-xfce-packages.ks index 8f17bd4..494bc0d 100644 --- a/fedora-xfce-packages.ks +++ b/fedora-xfce-packages.ks @@ -25,6 +25,10 @@ gnome-keyring-pam # Note that blank is still default. xscreensaver-extras wget +# Handy for debugging +rfkill +# Better more popular browser +firefox system-config-printer # save some space From dff74da0db53b2def82666cb324297a902a457c4 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 6 Nov 2015 09:08:00 +0100 Subject: [PATCH 15/23] Drop unused ks files from snippets/ --- snippets/autologin-gdm.ks | 12 -- snippets/autologin-kdm.ks | 33 ------ snippets/config-developer.ks | 7 -- snippets/config-electronic-lab.ks | 57 ---------- snippets/config-kde-gnome-keyring.ks | 19 ---- snippets/config-tracker.ks | 16 --- snippets/eeepc900-modifications.ks | 164 --------------------------- snippets/repository-debuginfo.ks | 25 ---- snippets/screensaver-gnome.ks | 5 - snippets/screensaver-kde.ks | 3 - snippets/sysconfig-kde.ks | 6 - snippets/sysconfig-xfce.ks | 5 - 12 files changed, 352 deletions(-) delete mode 100644 snippets/autologin-gdm.ks delete mode 100644 snippets/autologin-kdm.ks delete mode 100644 snippets/config-developer.ks delete mode 100644 snippets/config-electronic-lab.ks delete mode 100644 snippets/config-kde-gnome-keyring.ks delete mode 100644 snippets/config-tracker.ks delete mode 100644 snippets/eeepc900-modifications.ks delete mode 100644 snippets/repository-debuginfo.ks delete mode 100644 snippets/screensaver-gnome.ks delete mode 100644 snippets/screensaver-kde.ks delete mode 100644 snippets/sysconfig-kde.ks delete mode 100644 snippets/sysconfig-xfce.ks diff --git a/snippets/autologin-gdm.ks b/snippets/autologin-gdm.ks deleted file mode 100644 index cf23273..0000000 --- a/snippets/autologin-gdm.ks +++ /dev/null @@ -1,12 +0,0 @@ -# %post modifications for gdm - -cat >> /etc/rc.d/init.d/fedora-live << EOF -chown -R fedora:fedora /home/fedora -sed -i -e 's/\[daemon\]/[daemon]\nTimedLoginEnable=true\nTimedLogin=fedora\nTimedLoginDelay=60/' /etc/gdm/custom.conf -if [ -e /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png ] ; then - cp /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png /home/fedora/.face - chown fedora:fedora /home/fedora/.face - # TODO: would be nice to get e-d-s to pick this one up too... but how? -fi -EOF - diff --git a/snippets/autologin-kdm.ks b/snippets/autologin-kdm.ks deleted file mode 100644 index d19b42a..0000000 --- a/snippets/autologin-kdm.ks +++ /dev/null @@ -1,33 +0,0 @@ -# %post modifications for kdm and kde - -# add initscript -cat >> /etc/rc.d/init.d/fedora-live << EOF - -if [ -e /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png ] ; then - # use image also for kdm - mkdir -p /usr/share/apps/kdm/faces - cp /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png /usr/share/apps/kdm/faces/fedora.face.icon -fi - -# make fedora user use KDE -echo "startkde" > /home/fedora/.xsession -chmod a+x /home/fedora/.xsession -chown fedora:fedora /home/fedora/.xsession - -# set up autologin for user fedora -sed -i 's/#AutoLoginEnable=true/AutoLoginEnable=true/' /etc/kde/kdm/kdmrc -sed -i 's/#AutoLoginUser=fred/AutoLoginUser=fedora/' /etc/kde/kdm/kdmrc - -# set up user fedora as default user and preselected user -sed -i 's/#PreselectUser=Default/PreselectUser=Default/' /etc/kde/kdm/kdmrc -sed -i 's/#DefaultUser=johndoe/DefaultUser=fedora/' /etc/kde/kdm/kdmrc - -# add liveinst.desktop to favorites menu -mkdir -p /home/fedora/.kde/share/config/ -cat > /home/fedora/.kde/share/config/kickoffrc << MENU_EOF -[Favorites] -FavoriteURLs=/usr/share/applications/kde4/konqbrowser.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/kde4/systemsettings.desktop,/usr/share/applications/liveinst.desktop -MENU_EOF -chown -R fedora:fedora /home/fedora/.kde/ -EOF - diff --git a/snippets/config-developer.ks b/snippets/config-developer.ks deleted file mode 100644 index e1b6e3f..0000000 --- a/snippets/config-developer.ks +++ /dev/null @@ -1,7 +0,0 @@ -# %post modifications to add link to demonstration videos to desktop - -cat >> /etc/rc.d/init.d/fedora-live << EOF -pushd /home/fedora/Desktop -ln -s /usr/share/eclipse-demos-0.0.1 "Eclipse demonstration videos" -popd -EOF diff --git a/snippets/config-electronic-lab.ks b/snippets/config-electronic-lab.ks deleted file mode 100644 index 2c2c937..0000000 --- a/snippets/config-electronic-lab.ks +++ /dev/null @@ -1,57 +0,0 @@ -# %post modifications specifically for Fedora Electronic Lab - -# Fedora Electronic Lab: Kwin buttons -cat > /usr/share/kde-settings/kde-profile/default/share/config/kwinrc < /usr/share/kde-settings/kde-profile/default/share/config/klipperrc < /usr/share/kde-settings/kde-profile/default/share/config/clock_panelappletrc < /usr/share/kde-settings/kde-profile/default/share/config/kxkbrc < /etc/skel/.kde/env/start-custom.sh << EOF -#!/bin/sh -eval \`gnome-keyring-daemon\` -export GNOME_KEYRING_PID -export GNOME_KEYRING_SOCKET -EOF -chmod 755 /etc/skel/.kde/env/start-custom.sh - -cat > /etc/skel/.kde/shutdown/stop-custom.sh << EOF -#/bin/sh -if [-n "$GNOME_KEYRING_PID"]; then - kill $GNOME_KEYRING_PID -fi -EOF - -chmod 755 /etc/skel/.kde/shutdown/stop-custom.sh diff --git a/snippets/config-tracker.ks b/snippets/config-tracker.ks deleted file mode 100644 index d65ed43..0000000 --- a/snippets/config-tracker.ks +++ /dev/null @@ -1,16 +0,0 @@ -# %post modifications to configure tracker search - -mkdir -p /home/fedora/.config/tracker - -cat > /home/fedora/.config/tracker/tracker.cfg < /root/.config/tracker/tracker.cfg < /etc/acpi/actions/hotkeys.sh << EOHOTKEY -#!/bin/bash - -export DISPLAY=:0 - -case "$3" in - - #Fn+F2 - 00000010) - # Wlan On - /etc/acpi/actions/wlan.sh poweron - ;; - 00000011) - # Wlan Off - /etc/acpi/actions/wlan.sh poweroff - ;; - - #Fn+F6 - 00000012) - # Webcam switch - /etc/acpi/actions/camera.sh - # TaskManager - # /usr/bin/gnome-system-monitor - ;; - - #Fn+F7 - 00000013) - # Volume mute - /usr/bin/amixer set -D hw:0 Master toggle - ;; - - #Fn+F8 - 00000014) - # Volume down - /usr/bin/amixer set -D hw:0 Master 10%- unmute - ;; - - #Fn+F9 - 00000015) - # Volume up - /usr/bin/amixer set -D hw:0 Master 10%+ unmute - ;; - - #Fn+F5 - 00000030) - - /usr/bin/xrandr --output VGA --mode 1024x768 \ - --output LVDS --off - - if [[ "$?" != "0" ]]; then - - /usr/bin/xrandr --output VGA --preferred \ - --output LVDS --off - - fi - ;; - - 00000031) - - /usr/bin/xrandr --output LVDS --mode 800x480 \ - --output VGA --mode 800x600 - - ;; - - 00000032) - - /usr/bin/xrandr --output VGA --off \ - --output LVDS --preferred - - ;; - *) - logger "ACPI hotkey $3 action is not defined" - ;; -esac -EOHOTKEY - -###### WLAN ############################################################# -cat > /etc/acpi/actions/wlan.sh << EOF -#!/bin/bash - -PWR=$(cat /sys/devices/platform/eeepc/wlan) - -UnloadModules() { - rmmod ath_pci - rmmod ath_rate_sample - rmmod wlan_scan_sta - rmmod wlan_tkip - rmmod wlan_wep - rmmod wlan -} - -LoadModules() { - modprobe ath_pci -} - -case $1 in - poweron) - if [[ "$PWR" = "0" ]]; then - modprobe pciehp pciehp_force=1 - - echo 1 > /sys/devices/platform/eeepc/wlan - - rmmod pciehp - - fi - ;; - - poweroff) - if [[ "$PWR" = "1" ]]; then - - modprobe pciehp pciehp_force=1 - - ifconfig ath0 down - - wlanconfig ath0 destroy - - UnloadModules - - echo 0 > /sys/devices/platform/eeepc/wlan - - rmmod pciehp - - fi - ;; -esac -EOF - -###### Webcam ############################################################# -cat > /etc/acpi/actions/camera.sh << EOF - -#!/bin/bash - -CAMERA=$(cat /sys/devices/platform/eeepc/camera) - - if [[ "$CAMERA" = "0" ]]; then - echo 1 > /sys/devices/platform/eeepc/camera - else - echo 0 > /sys/devices/platform/eeepc/camera - fi -EOF - -chmod +x "/etc/acpi/actions/*" - -###### Shutdown fix ######################################################### -echo "modprobe -r snd-hda-intel" >> /sbin/halt.local -chmod 755 /sbin/halt.local - -###### Gnome display stuff ################################################## - -gconftool-2 --set /apps/nautilus/preferences/desktop_font --type string "Sans 8" -gconftool-2 --set /desktop/gnome/interface/document_font_name --type string "Sans 8" -gconftool-2 --set /desktop/gnome/interface/font_name --type string "Sans 8" -gconftool-2 --set /apps/metacity/general/titlebar_font --type string "Sans Bold 8" -gconftool-2 --set /desktop/gnome/interface/monospace_font_name --type string "Monospace 8" -gconftool-2 --set /apps/metacity/window_keybindings/toggle_fullscreen --type string "F11" -gconftool-2 --set /desktop/gnome/interface/toolbar_style --type string "icons" -gconftool-2 --set /desktop/gnome/sound/default_mixer_tracks --type list --list-type string "[PCM]" -gconftool-2 --set /apps/gnome-power-manager/notify/low_capacity --type bool 0 -gconftool-2 --set /apps/compiz/plugins/move/allscreens/options/constrain_y --type bool 0 -gconftool-2 --set /apps/panel/toplevels/top_panel_screen0/size --type integer 19 -gconftool-2 --set /apps/panel/toplevels/bottom_panel_screen0/size --type integer 19 diff --git a/snippets/repository-debuginfo.ks b/snippets/repository-debuginfo.ks deleted file mode 100644 index cb246a6..0000000 --- a/snippets/repository-debuginfo.ks +++ /dev/null @@ -1,25 +0,0 @@ -# %post modifications to enable debuginfo repository - -awk ' -BEGIN { - debuginfo = 0 -} - /^\[.*\]/ { - if (/debuginfo/) { - debuginfo = 1 - } else { - debuginfo = 0 - } - print - next -} - /enabled=0/ && debuginfo { - print "enabled=1" - next -} -{ - print - next -}' < /etc/yum.repos.d/fedora.repo > /etc/yum.repos.d/fedora.repo.tmp -mv /etc/yum.repos.d/fedora.repo{.tmp,} - diff --git a/snippets/screensaver-gnome.ks b/snippets/screensaver-gnome.ks deleted file mode 100644 index f13c84a..0000000 --- a/snippets/screensaver-gnome.ks +++ /dev/null @@ -1,5 +0,0 @@ -# %post modifications to disable GNOME screensaver locking - -cat >> /etc/rc.d/init.d/fedora-live << EOF -gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-screensaver/lock_enabled false >/dev/null -EOF diff --git a/snippets/screensaver-kde.ks b/snippets/screensaver-kde.ks deleted file mode 100644 index 17928d4..0000000 --- a/snippets/screensaver-kde.ks +++ /dev/null @@ -1,3 +0,0 @@ -# %post modifications to disable KDE screensaver - -sed -i 's/Enabled=true/Enabled=false/' /usr/share/kde-settings/kde-profile/default/share/config/kdesktoprc diff --git a/snippets/sysconfig-kde.ks b/snippets/sysconfig-kde.ks deleted file mode 100644 index dfe857e..0000000 --- a/snippets/sysconfig-kde.ks +++ /dev/null @@ -1,6 +0,0 @@ -# %post modifications to create /etc/sysconfig/desktop for KDE - -cat > /etc/sysconfig/desktop < /etc/sysconfig/desktop < Date: Fri, 6 Nov 2015 09:08:13 +0100 Subject: [PATCH 16/23] build: Install snippets/ in 'make install' https://bugzilla.redhat.com/show_bug.cgi?id=1276987 --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index c1f57d1..4cfb865 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,8 @@ install: install -m 644 custom/* $(DATADIR)/$(name)/custom mkdir -p -m 755 $(DATADIR)/$(name)/l10n install -m 644 l10n/* $(DATADIR)/$(name)/l10n + mkdir -p -m 755 $(DATADIR)/$(name)/snippets + install -m 644 snippets/* $(DATADIR)/$(name)/snippets clean: rm -f $(name)-*.tar.gz From 3b3343d28d96823271c107844fa311c82037c641 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 6 Nov 2015 09:21:48 +0100 Subject: [PATCH 17/23] Drop HighContrast icon cache removal from %post scripts It was added to save space, but since then it's considerably dropped in size and just 50 KB now. --- fedora-live-mate_compiz.ks | 3 --- fedora-live-security.ks | 3 --- fedora-live-workstation.ks | 3 --- fedora-live-xfce.ks | 3 --- 4 files changed, 12 deletions(-) diff --git a/fedora-live-mate_compiz.ks b/fedora-live-mate_compiz.ks index a023c09..664ef9e 100644 --- a/fedora-live-mate_compiz.ks +++ b/fedora-live-mate_compiz.ks @@ -79,7 +79,4 @@ chown -R liveuser:liveuser /home/liveuser/ restorecon -R /home/liveuser/ EOF -# This is a huge file and things work ok without it -rm -f /usr/share/icons/HighContrast/icon-theme.cache - %end diff --git a/fedora-live-security.ks b/fedora-live-security.ks index 279b837..87f682b 100644 --- a/fedora-live-security.ks +++ b/fedora-live-security.ks @@ -94,9 +94,6 @@ gnome-keyring-pam %post # xfce configuration -# This is a huge file and things work ok without it -rm -f /usr/share/icons/HighContrast/icon-theme.cache - # create /etc/sysconfig/desktop (needed for installation) cat > /etc/sysconfig/desktop <> /etc/rc.d/init.d/livesys << EOF diff --git a/fedora-live-xfce.ks b/fedora-live-xfce.ks index b2302ea..e50aeae 100644 --- a/fedora-live-xfce.ks +++ b/fedora-live-xfce.ks @@ -16,9 +16,6 @@ %post # xfce configuration -# This is a huge file and things work ok without it -rm -f /usr/share/icons/HighContrast/icon-theme.cache - # create /etc/sysconfig/desktop (needed for installation) cat > /etc/sysconfig/desktop < Date: Mon, 9 Nov 2015 11:51:59 +1100 Subject: [PATCH 18/23] Scientific: Add julia --- fedora-live-scientific_kde.ks | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fedora-live-scientific_kde.ks b/fedora-live-scientific_kde.ks index 893f34b..cff3f3d 100644 --- a/fedora-live-scientific_kde.ks +++ b/fedora-live-scientific_kde.ks @@ -88,6 +88,10 @@ rkward # GUI for Octave qtoctave +# julia +julia +julia-doc + # IDEs for the IDE folks @eclipse spyder From 3ca47ea8e3a20d041ea8991b35d35ed2b545267b Mon Sep 17 00:00:00 2001 From: Amit Saha Date: Mon, 9 Nov 2015 11:55:08 +1100 Subject: [PATCH 19/23] Scientific: comment out g3data for now --- fedora-live-scientific_kde.ks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-live-scientific_kde.ks b/fedora-live-scientific_kde.ks index cff3f3d..08f3af8 100644 --- a/fedora-live-scientific_kde.ks +++ b/fedora-live-scientific_kde.ks @@ -157,7 +157,7 @@ xzgv gimp ggobi ggobi-devel -g3data +#g3data Mayavi #Misc. Utils From 82b0d8cab9e28787718fb760f271fe615bea0601 Mon Sep 17 00:00:00 2001 From: Amit Date: Tue, 10 Nov 2015 08:06:16 +1100 Subject: [PATCH 20/23] Fedora Scientific: Comment out mayavi --- fedora-live-scientific_kde.ks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-live-scientific_kde.ks b/fedora-live-scientific_kde.ks index 08f3af8..bb03d07 100644 --- a/fedora-live-scientific_kde.ks +++ b/fedora-live-scientific_kde.ks @@ -158,7 +158,7 @@ gimp ggobi ggobi-devel #g3data -Mayavi +#Mayavi #Misc. Utils screen From aafeb10a573ec7476ef4fa86b1459afc9bfda8d3 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 16 Nov 2015 12:41:34 +0000 Subject: [PATCH 21/23] ARM: minimal: increase size of boot --- fedora-arm-minimal.ks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-arm-minimal.ks b/fedora-arm-minimal.ks index 86f4e38..b98d7db 100644 --- a/fedora-arm-minimal.ks +++ b/fedora-arm-minimal.ks @@ -1,6 +1,6 @@ %include fedora-arm-base.ks -part /boot --size=300 --fstype ext4 +part /boot --size=512 --fstype ext4 part swap --size=256 --fstype swap part / --size=1200 --fstype ext4 From 1d9ef5a9c1e148b979c68a1b510f6b007e652d93 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 17 Nov 2015 08:58:40 -0800 Subject: [PATCH 22/23] add new ansible-node group to Server DVD --- fedora-install-server.ks | 1 + 1 file changed, 1 insertion(+) diff --git a/fedora-install-server.ks b/fedora-install-server.ks index 61fcb73..5dd29c1 100644 --- a/fedora-install-server.ks +++ b/fedora-install-server.ks @@ -115,6 +115,7 @@ dracut-* @javaenterprise # “uservisible” groups we want to offer +@ansible-node @editors @network-server @system-tools From 6b42371f723437214404c37366e7784004e12dc3 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 25 Nov 2015 11:50:26 -0800 Subject: [PATCH 23/23] add @gnome-desktop to fedora-workstation-packages This goes with comps 2414bbef. --- fedora-workstation-packages.ks | 1 + 1 file changed, 1 insertion(+) diff --git a/fedora-workstation-packages.ks b/fedora-workstation-packages.ks index eceda57..f593821 100644 --- a/fedora-workstation-packages.ks +++ b/fedora-workstation-packages.ks @@ -11,6 +11,7 @@ @core @firefox @fonts +@gnome-desktop @guest-desktop-agents @hardware-support @libreoffice