commit e07cfce2f1118a2052f91f6f5839657a73fd5a23 Author: Kalev Lember klember@redhat.com Date: Mon Oct 19 16:35:38 2015 +0200

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 files changed, 30 insertions(+), 0 deletions(-) --- 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=...' \ + $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$releaseve...' \ + $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...' \ + $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%7...' \ + $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