lorax: Rebase templates on those for Fedora 23

lorax-templates-qubes/lorax-templates-qubes.spec

@@ -4,7 +4,7 @@
 
 Name:		lorax-templates-qubes
 Version:	3.1.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Lorax templates for Qubes installation ISO
 
 Group:		Applications/System

lorax-templates-qubes/templates/config_files/aarch64/boot.msg

@@ -0,0 +1,5 @@
+ 
+splash.lss
+
+ -  Press the 01<ENTER>07 key to begin the installation process.
+

lorax-templates-qubes/templates/config_files/aarch64/grub.conf

@@ -0,0 +1,13 @@
+#debug --graphics
+default=0
+splashimage=@SPLASHPATH@
+timeout 5
+hiddenmenu
+title Install @PRODUCT@ @VERSION@
+	findiso
+	kernel @KERNELPATH@ @ROOT@ quiet
+	initrd @INITRDPATH@
+title Test this media & install @PRODUCT@ @VERSION@
+	findiso
+	kernel @KERNELPATH@ @ROOT@ rd.live.check quiet
+	initrd @INITRDPATH@

lorax-templates-qubes/templates/config_files/aarch64/grub2-efi.cfg

@@ -0,0 +1,46 @@
+set default="1"
+
+function load_video {
+  if [ x$feature_all_video_module = xy ]; then
+    insmod all_video
+  else
+    insmod efi_gop
+    insmod efi_uga
+    insmod ieee1275_fb
+    insmod vbe
+    insmod vga
+    insmod video_bochs
+    insmod video_cirrus
+  fi
+}
+
+load_video
+set gfxpayload=keep
+insmod gzio
+insmod part_gpt
+insmod ext2
+
+set timeout=60
+### END /etc/grub.d/00_header ###
+
+search --no-floppy --set=root -l '@ISOLABEL@'
+
+### BEGIN /etc/grub.d/10_linux ###
+menuentry 'Install @PRODUCT@ @VERSION@' --class red --class gnu-linux --class gnu --class os {
+	linux @KERNELPATH@ @ROOT@ ro
+	initrd @INITRDPATH@
+}
+menuentry 'Test this media & install @PRODUCT@ @VERSION@' --class red --class gnu-linux --class gnu --class os {
+	linux @KERNELPATH@ @ROOT@ rd.live.check
+	initrd @INITRDPATH@
+}
+submenu 'Troubleshooting -->' {
+	menuentry 'Install @PRODUCT@ @VERSION@ in basic graphics mode' --class red --class gnu-linux --class gnu --class os {
+		linux @KERNELPATH@ @ROOT@ nomodeset
+		initrd @INITRDPATH@
+	}
+	menuentry 'Rescue a @PRODUCT@ system' --class red --class gnu-linux --class gnu --class os {
+		linux @KERNELPATH@ @ROOT@ rescue
+		initrd @INITRDPATH@
+	}
+}

lorax-templates-qubes/templates/config_files/common/91-anaconda-autoconnect-slaves.conf

@@ -0,0 +1,2 @@
+[connection]
+connection.autoconnect-slaves=1

lorax-templates-qubes/templates/config_files/common/org.gnome.desktop.wm.keybindings.gschema.override

@@ -1,35 +0,0 @@
-[org.gnome.desktop.wm.keybindings]
-	switch-to-workspace-left=[]
-	switch-to-workspace-right=[]
-	switch-to-workspace-up=[]
-	switch-to-workspace-down=[]
-	switch-to-workspace-1=[]
-	switch-to-workspace-last=[]
-	switch-group=[]
-	switch-windows=[]
-	switch-panels=[]
-	cycle-group=[]
-	cycle-windows=[]
-	cycle-panels=[]
-	activate-window-menu=[]
-	toggle-maximized=[]
-	minimize=[]
-	maximize=[]
-	unmaximize=[]
-	begin-move=[]
-	begin-resize=[]
-	move-to-workspace-1=[]
-	move-to-workspace-left=[]
-	move-to-workspace-right=[]
-	move-to-workspace-up=[]
-	move-to-workspace-down=[]
-	move-to-workspace-last=[]
-	move-to-monitor-left=[]
-	move-to-monitor-right=[]
-	move-to-monitor-up=[]
-	move-to-monitor-down=[]
-	close=[]
-	panel-main-menu=[]
-	panel-run-dialog=[]
-	switch-applications=[]
-	switch-input-source=[]

lorax-templates-qubes/templates/config_files/common/spice-vdagentd

@@ -0,0 +1 @@
+SPICE_VDAGENTD_EXTRA_ARGS=-X

lorax-templates-qubes/templates/config_files/common/vconsole.conf

@@ -0,0 +1,2 @@
+KEYMAP=us
+SYSFONT="latarcyrheb-sun16"

lorax-templates-qubes/templates/config_files/ppc/bootinfo.txt

@@ -1,6 +1,7 @@
-<chrp-boot> <description>Linux</description> 
+<chrp-boot>
-<os-name>Linux</os-name> 
+<description>grub 2.00</description>
-<boot-script>boot &device;:\ppc\chrp\yaboot</boot-script> 
+<os-name>grub 2.00</os-name>
+<boot-script>boot &device;:\boot\grub\powerpc-ieee1275\core.elf</boot-script>
 <icon size=64,64 color-space=3,3,2>
 <bitmap> FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF

lorax-templates-qubes/templates/config_files/ppc/grub.cfg.in

@@ -0,0 +1,30 @@
+set default=0
+set timeout=5
+
+echo -e "\nWelcome to the @PRODUCT@ @VERSION@ installer!\n\n"
+
+menuentry "Install @PRODUCT@ @VERSION@ (64-bit kernel)" --class fedora --class gnu-linux --class gnu --class os {
+      linux /ppc/ppc64/vmlinuz @ROOT@ ro
+      initrd /ppc/ppc64/initrd.img
+}
+
+menuentry "Test this media & install @PRODUCT@ @VERSION@  (64-bit kernel)" --class fedora --class gnu-linux --class  gnu --class os {
+      linux /ppc/ppc64/vmlinuz @ROOT@ rd.live.check ro
+      initrd /ppc/ppc64/initrd.img
+}
+
+menuentry "Rescue a @PRODUCT@ system (64-bit kernel)" --class fedora --class gnu-linux --class gnu --class os {
+      linux /ppc/ppc64/vmlinuz @ROOT@ rescue ro
+      initrd /ppc/ppc64/initrd.img
+}
+
+submenu 'Other options...' {
+  menuentry 'Reboot' {
+    reboot
+  }
+
+  menuentry 'Exit to Open Firmware' {
+    exit
+  }
+}
+

lorax-templates-qubes/templates/config_files/ppc/magic

@@ -1,81 +0,0 @@
-#
-# Example magic file for mkhybrid
-#
-# The "message" for the offset MUST be 4 characters for the CREATOR
-# and 4 characters for the TYPE - white space is optional between them.
-# Any other characters on this line are ignored. Continuation lines (starting
-# with '>') are also ignored i.e. only the initial offset lines are used.
-#
-# The continuation lines are given here, but they do not need to exist.
-
-#
-# James Pearson 20/5/98
-
-# off	type		test		message
-
-# GIF
-0	string		GIF8		8BIM GIFf
->4	string		7a		\b, version 8%s,
->4	string		9a		\b, version 8%s,
->6	leshort		>0		%hd x
->8	leshort		>0		%hd,
-#>10	byte		&0x80		color mapped,
-#>10	byte&0x07	=0x00		2 colors
-#>10	byte&0x07	=0x01		4 colors
-#>10	byte&0x07	=0x02		8 colors
-#>10	byte&0x07	=0x03		16 colors
-#>10	byte&0x07	=0x04		32 colors
-#>10	byte&0x07	=0x05		64 colors
-#>10	byte&0x07	=0x06		128 colors
-#>10	byte&0x07	=0x07		256 colors
-
-# JPEG images
-#
-0	ubeshort		0xffd8		8BIM JPEG  image data
-
-# StuffIt
-#
-0	string		SIT!		SIT!SIT!
-
-# standard unix compress
-0	string		\037\235	LZIV ZIVU
->2	byte&0x80	>0		block compressed
->2	byte&0x1f	x		%d bits
-
-# gzip (GNU zip, not to be confused with Info-ZIP or PKWARE zip archiver)
-0       string          \037\213        GNUz ZIVU gzip compressed data
->2      byte            <8              \b, reserved method,
->2      byte            8               \b, deflated,
->3	byte		&0x01		ASCII,
->3	byte		&0x02		continuation,
->3	byte		&0x04		extra field,
->3	byte		&0x08		original filename,
->3	byte		&0x10		comment,
->3	byte		&0x20		encrypted,
->4	ledate		x		last modified: %s,
->8	byte		2		max compression,
->8	byte		4		max speed,
->9	byte		=0x00		os: MS-DOS
->9	byte		=0x01		os: Amiga
->9	byte		=0x02		os: VMS
->9	byte		=0x03		os: Unix
->9	byte		=0x05		os: Atari
->9	byte		=0x06		os: OS/2
->9	byte		=0x07		os: MacOS
->9	byte		=0x0A		os: Tops/20
->9	byte		=0x0B		os: Win/32
-
-# Postscript
-0	string		%!		ASPSTEXT
->2	string		PS-Adobe-	conforming
->>11	string		>\0		at level %.3s
->>>15	string		EPS		- type %s
->>>15	string		Query		- type %s
->>>15	string		ExitServer	- type %s
-# Some PCs have the annoying habit of adding a ^D as a document separator
-0	string		\004%!		ASPS TEXT PostScript document text
->3	string		PS-Adobe-	conforming
->>12	string		>\0		at level %.3s
->>>16	string		EPS		- type %s
->>>16	string		Query		- type %s
->>>16	string		ExitServer	- type %s

lorax-templates-qubes/templates/config_files/ppc/mapping

@@ -23,5 +23,6 @@ RELEASE_NOTES   Ascii   'ttxt'  'ttro'  "Text File"
 .tbxi           Raw     'chrp'  'tbxi'  "Macintosh Toolbox ROM file"
 .sea            Raw     'aust'  'APPL'  "Self Expanding Archive"
 .sit            Raw     'SIT!'  'SITD'  "Stuffit Expander file"
+core.elf        Raw     'chrp'  'tbxi'  "Bootable GRUB2 executable."
 *               Raw     '????'  '????'  "Unknown"
 

lorax-templates-qubes/templates/config_files/s390/generic.ins

@@ -1,5 +1,5 @@
 * minimal lpar ins file
 images/kernel.img 0x00000000
 images/initrd.img @INITRD_LOAD_ADDRESS@
-images/generic.prm 0x00010480
+images/genericdvd.prm 0x00010480
 images/initrd.addrsize 0x00010408

lorax-templates-qubes/templates/config_files/s390/generic.prm

@@ -1 +1 @@
-ro ramdisk_size=40000 cio_ignore=all,!0.0.0009
+ro ramdisk_size=40000 cio_ignore=all,!condev

lorax-templates-qubes/templates/config_files/s390/genericdvd.prm

@@ -0,0 +1 @@
+ro ramdisk_size=40000 cio_ignore=all,!condev rd.cmdline=ask

lorax-templates-qubes/templates/config_files/x86/grub2-efi.cfg

@@ -16,6 +16,7 @@ insmod ext2
 insmod chain
 
 set timeout=5
+### END /etc/grub.d/00_header ###
 
 # do not use search for ISO here, 'root' must point ESP, not the whole ISO9660
 # fs, otherwise xen.efi would not be able to access kernel and initrd

lorax-templates-qubes/templates/runtime-cleanup.tmpl

@@ -6,11 +6,13 @@ remove usr/share/i18n
 
 ## not required packages installed as dependencies
 ## no perl besides s390x
-%if basearch != "s390x":
+## perl needed for powerpc-utils and fbset on PPC
+%if basearch not in ("ppc", "ppc64", "ppc64le", "s390x"):
     removepkg perl*
 %endif
 ## no sound support, thanks
-removepkg alsa* flac gstreamer-tools libsndfile pulseaudio* sound-theme-freedesktop
+## ...except alsa-libs, which are needed by spice-vdagent
+removepkg alsa-*firmware* flac gstreamer-tools libsndfile pulseaudio* sound-theme-freedesktop
 removepkg midisport-firmware
 ## no fancy video, either
 removepkg libcrystalhd crystalhd-firmware ivtv-firmware cx18-firmware
@@ -26,12 +28,22 @@ removefrom dracut --allbut /usr/lib/dracut/modules.d/30convertfs/convertfs.sh \
                   /usr/lib/dracut/dracut-initramfs-restore
 ## we don't run SELinux (not in enforcing, anyway)
 removepkg checkpolicy selinux-policy libselinux-utils
+
+## selinux checks for the /etc/selinux/config file's existance
+## The removepkg above removes it, create an empty one. See rhbz#1243168
+append etc/selinux/config ""
+
 ## anaconda has its own repo files
 removefrom fedora-release --allbut /etc/os-release /usr/lib/os-release \
                                    /usr/lib/os.release.d/*
 removepkg fedora-release-rawhide
-## no user accounts = no account management
+
-removepkg usermode usermode-gtk passwd shadow-utils
+## keep enough of shadow-utils to create accounts
+removefrom shadow-utils --allbut /usr/bin/chage /usr/sbin/chpasswd \
+                        /usr/sbin/groupadd /usr/sbin/useradd
+
+## remove other account management tools
+removepkg usermode usermode-gtk passwd
 ## no services to turn on/off (keep the /etc/init.d link though)
 removefrom chkconfig --allbut /etc/init.d
 ## Miscellanous unnecessary gpg program
@@ -48,6 +60,10 @@ remove /etc/logrotate.d
 ## anaconda needs this to do media check
 removefrom isomd5sum --allbut /usr/bin/checkisomd5
 
+## systemd-nspawn isn't very useful and doesn't link anyway without iptables,
+## and there's no need for a bunch of zsh files without zsh
+removefrom systemd /usr/bin/systemd-nspawn /usr/share/zsh
+
 ## various other things we remove to save space
 removepkg avahi-autoipd coreutils-libs dash db4-utils diffutils file
 removepkg genisoimage info iptables
@@ -76,21 +92,21 @@ remove /var/lib/rpm/* /var/lib/yum
 remove /usr/share/icons/*/icon-theme.cache
 
 ## clean up kernel modules
-<%
+removekmod sound drivers/media drivers/hwmon \
-removekmods = """
+           net/atm net/bluetooth net/sched net/sctp \
-sound drivers/media drivers/hwmon drivers/video
+           net/rds net/l2tp net/decnet net/netfilter net/ipv4 net/ipv6 \
-net/atm net/bluetooth net/sched net/sctp net/bridge
+           drivers/watchdog drivers/target drivers/rtc drivers/input/joystick \
-net/rds net/l2tp net/decnet net/netfilter net/ipv4 net/ipv6
+           drivers/bluetooth drivers/edac drivers/staging \
-drivers/watchdog drivers/target drivers/rtc drivers/input/joystick
+           drivers/usb/serial drivers/usb/host drivers/usb/misc \
-drivers/bluetooth drivers/edac drivers/staging
+           fs/ocfs2 fs/ceph fs/nfsd fs/ubifs fs/nilfs2 \
-drivers/usb/serial drivers/usb/host drivers/usb/misc
-fs/ocfs2 fs/ceph fs/nfsd fs/ubifs fs/nilfs2
            arch/x86/kvm
-"""
+## Need to keep virtio_console.ko and ipmi stuff in drivers/char
-%>
+## Also keep virtio-rng so that the installer can get sufficient randomness for
-%for kmodpath in removekmods.split():
+## LUKS setup.
-    remove lib/modules/*/kernel/${kmodpath}
+removekmod drivers/char --allbut virtio_console hw_random \
-%endfor
+                                  virtio-rng ipmi
+removekmod drivers/hid --allbut hid-logitech-dj hid-logitech-hidpp
+removekmod drivers/video --allbut hyperv_fb
 remove lib/modules/*/{build,source,*.map}
 ## Need to keep virtio_console.ko and ipmi stuff in drivers/char
 ## Also keep virtio-rng so that the installer can get sufficient randomness for
@@ -110,10 +126,6 @@ runcmd chroot ${root} find /lib/modules \
                         -delete
 ## NOTE: depmod gets re-run after cleanup finishes
 
-## do not include plymouth 'label' plugin (no text used in installer theme)
-remove etc/dracut.conf.d/plymouth-missing-fonts.conf
-remove etc/fonts/conf.d/57-dejavu-sans.conf
-
 ## remove unused themes, theme engines, icons, etc.
 removefrom gtk2 /usr/${libdir}/gtk-2.0/*/{engines,printbackends}/*
 removefrom gtk2 /usr/share/themes/*
@@ -123,9 +135,6 @@ removefrom gtk2-engines --allbut /usr/${libdir}/*/libclearlooks.so \
 removefrom gtk3 /usr/${libdir}/gtk-3.0/*/printbackends/*
 removefrom gtk3 /usr/share/themes/*
 removefrom metacity --allbut /usr/bin/* /usr/${libdir}/* /etc/*
-## the Fedora icon theme inherits from Mist, so we need that
-removefrom gnome-themes --allbut /usr/share/icons/Mist/* \
-                                 /usr/share/themes/Clearlooks/*
 
 ## filesystem tools
 removefrom e2fsprogs /usr/share/locale/*
@@ -153,7 +162,7 @@ removefrom bind-utils /usr/bin/dig /usr/bin/host /usr/bin/nsupdate
 removefrom bitmap-fangsongti-fonts /usr/share/fonts/*
 removefrom ca-certificates /etc/pki/java/*
 removefrom ca-certificates /etc/pki/tls/certs/ca-bundle.trust.crt /etc/ssl/*
-removefrom cairo /usr/${libdir}/libcairo-script*
+removefrom cairo /usr/${libdir}/libcairo-script* /usr/bin/cairo-sphinx
 removefrom coreutils /etc/* /usr/bin/link /usr/bin/nice /usr/bin/stty /usr/bin/su /usr/bin/unlink
 removefrom coreutils /usr/sbin/runuser /usr/bin/[ /usr/bin/base64 /usr/bin/chcon
 removefrom coreutils /usr/bin/cksum /usr/bin/comm /usr/bin/csplit
@@ -214,10 +223,6 @@ removefrom glibc-common /usr/libexec/* /usr/sbin/*
 removefrom gmp /usr/${libdir}/libgmpxx.* /usr/${libdir}/libmp.*
 removefrom gnome-bluetooth-libs /usr/${libdir}/libgnome-bluetooth*
 removefrom gnome-bluetooth-libs /usr/share/*
-removefrom gnome-keyring /etc/xdg/* /usr/bin/* /usr/${libdir}/* /usr/libexec/*
-removefrom gnome-keyring /usr/share/GConf/* /usr/share/gcr-3/*
-removefrom gnome-keyring /usr/share/glib-2.0/* /usr/share/gnome-keyring*
-removefrom gnome-keyring /usr/share/locale/*
 removefrom gnutls /usr/share/locale/*
 removefrom gpgme /usr/${libdir}/libgpgme-*
 removefrom grep /etc/* /usr/share/locale/*
@@ -308,8 +313,6 @@ removefrom procps /usr/bin/vmstat /usr/bin/w /usr/bin/watch
 removefrom psmisc /usr/share/locale/*
 removefrom pygtk2 /usr/bin/* /usr/${libdir}/pygtk/*
 removefrom pykickstart /usr/bin/* /usr/share/locale/*
-removefrom python-ethtool /usr/sbin/*
-removefrom python-meh /usr/share/locale/*
 removefrom readline /usr/${libdir}/*
 removefrom libreport /usr/bin/* /usr/share/locale/*
 removefrom rpm /usr/bin/* /usr/share/locale/*

lorax-templates-qubes/templates/runtime-install.tmpl

@@ -7,7 +7,6 @@ installpkg python
 installpkg anaconda anaconda-widgets
 ## anaconda deps that aren't in the RPM
 installpkg tmux
-installpkg iscsi-initiator-utils
 ## Other available payloads
 installpkg dnf
 installpkg rpm-ostree
@@ -15,7 +14,9 @@ installpkg rpm-ostree
 installpkg pigz
 
 ## kernel and firmware
-installpkg kernel
+## NOTE: Without explicitly including kernel-modules-extra dnf will choose kernel-debuginfo-*
+##       to satify a gfs2-utils kmod requirement
+installpkg kernel kernel-modules kernel-modules-extra
 installpkg grubby
 %if basearch != "s390x":
     installpkg linux-firmware
@@ -23,6 +24,9 @@ installpkg grubby
 installpkg xen-hypervisor
 
 ## arch-specific packages (bootloaders etc.)
+%if basearch == "aarch64":
+    installpkg efibootmgr grub2-efi grubby shim shim-unsigned
+%endif
 %if basearch in ("arm", "armhfp"):
     installpkg kernel-lpae
     installpkg uboot-tools
@@ -49,9 +53,7 @@ installpkg plymouth
 ## extra dracut modules
 installpkg anaconda-dracut dracut-network dracut-config-generic
 
-## fedup-dracut handles upgrades
+## rescue needs this
-##installpkg fedup-dracut fedup-dracut-plymouth *-fedup-dracut
-## fedup and rescue need this
 installpkg cryptsetup
 
 ## rpcbind or portmap needed by dracut nfs module
@@ -67,40 +69,36 @@ installpkg systemd-sysv systemd-units
 installpkg rsyslog
 
 ## xorg/GUI packages
+%if basearch != "s390x":
 installpkg xorg-x11-drivers xorg-x11-server-Xorg
+%endif
 installpkg xorg-x11-server-utils xorg-x11-xauth
 installpkg mesa-dri-drivers
 installpkg dbus-x11 metacity gsettings-desktop-schemas
 installpkg nm-connection-editor
-installpkg at-spi at-spi2-atk pyatspi
-installpkg gnome-python2-gconf
-installpkg gobject-introspection
 installpkg librsvg2
-installpkg polkit-desktop-policy
-installpkg gnome-keyring
-installpkg python-imaging
 
 ## filesystem tools
 installpkg btrfs-progs jfsutils xfsprogs reiserfs-utils gfs2-utils ntfs-3g ntfsprogs
-installpkg python-volume_key volume_key
 installpkg system-storage-manager
 installpkg device-mapper-persistent-data
 installpkg xfsdump
 
 ## needed for LUKS escrow
-installpkg python-volume_key volume_key
+installpkg volume_key
-installpkg python-nss
+installpkg nss-tools
 
 ## SELinux support
-installpkg selinux-policy-targeted audit libsemanage-python
+installpkg selinux-policy-targeted audit
 
 ## network tools/servers
-installpkg python-ethtool ethtool openssh-server nfs-utils openssh-clients
+installpkg ethtool openssh-server nfs-utils openssh-clients
 installpkg tigervnc-server-minimal
 %if basearch != "s390x":
 installpkg tigervnc-server-module
 %endif
 installpkg net-tools
+installpkg bridge-utils
 
 ## hardware utilities/libraries
 installpkg pciutils usbutils ipmitool
@@ -111,7 +109,7 @@ installpkg hdparm pcmciautils
 installpkg libmlx4 rdma
 
 ## translations & language packs
-installpkg yum-langpacks
+installpkg python3-dnf-langpacks
 
 ## fonts & themes
 installpkg bitmap-fangsongti-fonts
@@ -138,6 +136,7 @@ installpkg xorg-x11-fonts-misc
 installpkg gnome-icon-theme-legacy
 installpkg aajohan-comfortaa-fonts
 installpkg abattis-cantarell-fonts
+installpkg sil-scheherazade-fonts
 
 ## debugging/bug reporting tools
 installpkg gdb-gdbserver
@@ -151,8 +150,8 @@ installpkg wget rsync rsh bind-utils ftp mtr vconfig
 installpkg icfg spice-vdagent
 installpkg gdisk hexedit sg3_utils
 
-## yum plugins
+## satisfy libnotify's desktop-notification-daemon with the least crazy option
-installpkg yum-plugin-fastestmirror yum-langpacks
+installpkg notification-daemon
 
 ## actually install all the requested packages
 run_pkg_transaction

lorax-templates-qubes/templates/runtime-postinstall.tmpl

@@ -10,7 +10,6 @@ configdir = configdir + "/common"
 
 ## move_stubs()
 move usr/share/anaconda/restart-anaconda usr/bin
-move ${PYTHONDIR}/site-packages/pyanaconda/sitecustomize.py ${PYTHONDIR}/site-packages
 %for stub in stubs:
     -move usr/share/anaconda/${stub}-stub usr/bin/${stub}
 %endfor
@@ -35,14 +34,20 @@ systemctl disable systemd-readahead-collect.service \
                   systemd-readahead-replay.service \
                   mdmonitor.service \
                   mdmonitor-takeover.service \
-                  NetworkManager.service \
                   lvm2-monitor.service \
-                  dnf-makecache.timer
+                  dnf-makecache.timer \
+                  NetworkManager.service
 ## These services can't be disabled normally (they're linked into place in
 ## /usr/lib/systemd rather than /etc/systemd), so we have to mask them.
 systemctl mask fedora-configure.service fedora-loadmodules.service \
                fedora-autorelabel.service fedora-autorelabel-mark.service \
-               fedora-wait-storage.service media.mount
+               fedora-wait-storage.service media.mount \
+               systemd-tmpfiles-clean.service systemd-tmpfiles-clean.timer \
+               ldconfig.service
+
+## Make logind activate anaconda-shell@.service on switch to empty VT
+symlink anaconda-shell@.service lib/systemd/system/autovt@.service
+replace "#ReserveVT=6" "ReserveVT=2" etc/systemd/logind.conf
 
 ## Make logind activate anaconda-shell@.service on switch to empty VT
 symlink anaconda-shell@.service lib/systemd/system/autovt@.service
@@ -60,9 +65,10 @@ install ${configdir}/bash_history root/.bash_history
 install ${configdir}/profile root/.profile
 install ${configdir}/libuser.conf etc
 install ${configdir}/sysctl.conf etc/sysctl.d/anaconda.conf
-%if exists(root+"/etc/selinux/targeted"):
+install ${configdir}/spice-vdagentd etc/sysconfig
-    install ${configdir}/selinux.config etc/selinux/config
+mkdir etc/NetworkManager/conf.d
-%endif
+install ${configdir}/91-anaconda-autoconnect-slaves.conf etc/NetworkManager/conf.d
+install ${configdir}/vconsole.conf etc
 
 ## disable NetworkManager
 install ${configdir}/NetworkManager.state var/lib/NetworkManager/NetworkManager.state
@@ -90,24 +96,7 @@ replace "root:\*:" "root::" etc/shadow
 %endif
 
 ## gconf settings
-gconfset /apps/metacity/general/button_layout string :
-gconfset /apps/metacity/general/action_right_click_titlebar string none
-gconfset /apps/metacity/general/num_workspaces int 1
-gconfset /apps/metacity/window_keybindings/close string disabled
-gconfset /apps/metacity/global_keybindings/run_command_window_screenshot string disabled
-gconfset /apps/metacity/global_keybindings/run_command_screenshot string disabled
-gconfset /apps/metacity/global_keybindings/switch_to_workspace_up string disabled
-gconfset /apps/metacity/global_keybindings/switch_to_workspace_down string disabled
-gconfset /apps/metacity/global_keybindings/switch_to_workspace_left string disabled
-gconfset /apps/metacity/global_keybindings/switch_to_workspace_right string disabled
-gconfset /apps/metacity/global_keybindings/switch_windows string disabled
 gconfset /desktop/gnome/interface/accessibility bool true
-gconfset /desktop/gnome/interface/at-spi-corba bool true
-
-## Some settings are controlled by gsettings now.
-install ${configdir}/org.gnome.desktop.wm.keybindings.gschema.override usr/share/glib-2.0/schemas
-install ${configdir}/org.gnome.desktop.wm.preferences.gschema.override usr/share/glib-2.0/schemas
-runcmd chroot ${root} glib-compile-schemas /usr/share/glib-2.0/schemas
 
 move usr/libexec/anaconda/auditd sbin
 
@@ -121,6 +110,7 @@ append etc/depmod.d/dd.conf "search updates built-in"
 
 ## include additional modules in initramfs
 append etc/dracut.conf.d/extra-install-modules.conf "add_drivers+=' ehci-pci xhci-hcd xhci-pci '"
+
 ## no longer hard dependencies of anaconda module (for smaller EFI initrd), so add them here
 append etc/dracut.conf.d/extra-install-modules.conf "add_dracutmodules+=' livenet nfs img-lib convertfs ifcfg '"