From 2459d8254be561f0167398e5d1e10ccb8a3f0cb8 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Oct 20 2015 19:29:22 +0000
Subject: Move packagekit-cached-metadata.ks to snippets/


... and make it a top-level script wrapped in %post ... %end.

---

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/fedora-packagekit-cached-metadata.ks
deleted file mode 100644
index d2ef0f1..0000000
--- a/fedora-packagekit-cached-metadata.ks
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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
-
diff --git a/snippets/packagekit-cached-metadata.ks b/snippets/packagekit-cached-metadata.ks
new file mode 100644
index 0000000..140d5e5
--- /dev/null
+++ b/snippets/packagekit-cached-metadata.ks
@@ -0,0 +1,34 @@
+# %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
+  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
+
+%end