commit f5eb0bee5f8f5d818559a881e970dffa00c073d8
Author: Rex Dieter <rdieter(a)math.unl.edu>
Date: Mon Oct 19 14:56:27 2015 -0500
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(-)
---
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
+
Show replies by date