Merge branch 'master' of ssh://git.fedorahosted.org/git/spin-kickstarts
This commit is contained in:
Peter Robinson
commit
fa2c69cad8
|
|
@ -4,6 +4,7 @@
|
|||
|
||||
%include fedora-live-base.ks
|
||||
%include fedora-kde-packages.ks
|
||||
%include snippets/packagekit-cached-metadata.ks
|
||||
|
||||
%post
|
||||
|
||||
|
|
@ -58,6 +59,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
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
|
||||
%include fedora-live-base.ks
|
||||
%include fedora-workstation-packages.ks
|
||||
%include snippets/packagekit-cached-metadata.ks
|
||||
|
||||
part / --size 6144
|
||||
|
||||
|
|
@ -12,36 +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
|
||||
|
||||
# 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
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,53 @@
|
|||
# %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
|
||||
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=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=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=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=http://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
|
||||
|
||||
# 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
|
||||
Loading…
Reference in New Issue