Add sssd-client with .so's for easy integration with SSSD container.

This effectively reverts the recent change by rdieter, without undoing
the refactoring.

As per the IRC discussion, it looks like caching the metadata is not all
that helpful with Apper or Muon (and I doubt it is actually helpful with
ANY frontend, because updates will necessarily be outdated, and even the
Everything repo usually changes one last time after the last RC, to
officially push packages that the RC took from a side repo), we would
only be increasing our spin size with stale metadata.

atomic-installer/lorax-configure-repo.tmpl

@@ -4,5 +4,5 @@
 <%page args="ostree_osname, ostree_ref"/>
 append usr/share/anaconda/interactive-defaults.ks "ostreesetup --nogpg --osname=${ostree_osname} --remote=${ostree_osname} --url=file:////run/install/repo/content/repo --ref=${ostree_ref}\n"
 append usr/share/anaconda/interactive-defaults.ks "services --disabled cloud-init,cloud-config,cloud-final,cloud-init-local\n"
-append usr/share/anaconda/interactive-defaults.ks "%post --erroronfail\nrm -f /etc/ostree/remotes.d/${ostree_osname}.conf\nostree remote add --set=gpg-verify=false fedora-atomic 'http://dl.fedoraproject.org/pub/fedora/linux/atomic/22/'\n%end\n"
+append usr/share/anaconda/interactive-defaults.ks "%post --erroronfail\nrm -f /etc/ostree/remotes.d/${ostree_osname}.conf\nostree remote add --set=gpg-verify=false fedora-atomic 'https://dl.fedoraproject.org/pub/fedora/linux/atomic/22/'\n%end\n"
 

fedora-arm-base.ks

@@ -7,7 +7,7 @@ firewall --enabled --service=mdns,ssh
 # configure extlinux bootloader
 bootloader extlinux
 
-part /boot --size=300 --fstype ext3
+part /boot --size=512 --fstype ext4
 part swap --size=512 --fstype swap
 part / --size=3000 --fstype ext4
 

fedora-arm-minimal.ks

@@ -1,5 +1,6 @@
 %include fedora-arm-base.ks
 
+part /boot --size=300 --fstype ext4
 part swap --size=256 --fstype swap
 part / --size=1200 --fstype ext4
 

fedora-cloud-base-vagrant.ks

@@ -19,7 +19,7 @@ rootpw vagrant
 # even on VirtualBox virt, we get a primary network device with "eth0" as the name
 # This simplifies things and allows a single disk image for both supported Vagrant
 # platforms (virtualbox and kvm)
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0" --extlinux
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0"
 
 %packages
 # The default koji Vagrantfile configuration uses rsync to sync files between

fedora-cloud-base.ks

@@ -52,7 +52,12 @@ reboot
 # Package list.
 # FIXME: instLangs does not work, so there's a hack below
 # (see https://bugzilla.redhat.com/show_bug.cgi?id=1051816)
-%packages --instLangs=en
+# FIXME: instLangs bug has been fixed but now having instLangs
+# with an arg causes no langs to get installed because of BZ1262040
+# which yields the errors in BZ1261249. For now fix by not using
+# --instLangs at all
+#%packages --instLangs=en
+%packages
 
 kernel-core
 @^cloud-server-environment
@@ -62,10 +67,14 @@ kernel-core
 
 # Some things from @core we can do without in a minimal install
 -biosdevname
--plymouth
+# Need to also add back plymouth in order to mask failure of
+# systemd-vconsole-setup.service. BZ#1272684. Comment out for now
+#-plymouth
 -NetworkManager
 -iprutils
--kbd
+# Now that BZ#1199868 is fixed kbd really gets removed but it breaks
+# systemd-vconsole-setup.service on boot. Comment out for now
+#-kbd
 -uboot-tools
 -kernel
 -grub2
@@ -117,8 +126,9 @@ echo .
 
 # this is installed by default but we don't need it in virt
 # Commenting out the following for #1234504
-#echo "Removing linux-firmware package."
-#dnf -C -y erase linux-firmware
+# rpm works just fine for removing this, no idea why dnf can't cope
+echo "Removing linux-firmware package."
+rpm -e linux-firmware
 
 # Remove firewalld; was supposed to be optional in F18+, but is pulled in
 # in install/image building.
@@ -247,5 +257,8 @@ dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
 rm -f /var/tmp/zeros
 echo "(Don't worry -- that out-of-space error was expected.)"
 
+# For trac ticket https://fedorahosted.org/cloud/ticket/128
+rm -f /etc/sysconfig/network-scripts/ifcfg-ens3
+
 %end
 

fedora-cloud-bigdata.ks

@@ -108,8 +108,10 @@ ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
 echo .
 
 # this is installed by default but we don't need it in virt
+# Commenting out the following for #1234504
+# rpm works just fine for removing this, no idea why dnf can't cope
 echo "Removing linux-firmware package."
-yum -C -y remove linux-firmware
+rpm -e linux-firmware
 
 # Remove firewalld; was supposed to be optional in F18+, but is required to
 # be present for install/image building.

fedora-cloud-experimental.ks

@@ -99,8 +99,10 @@ ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
 echo .
 
 # this is installed by default but we don't need it in virt
+# Commenting out the following for #1234504
+# rpm works just fine for removing this, no idea why dnf can't cope
 echo "Removing linux-firmware package."
-yum -C -y remove linux-firmware
+rpm -e linux-firmware
 
 # Remove firewalld; was supposed to be optional in F18+, but is required to
 # be present for install/image building.

fedora-docker-base.ks

@@ -35,6 +35,7 @@ rootfiles
 vim-minimal
 dnf
 dnf-yum  # https://fedorahosted.org/fesco/ticket/1312#comment:29
+sssd-client
 #fakesystemd #TODO: waiting for review https://bugzilla.redhat.com/show_bug.cgi?id=1118740
 -kernel
 
@@ -51,10 +52,17 @@ userdel -r none
 LANG="en_US"
 echo "%_install_lang $LANG" > /etc/rpm/macros.image-language-conf
 
+# Carry these configs for both dnf and yum for users who are calling
+# yum-deprecated directly. This will keep the experience between both
+# consistent
 awk '(NF==0&&!done){print "override_install_langs='$LANG'\ntsflags=nodocs";done=1}{print}' \
     < /etc/yum.conf > /etc/yum.conf.new
 mv /etc/yum.conf.new /etc/yum.conf
 
+awk '(NF==0&&!done){print "override_install_langs='$LANG'\ntsflags=nodocs";done=1}{print}' \
+    < /etc/dnf/dnf.conf > /etc/dnf/dnf.conf.new
+mv /etc/dnf/dnf.conf.new /etc/dnf/dnf.conf
+
 echo "Import RPM GPG key"
 releasever=$(rpm -q --qf '%{version}\n' fedora-release)
 basearch=$(uname -i)

fedora-install-server.ks

@@ -71,6 +71,7 @@ dracut-*
 @standard
 @core
 @hardware-support
+@networkmanager-submodules
 
 # Fedora Server.
 # Including this causes the fedora-release-server package to be included,
@@ -107,7 +108,7 @@ dracut-*
 @network-server
 @printing
 @smb-server
-@virtualization
+@virtualization-headless
 @load-balancer
 @ha
 

fedora-kde-packages.ks

@@ -8,6 +8,9 @@
 
 ### The KDE-Desktop
 
+### Browser
+firefox
+
 ### fixes
 
 # use kde-print-manager instead of system-config-printer

fedora-live-base.ks

@@ -15,7 +15,7 @@ selinux --enforcing
 firewall --enabled --service=mdns
 xconfig --startxonboot
 part / --size 4096 --fstype ext4
-services --enabled=NetworkManager --disabled=network,sshd
+services --enabled=NetworkManager,ModemManager --disabled=network,sshd
 
 %include fedora-repo.ks
 
@@ -275,6 +275,15 @@ chmod 755 /etc/rc.d/init.d/livesys-late
 # enable tmpfs for /tmp
 systemctl enable tmp.mount
 
+# As livecd-creator is still yum based, we only get yum's yumdb during the
+# image compose. Migrate this over to dnf so that dnf and PackageKit can keep
+# track where packages came from.
+if [ ! -d /var/lib/dnf ]; then
+  mkdir -p /var/lib/dnf
+  mv /var/lib/yum/yumdb /var/lib/dnf/
+  rm -rf /var/lib/yum/
+fi
+
 # make it so that we don't do writing to the overlay for things which
 # are just tmpdirs/caches
 # note https://bugzilla.redhat.com/show_bug.cgi?id=1135475

fedora-live-cinnamon.ks

@@ -22,10 +22,6 @@ PREFERRED=/usr/bin/cinnamon-session
 DISPLAYMANAGER=/usr/sbin/lightdm
 EOF
 
-# exclude GNOME-specific menu items
-desktop-file-edit --set-key=NoDisplay --set-value=true /usr/share/applications/fedora-release-notes.webapp.desktop
-desktop-file-edit --set-key=NoDisplay --set-value=true /usr/share/applications/yelp.desktop
-
 cat >> /etc/rc.d/init.d/livesys << EOF
 
 # set up lightdm autologin

fedora-live-design_suite.ks

@@ -15,7 +15,7 @@ part / --size 8192
 %packages
 # graphics
 blender
-LuxRender-blender
+#LuxRender-blender
 YafaRay-blender
 bluefish 
 colord-extra-profiles
@@ -75,6 +75,10 @@ lato-fonts
 open-sans-fonts
 overpass-fonts
 
+# Extra wallpapers
+f23-backgrounds-extras-base
+f23-backgrounds-extras-gnome
+
 # removal of unneeded applications
 -gnome-boxes
 -gthumb
@@ -97,7 +101,7 @@ cat >> /usr/share/applications/list-design-tutorials.desktop << FOE
 Name=List of design tutorials
 GenericName=List of Tutorials for Designers
 Comment=Reference of Design Related Tutorials
-Exec=xdg-open http://fedoraproject.org/wiki/Design_Suite/Tutorials
+Exec=xdg-open https://fedoraproject.org/wiki/Design_Suite/Tutorials
 Type=Application
 Icon=applications-graphics
 Categories=Graphics;Documentation;
@@ -110,7 +114,7 @@ cat >> /usr/share/applications/fedora-design-suite.desktop << FOE
 Name=Design Suite Info
 GenericName=About Design Suite
 Comment=Wiki page of Design Suite
-Exec=xdg-open http://fedoraproject.org/wiki/Design_Suite
+Exec=xdg-open https://fedoraproject.org/wiki/Design_Suite
 Type=Application
 Icon=applications-internet
 Categories=Documentation;
@@ -123,7 +127,7 @@ cat >> /usr/share/applications/fedora-design-team.desktop << FOE
 Name=Design Team Info
 GenericName=About Design Team 
 Comment=Wiki page of Design Team
-Exec=xdg-open http://fedoraproject.org/wiki/Design
+Exec=xdg-open https://fedoraproject.org/wiki/Design
 Type=Application
 Icon=applications-internet
 Categories=Documentation;
@@ -134,4 +138,3 @@ chmod a+x /usr/share/applications/fedora-design-team.desktop
 glib-compile-schemas /usr/share/glib-2.0/schemas
 
 %end
-

fedora-live-games.ks

@@ -20,6 +20,9 @@ part / --size 10240
 # will likely put the games spin over size and it is freeze time.
 -libreoffice*
 
+# Extra screensavers isn't much help for the games spin
+-xscreensaver-extras
+
 # Allow joysticks and game pads to work
 joystick-support
 
@@ -32,13 +35,13 @@ armacycles-ad
 asc
 asc-music
 astromenace
-beneath-a-steel-sky-cd
+# beneath-a-steel-sky-cd scummvm games cut for size
 boswars
 btanks
 bzflag
 crossfire-client
 extremetuxracer
-flight-of-the-amazon-queen-cd
+# flight-of-the-amazon-queen-cd scummvm games cut for size
 freeciv
 freecol
 freedoom
@@ -62,15 +65,15 @@ supertux
 ultimatestunts
 warzone2100
 wesnoth
-worminator
+# worminator # Would pull in fluid-soundfont-lite-patches
 warmux
 xmoto
 
 # traditional (small)
 
 abe
-alex4
-ballz
+# alex4 # Would pull in fluid-soundfont-lite-patches
+# ballz # Would pull in fluid-soundfont-lite-patches
 blobwars
 bombardier
 cdogs-sdl
@@ -85,11 +88,11 @@ hedgewars
 kcheckers
 knights
 lbrickbuster2
-liquidwar
+# liquidwar # Would pull in fluid-soundfont-lite-patches
 londonlaw
 lordsawar
-lure
-machineball
+# lure scummvm games cut for size
+# machineball # Would pull in fluid-soundfont-lite-patches
 nethack
 openlierox
 pachi
@@ -97,7 +100,7 @@ pioneers
 quarry
 Ri-li
 rogue
-scorchwentbonkers
+# scorchwentbonkers # Would pull in fluid-soundfont-lite-patches
 seahorse-adventures
 solarwolf
 sopwith
@@ -109,11 +112,11 @@ xblast
 
 auriferous
 alienblaster
-duel3
+# duel3 # Would pull in fluid-soundfont-lite-patches
 lmarbles
 powermanga
-raidem
-raidem-music
+# raidem # Would pull in fluid-soundfont-lite-patches
+# raidem-music # Would pull in fluid-soundfont-lite-patches
 trackballs
 trackballs-music
 
@@ -123,7 +126,7 @@ ballbuster
 CriticalMass
 dd2
 KoboDeluxe
-lacewing
+# lacewing # Would pull in fluid-soundfont-lite-patches
 Maelstrom
 methane
 njam
@@ -132,13 +135,13 @@ shippy
 tecnoballz
 wordwarvi
 xgalaxy
-zasx
+# zasx # Would pull in fluid-soundfont-lite-patches
 
 # falling blocks games (small) 
 
 amoebax
 crack-attack
-crystal-stacker
+# crystal-stacker # Would pull in fluid-soundfont-lite-patches
 gemdropx
 gweled
 
@@ -150,7 +153,7 @@ pingus
 # puzzles (small)
 
 escape
-gbrainy
+# gbrainy Removed for space - only game that pulls in mono
 magicor
 mirrormagic
 pipenightdreams

fedora-live-jam_kde.ks

@@ -11,7 +11,7 @@
 #             https://fedoraproject.org/wiki/User:jvlomax
 #             Brendan Jones <brendan.jones.it@gmail.com>
 
-%include fedora-livecd-kde.ks
+%include fedora-live-kde.ks
 
 # DVD size partition
 part / --size 10240 --fstype ext4
@@ -40,6 +40,7 @@ jack-audio-connection-kit
 jack-audio-connection-kit-dbus
 qjackctl
 jackctlmmc
+ffado
 
 #pulse
 pulseaudio-module-jack
@@ -76,7 +77,7 @@ sooperlooper
 
 #recodring and DAW
 audacity
-ardour3
+ardour4
 rosegarden4
 seq24
 muse

fedora-live-kde-base.ks

@@ -7,12 +7,6 @@
 
 %post
 
-# create /etc/sysconfig/desktop (needed for installation)
-cat > /etc/sysconfig/desktop <<EOF
-DESKTOP="KDE"
-DISPLAYMANAGER="KDE"
-EOF
-
 # set default GTK+ theme for root (see #683855, #689070, #808062)
 cat > /root/.gtkrc-2.0 << EOF
 include "/usr/share/themes/Adwaita/gtk-2.0/gtkrc"
@@ -28,17 +22,6 @@ EOF
 # add initscript
 cat >> /etc/rc.d/init.d/livesys << EOF
 
-if [ -e /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png ] ; then
-    # use image also for kdm
-    mkdir -p /usr/share/apps/kdm/faces
-    cp /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png /usr/share/apps/kdm/faces/fedora.face.icon
-fi
-
-# make liveuser use KDE
-echo "startkde" > /home/liveuser/.xsession
-chmod a+x /home/liveuser/.xsession
-chown liveuser:liveuser /home/liveuser/.xsession
-
 # set up autologin for user liveuser
 if [ -f /etc/sddm.conf ]; then
 sed -i 's/^#User=.*/User=liveuser/' /etc/sddm.conf
@@ -55,23 +38,15 @@ fi
 mkdir -p /home/liveuser/.config/
 cat > /home/liveuser/.config/kickoffrc << MENU_EOF
 [Favorites]
-FavoriteURLs=/usr/share/applications/kde4/konqbrowser.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/systemsettings.desktop,/usr/share/applications/org.kde.konsole.desktop,/usr/share/applications/liveinst.desktop
+FavoriteURLs=/usr/share/applications/firefox.desktop,/usr/share/applications/org.kde.dolphin.desktop,/usr/share/applications/systemsettings.desktop,/usr/share/applications/org.kde.konsole.desktop,/usr/share/applications/liveinst.desktop
 MENU_EOF
 
 # show liveinst.desktop on desktop and in menu
 sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
-
-# chmod +x ~/Desktop/liveinst.desktop to disable KDE's security warning
+# set executable bit disable KDE security warning
 chmod +x /usr/share/applications/liveinst.desktop
-
-# copy over the icons for liveinst to hicolor
-cp /usr/share/icons/gnome/16x16/apps/system-software-install.png /usr/share/icons/hicolor/16x16/apps/
-cp /usr/share/icons/gnome/22x22/apps/system-software-install.png /usr/share/icons/hicolor/22x22/apps/
-cp /usr/share/icons/gnome/24x24/apps/system-software-install.png /usr/share/icons/hicolor/24x24/apps/
-cp /usr/share/icons/gnome/32x32/apps/system-software-install.png /usr/share/icons/hicolor/32x32/apps/
-cp /usr/share/icons/gnome/48x48/apps/system-software-install.png /usr/share/icons/hicolor/48x48/apps/
-cp /usr/share/icons/gnome/256x256/apps/system-software-install.png /usr/share/icons/hicolor/256x256/apps/
-touch /usr/share/icons/hicolor/
+mkdir /home/liveuser/Desktop
+cp -a /usr/share/applications/liveinst.desktop /home/liveuser/Desktop/
 
 # Set akonadi backend
 mkdir -p /home/liveuser/.config/akonadi
@@ -83,6 +58,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
@@ -97,6 +73,12 @@ cat > /home/liveuser/.kde/share/config/kres-migratorrc << KRES_EOF
 Enabled=false
 KRES_EOF
 
+# Disable kwallet migrator
+cat > /home/liveuser/.config/kwalletrc << KWALLET_EOL
+[Migration]
+alreadyMigrated=true
+KWALLET_EOL
+
 # make sure to set the right permissions and selinux contexts
 chown -R liveuser:liveuser /home/liveuser/
 restorecon -R /home/liveuser/

fedora-live-scientific_kde.ks

@@ -110,8 +110,6 @@ pdfshuffler
 openmpi
 openmpi-devel
 valgrind-openmpi
-pvm
-pvm-gui #will install 'pvm' as well
 libgomp
 python-pp
 mpi4py-openmpi

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 
 

fedora-mate-packages.ks

@@ -25,13 +25,14 @@ mate-disk-usage-analyzer
 mate-netspeed
 
 # more backgrounds
-f22-backgrounds-mate
-f21-backgrounds-extras-base
-f21-backgrounds-extras-mate
+f23-backgrounds-base
+f23-backgrounds-mate
+f23-backgrounds-extras-base
 
 # system tools
 system-config-printer
 system-config-printer-applet
+lightdm-gtk-greeter-settings
 
 # audio video
 parole

snippets/packagekit-cached-metadata.ks

@@ -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