Move packagekit-cached-metadata.ks to snippets/

... and make it a top-level script wrapped in %post ... %end.
This commit is contained in:
Kalev Lember 2015-10-20 20:17:29 +02:00
parent 6817b9661f
commit 2459d8254b
3 changed files with 7 additions and 5 deletions

View File

@ -4,6 +4,7 @@
%include fedora-live-base.ks %include fedora-live-base.ks
%include fedora-kde-packages.ks %include fedora-kde-packages.ks
%include snippets/packagekit-cached-metadata.ks
%post %post
@ -19,8 +20,6 @@ cat > /root/.config/gtk-3.0/settings.ini << EOF
gtk-theme-name = Adwaita gtk-theme-name = Adwaita
EOF EOF
%include fedora-packagekit-cached-metadata.ks
# add initscript # add initscript
cat >> /etc/rc.d/init.d/livesys << EOF cat >> /etc/rc.d/init.d/livesys << EOF

View File

@ -4,6 +4,7 @@
%include fedora-live-base.ks %include fedora-live-base.ks
%include fedora-workstation-packages.ks %include fedora-workstation-packages.ks
%include snippets/packagekit-cached-metadata.ks
part / --size 6144 part / --size 6144
@ -12,8 +13,6 @@ part / --size 6144
# This is a huge file and things work ok without it # This is a huge file and things work ok without it
rm -f /usr/share/icons/HighContrast/icon-theme.cache rm -f /usr/share/icons/HighContrast/icon-theme.cache
%include fedora-packagekit-cached-metadata.ks
cat >> /etc/rc.d/init.d/livesys << EOF cat >> /etc/rc.d/init.d/livesys << EOF

View File

@ -1,4 +1,7 @@
# Copy initial metadata for PackageKit # %post script to include initial metadata for PackageKit
%post
PK_PREFIX=`mktemp -d` PK_PREFIX=`mktemp -d`
mkdir -p $PK_PREFIX/etc/yum.repos.d mkdir -p $PK_PREFIX/etc/yum.repos.d
if [ -f /etc/yum.repos.d/fedora.repo ] ; then if [ -f /etc/yum.repos.d/fedora.repo ] ; then
@ -28,3 +31,4 @@ if [ -d /var/cache/PackageKit ] ; then
fi fi
rm -rf $PK_PREFIX rm -rf $PK_PREFIX
%end