Add sudo to the fedora container base image.

sudo is needed in the base image for it to be used in Azure services

Signed-off-by: Clement Verna <cverna@tutanota.com>

fedora-arm-base.ks

@@ -43,6 +43,11 @@ initial-setup-gui
 
 # make sure all the locales are available for inital0-setup and anaconda to work
 glibc-all-langpacks
+
+# this ks uses it in %post, and imgcreate also uses it in the installed
+# system root, so it needs to be there
+chkconfig
+
 %end
 
 %post
@@ -53,7 +58,7 @@ cp -P /usr/share/uboot/rpi_3_32b/u-boot.bin /boot/efi/rpi3-u-boot.bin
 
 # work around for poor key import UI in PackageKit
 rm -f /var/lib/rpm/__db*
-releasever=$(rpm --eval '%{fedora}')
+releasever=$(rpm -q --qf '%{version}\n' fedora-release)
 basearch=armhfp
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 echo "Packages within this ARM disk image"
@@ -71,8 +76,13 @@ systemctl mask tmp.mount
 
 dnf -y remove dracut-config-generic
 
+# Disable network service here, as doing it in the services line
+# fails due to RHBZ #1369794
+/sbin/chkconfig network off
+
 # Remove machine-id on pre generated images
 rm -f /etc/machine-id
 touch /etc/machine-id
 
 %end
+

fedora-arm-workstation.ks

@@ -7,8 +7,6 @@ part / --size=6200 --fstype ext4
 %packages
 -initial-setup
 -initial-setup-gui
--libvirt*
--gnome-boxes
 
 %end
 

fedora-cinnamon-common.ks

@@ -12,9 +12,8 @@
 @cinnamon-desktop
 @libreoffice
 parole
-exaile
 
 # extra backgrounds
-f31-backgrounds-extras-gnome
+f30-backgrounds-extras-gnome
 
 %end

fedora-cloud-base.ks

@@ -215,7 +215,7 @@ truncate -c -s 0 /var/log/dnf.log
 truncate -c -s 0 /var/log/dnf.rpm.log
 
 echo "Import RPM GPG key"
-releasever=$(rpm --eval '%{fedora}')
+releasever=$(rpm -q --qf '%{version}\n' fedora-release)
 basearch=$(uname -i)
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 

fedora-cloud-bigdata.ks

@@ -182,7 +182,7 @@ dnf clean all
 truncate -c -s 0 /var/log/dnf.log
 
 echo "Import RPM GPG key"
-releasever=$(rpm --eval '%{fedora}')
+releasever=$(rpm -q --qf '%{version}\n' fedora-release)
 basearch=$(uname -i)
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 

fedora-cloud-experimental.ks

@@ -173,7 +173,7 @@ dnf clean all
 truncate -c -s 0 /var/log/dnf.log
 
 echo "Import RPM GPG key"
-releasever=$(rpm --eval '%{fedora}')
+releasever=$(rpm -q --qf '%{version}\n' fedora-release)
 basearch=$(uname -i)
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 

fedora-container-base.ks

@@ -3,7 +3,7 @@
 
 %include fedora-container-common.ks
 
-%packages --excludedocs --instLangs=en --nocore --excludeWeakdeps
+%packages --excludedocs --instLangs=en --nocore
 rootfiles
 # https://communityblog.fedoraproject.org/modularity-dead-long-live-modularity/
 fedora-repos-modular
@@ -13,9 +13,6 @@ dnf
 dnf-yum  # https://fedorahosted.org/fesco/ticket/1312#comment:29
 sssd-client
 sudo
--glibc-langpack-en
--cracklib-dicts
--langpacks-en
 %end
 
 %post --erroronfail --log=/root/anaconda-post.log
@@ -47,19 +44,4 @@ umount /run
 systemd-tmpfiles --prefix=/run/ --prefix=/var/run/ --create --boot || true
 rm /run/nologin # https://pagure.io/atomic-wg/issue/316
 
-# Final pruning
-rm -rfv /var/cache/* /var/log/* /tmp/*
-
-%end
-
-%post --nochroot --erroronfail --log=/mnt/sysimage/root/anaconda-post-nochroot.log
-set -eux
-
-# See: https://bugzilla.redhat.com/show_bug.cgi?id=1051816
-# NOTE: run this in nochroot because "find" does not exist in chroot
-KEEPLANG=en_US
-for dir in locale i18n; do
-    find /mnt/sysimage/usr/share/${dir} -mindepth  1 -maxdepth 1 -type d -not \( -name "${KEEPLANG}" -o -name POSIX \) -exec rm -rfv {} +
-done
-
 %end

fedora-container-common.ks

@@ -29,7 +29,7 @@ zerombr
 clearpart --all
 autopart --noboot --nohome --noswap --nolvm
 
-%packages --excludedocs --instLangs=en --nocore --excludeWeakdeps
+%packages --excludedocs --instLangs=en --nocore
 fedora-release-container
 bash
 coreutils
@@ -39,8 +39,6 @@ rpm
 shadow-utils
 sssd-client
 util-linux
-#needed by Anaconda https://bugzilla.redhat.com/show_bug.cgi?id=1744115
-systemd
 -kernel
 -dosfstools
 -e2fsprogs
@@ -63,12 +61,9 @@ set -eux
 LANG="en_US"
 echo "%_install_langs $LANG" > /etc/rpm/macros.image-language-conf
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=1727489
-echo 'LANG="C.UTF-8"' >  /etc/locale.conf
-
 # https://bugzilla.redhat.com/show_bug.cgi?id=1400682
 echo "Import RPM GPG key"
-releasever=$(rpm --eval '%{fedora}')
+releasever=$(rpm -q --qf '%{version}\n' fedora-release-container)
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
 
 echo "# fstab intentionally empty for containers" > /etc/fstab

fedora-disk-base.ks

@@ -62,7 +62,7 @@ glibc-all-langpacks
 # Setup Raspberry Pi firmware
 cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin
 
-releasever=$(rpm --eval '%{fedora}')
+releasever=$(rpm -q --qf '%{version}\n' fedora-release)
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
 echo "Packages within this disk image"
 rpm -qa

fedora-disk-xfce.ks

@@ -1,17 +0,0 @@
-%include fedora-disk-base.ks
-%include fedora-disk-xbase.ks
-%include fedora-xfce-common.ks
-
-bootloader --append="cma=192MB"
-
-services --enabled=sshd,NetworkManager,chronyd,zram-swap
-
-autopart --type=plain --noswap
-
-%packages
-
-%end
-
-%post
-
-%end

fedora-iot.ks

@@ -5,9 +5,11 @@ lang en_US.UTF-8
 keyboard us
 timezone --utc Etc/UTC
 
+auth --useshadow --passalgo=sha512
 selinux --enforcing
 rootpw --lock --iscrypted locked
 
+# Add most common consoles console=ttyAMA0 console=ttyS0 console=ttyS1 as kernel boot parameter
 bootloader --timeout=1 --append="net.ifnames=0 modprobe.blacklist=vc4"
 
 network --bootproto=dhcp --device=link --activate --onboot=on
@@ -22,7 +24,7 @@ autopart --nohome --noswap --type=plain
 
 # Equivalent of %include fedora-repo.ks
 # Pull from the ostree repo that was created during the compose
-ostreesetup --nogpg --osname=fedora-iot --remote=fedora-iot --url=https://kojipkgs.fedoraproject.org/compose/iot/repo/ --ref=fedora/stable/${basearch}/iot
+ostreesetup --nogpg --osname=fedora-iot --remote=fedora-iot --url=https://kojipkgs.fedoraproject.org/compose/iot/repo/ --ref=fedora/devel/${basearch}/iot
 
 reboot
 
@@ -35,28 +37,28 @@ if [[ $arch == "aarch64" ]] || [[ $arch == "armv7l" ]]; then
 if [[ $arch == "aarch64" ]]; then
 cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin
 else
-cp -P /usr/share/uboot/rpi_2/u-boot.bin /boot/efi/rpi2-u-boot.bin
+cp -P /usr/share/uboot/rpi_2/u-boot.bin /boot/fw/rpi2-u-boot.bin
-cp -P /usr/share/uboot/rpi_3_32b/u-boot.bin /boot/efi/rpi3-u-boot.bin
+cp -P /usr/share/uboot/rpi_3_32b/u-boot.bin /boot/fw/rpi3-u-boot.bin
 fi
 fi
 
 # Set the origin to the "main ref", distinct from /updates/ which is where bodhi writes.
 # We want consumers of this image to track the two week releases.
-ostree admin set-origin --index 0 fedora-iot https://dl.fedoraproject.org/iot/repo/ "fedora/stable/${arch}/iot"
+ostree admin set-origin --index 0 fedora-iot https://dl.fedoraproject.org/iot/repo/ "fedora/devel/${arch}/iot"
 
 # Make sure the ref we're supposedly sitting on (according
 # to the updated origin) exists.
-ostree refs "fedora-iot:fedora/stable/${arch}/iot" --create "fedora-iot:fedora/stable/${arch}/iot"
+ostree refs "fedora-iot:fedora/devel/${arch}/iot" --create "fedora-iot:fedora/devel/${arch}/iot"
 
 # Remove the old ref so that the commit eventually gets cleaned up.
-ostree refs "fedora-iot:fedora/stable/${arch}/iot" --delete
+ostree refs "fedora-iot:fedora/devel/${arch}/iot" --delete
 
 # delete/add the remote with new options to enable gpg verification
 # and to point them at the cdn url
 ostree remote delete fedora-iot
-ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/ --set=contenturl=mirrorlist=https://ostree.fedoraproject.org/iot/mirrorlist  fedora-iot 'https://ostree.fedoraproject.org/iot'
+ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-iot-2019 --set=contenturl=mirrorlist=https://ostree.fedoraproject.org/iot/mirrorlist  fedora-iot 'https://ostree.fedoraproject.org/iot'
 
-# We're getting a stray console= from somewhere, work around it
+# We're gettin a stray console= from somewhere, work around it
 rpm-ostree kargs --delete=console=tty0
 
 # older versions of livecd-tools do not follow "rootpw --lock" line above
@@ -66,6 +68,13 @@ passwd -l root
 # Work around https://bugzilla.redhat.com/show_bug.cgi?id=1193590
 cp /etc/skel/.bash* /var/roothome
 
+echo -n "Network fixes"
+# initscripts don't like this file to be missing.
+cat > /etc/sysconfig/network << EOF
+NETWORKING=yes
+NOZEROCONF=yes
+EOF
+
 # Remove any persistent NIC rules generated by udev
 rm -vf /etc/udev/rules.d/*persistent-net*.rules
 # And ensure that we will do DHCP on eth0 on startup
@@ -96,6 +105,9 @@ echo "(Don't worry -- that out-of-space error was expected.)"
 # For trac ticket https://pagure.io/atomic-wg/issue/128
 rm -f /etc/sysconfig/network-scripts/ifcfg-ens3
 
+echo "Adding Developer Mode GRUB2 menu item."
+/usr/libexec/atomic-devmode/bootentry add
+
 # Anaconda is writing an /etc/resolv.conf from the install environment.
 # The system should start out with an empty file, otherwise cloud-init
 # will try to use this information and may error:

fedora-kde-common.ks

@@ -6,7 +6,6 @@
 @kde-media
 @kde-office
 @networkmanager-submodules
-fedora-release-kde
 
 ### The KDE-Desktop
 

fedora-live-base.ks

@@ -45,8 +45,7 @@ kernel-modules-extra
 # This was added a while ago, I think it falls into the category of
 # "Diagnosis/recovery tool useful from a Live OS image".  Leaving this untouched
 # for now.
-#memtest86+
+memtest86+
-@x86-baremetal-tools # memtest86+ is included
 
 # The point of a live image is to install
 anaconda
@@ -59,7 +58,7 @@ aajohan-comfortaa-fonts
 
 # Without this, initramfs generation during live image creation fails: #1242586
 dracut-live
-# syslinux is in @x86-baremetal-tools
+syslinux
 
 # anaconda needs the locales available to run for different locales
 glibc-all-langpacks
@@ -225,7 +224,7 @@ touch /.liveimg-configured
 # https://bugzilla.redhat.com/show_bug.cgi?id=679486
 # the hostname must be something else than 'localhost'
 # https://bugzilla.redhat.com/show_bug.cgi?id=1370222
-hostnamectl set-hostname "localhost-live"
+echo "localhost-live" > /etc/hostname
 
 EOF
 
@@ -305,7 +304,7 @@ EOF
 
 # work around for poor key import UI in PackageKit
 rm -f /var/lib/rpm/__db*
-releasever=$(rpm --eval '%{fedora}')
+releasever=$(rpm -q --qf '%{version}\n' --whatprovides system-release)
 basearch=$(uname -i)
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 echo "Packages within this LiveCD"

fedora-live-design_suite.ks

@@ -6,7 +6,6 @@
 # Maintainer:
 # - Luya Tshimbalanga <luya AT fedoraproject DOT org>
 # - Credit to Sebastian Dziallas for initiating the project
-
 %include fedora-live-workstation.ks
 
 # Size partition
@@ -17,11 +16,10 @@ part / --size 14336
 @design-suite
 
 # Provides backup application
-deja-dup
+#deja-dup
-deja-dup-nautilus
+#deja-dup-nautilus
 
 # Add extra gnome applications
-gnome-books
 gnome-calendar
 gnome-photos
 gnome-shell-extension-pomodoro
@@ -32,7 +30,7 @@ powerline
 powerline-fonts
 
 # Extra wallpapers
-f31-backgrounds-extras-gnome
+f30-backgrounds-extras-gnome
 
 # removal of unneeded applications
 -gnome-boxes
@@ -40,8 +38,8 @@ f31-backgrounds-extras-gnome
 -rdesktop
 
 # temporarily removing conflicting application
+-synfigstudio
 -mypaint
--sparkleshare
 
 %end
 

fedora-live-games.ks

@@ -1,16 +1,9 @@
-# fedora-live-games.ks
+# fedora-livedvd-games.ks
 #
-# Maintainer:
+# Maintainer(s):
 # - Darryl T. Agostinelli <dagostinelli@gmail.com>
-#   https://fedoraproject.org/wiki/User:Dagostinelli
+# - Formerly maintained by Bruno Wolff III <bruno@wolff.to>
-#
+# - Formerly maintained by Rahul Sundaram
-# Former Maintainers:
-# - Bruno Wolff III <bruno@wolff.to>
-#   https://fedoraproject.org/wiki/User:Bruno
-#
-# - Rahul Sundaram <sundaram@fedoraproject.org>
-#   https://fedoraproject.org/wiki/User:Sundaram
-#
 
 %include fedora-live-xfce.ks
 
@@ -45,6 +38,7 @@ asc-music
 astromenace
 # beneath-a-steel-sky-cd scummvm games cut for size
 boswars
+btanks
 bzflag
 crossfire-client
 extremetuxracer
@@ -52,7 +46,7 @@ extremetuxracer
 freeciv
 freecol
 freedoom
-freedroidrpg
+# freedroidrpg # Cut for size
 frozen-bubble
 gl-117
 # glob2 - currently broken
@@ -63,18 +57,18 @@ tmw
 megaglest
 nethack-vultures
 netpanzer
-neverball
+#neverball #cut for size
 nogravity
 #pinball # Would pull in fluid-soundfont-lite-patches
 scorched3d
 # supertux # Crashing
-supertuxkart
+#supertuxkart #remove for size
 ultimatestunts
 warzone2100
 wesnoth
 # worminator # Would pull in fluid-soundfont-lite-patches
-warmux
+# warmux # Cut for size
-xmoto
+# xmoto # Cut for size
 
 # traditional (small)
 
@@ -96,6 +90,7 @@ kcheckers
 knights
 lbrickbuster2
 # liquidwar # Would pull in fluid-soundfont-lite-patches
+londonlaw
 lordsawar
 # lure scummvm games cut for size
 # machineball # Would pull in fluid-soundfont-lite-patches
@@ -105,7 +100,7 @@ pachi
 pioneers
 quarry
 # Ri-li cut for size
-# rogue # recently abandoned. Someone picked it up. Waiting for approval.
+# rogue # abandoned. Someone pick it up so we can include it again!
 # scorchwentbonkers # Would pull in fluid-soundfont-lite-patches
 seahorse-adventures
 solarwolf
@@ -119,6 +114,7 @@ xblast
 auriferous
 alienblaster
 # duel3 # Would pull in fluid-soundfont-lite-patches
+lmarbles
 powermanga
 # raidem # Would pull in fluid-soundfont-lite-patches
 # raidem-music # Would pull in fluid-soundfont-lite-patches
@@ -157,6 +153,7 @@ pingus
 
 # puzzles (small)
 
+escape
 # gbrainy Removed for space - only game that pulls in mono
 magicor
 mirrormagic
@@ -175,6 +172,8 @@ PySolFC
 
 bygfoot
 celestia
+childsplay
+gcompris
 planets
 tuxpaint
 tuxpaint-stamps

fedora-live-jam_kde.ks

@@ -101,6 +101,7 @@ ladspa-cmt-plugins
 ladspa-fil-plugins
 ladspa-mcp-plugins
 ladspa-rev-plugins
+ladspa-swh-plugins
 ladspa-tap-plugins
 ladspa-vco-plugins
 

fedora-live-robotics.ks

@@ -27,12 +27,9 @@ mercurial
 -@graphical-internet
 -@games
 -@sound-and-video
--@dial-up
--@input-methods
--@standard
 
 # Add a web browser
-@firefox
+firefox
 
 # Remove office suite
 -libreoffice-*
@@ -44,11 +41,9 @@ mercurial
 # Drop things that pull in perl
 -linux-atm
 
-# No printing or scanning
+# No printing
 -foomatic-db-ppds
 -foomatic
--sane-backends-drivers-scanners
--libsane-hpaio
 
 # Dictionaries are big
 -aspell-*
@@ -57,7 +52,6 @@ mercurial
 
 # Help and art can be big, too
 -gnome-user-docs
--gnome-getting-started-docs
 -evolution-help
 -desktop-backgrounds-basic
 -*backgrounds-extras
@@ -66,6 +60,7 @@ mercurial
 -krb5-auth-dialog
 -krb5-workstation
 -pam_krb5
+-quota
 -nano
 -dos2unix
 -finger
@@ -74,8 +69,10 @@ mercurial
 -mtr
 -pinfo
 -rsh
+-nfs-utils
 -ypbind
 -yp-tools
+-rpcbind
 -acpid
 -ntsysv
 
@@ -118,7 +115,7 @@ if [ -f /usr/share/applications/liveinst.desktop ]; then
 
   cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
 [org.gnome.shell]
-favorite-apps=['firefox.desktop', 'org.qt-project.qtcreator.desktop', 'arduino.desktop', 'gnome-terminal.desktop','nautilus.desktop', 'anaconda.desktop']
+favorite-apps=['firefox.desktop', 'eclipse.desktop', 'arduino.desktop', 'gnome-terminal.desktop','nautilus.desktop', 'anaconda.desktop']
 FOE
 
 fi

fedora-modular-disk-minimal.ks

@@ -58,7 +58,7 @@ dhcp-client
 # Setup Raspberry Pi firmware
 cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin
 
-releasever=$(rpm --eval '%{fedora}')
+releasever=$(rpm -q --qf '%{version}\n' fedora-modular-release)
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
 echo "Packages within this disk image"
 rpm -qa

fedora-python-classroom-common.ks

@@ -13,9 +13,7 @@ vim-enhanced
 wget
 
 # Remove Pythons possibly recommended by tox
--python2
 -python26
--python27
 -python33
 -python34
 -python35

fedora-python-classroom-gnome-common.ks

@@ -7,6 +7,7 @@
 %include fedora-python-classroom-common.ks
 
 %packages
+ninja-ide
 emacs
 python3-matplotlib-tk
 python3-pillow-tk

fedora-scientific-common.ks

@@ -56,10 +56,13 @@ gcc-gfortran
 # GUI for R
 rkward
 
+# GUI for Octave
+#qtoctave
+
 # julia
-julia
+# Comment out till build failure is sorted
-julia-doc
+# julia
-julia-devel
+# julia-doc
 
 # IDEs for the IDE folks
 @eclipse
@@ -67,9 +70,7 @@ julia-devel
 # Workaround for https://pagure.io/releng/issue/7814
 -eclipse-linuxtools-vagrant
 
-python3-spyder
+#spyder
-python3-spyder-kernels
-
 
 #writing & publishing
 emacs
@@ -90,8 +91,8 @@ openmpi
 openmpi-devel
 valgrind-openmpi
 libgomp
+mpi4py-openmpi
 python3-mpi4py-openmpi
-python3-mpi4py-mpich
 
 #Version control- a GUI for each as well
 
@@ -113,6 +114,7 @@ libotf
 #root
 root
 root-gui-fitpanel
+root-python
 
 #Multiple jobs/clustering system
 # torque

fedora-soas-common.ks

@@ -30,6 +30,7 @@ firewall --enabled --service=mdns,presence
 -abrt-cli
 -ibus*
 -hyperv-daemons
+-webkit2gtk3-plugin-process-gtk2
 
 # Add some extra fonts
 dejavu-sans-fonts
@@ -88,20 +89,20 @@ sugar-logos
 
 %post
 
+# Rebuild initrd for Sugar boot screen
+KERNEL_VERSION=$(rpm -q kernel --qf '%{version}-%{release}.%{arch}\n')
+/usr/sbin/plymouth-set-default-theme sugar
+dracut -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION
+
+# Note that running rpm recreates the rpm db files which aren't needed or wanted
+rm -f /var/lib/rpm/__db*
+
 # Get proper release naming in the control panel
 cat >> /boot/olpc_build << EOF
 Sugar on a Stick
 EOF
 cat /etc/fedora-release >> /boot/olpc_build
 
-# Rebuild initrd for Sugar boot screen
-KERNEL_VERSION=$(rpm -q kernel --qf '%{version}-%{release}.%{arch}\n')
-/usr/sbin/plymouth-set-default-theme sugar
-dracut -N -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION
-
-# Note that running rpm recreates the rpm db files which aren't needed or wanted
-rm -f /var/lib/rpm/__db*
-
 # Add our activities to the favorites
 cat > /usr/share/sugar/data/activities.defaults << EOF
 org.laptop.WebActivity

fedora-workstation-common.ks

@@ -8,7 +8,6 @@
 # Make sure to sync any additions / removals done here with
 # workstation-product-environment in comps
 @base-x
-@container-management
 @core
 @firefox
 @fonts

l10n/fedora-livecd-xfce-de_CH.ks

@@ -3,7 +3,7 @@
 # Maintainer(s):
 # - Fabian Affolter <fab at fedoraproject.org>
 
-%include ../fedora-live-xfce.ks
+%include ../fedora-livecd-xfce.ks
 
 lang de_DE
 keyboard sg-latin1-nodeadkeys

l10n/fedora-livecd-xfce-de_DE.ks

@@ -3,7 +3,7 @@
 # Maintainer(s):
 # - Fabian Affolter <fab at fedoraproject.org>
 
-%include ../fedora-live-xfce.ks
+%include ../fedora-livecd-xfce.ks
 
 lang de_DE.UTF-8
 keyboard de-latin1-nodeadkeys

l10n/fedora-livecd-xfce-fr_FR.ks

@@ -6,7 +6,7 @@
 # Maintainer(s):
 # - Matthieu Saulnier <fantom@fedoraproject.org>
 
-%include ../fedora-live-xfce.ks
+%include ../fedora-livecd-xfce.ks
 
 lang fr_FR.UTF-8
 keyboard fr-latin9

l10n/fedora-livecd-xfce-nl_NL.ks

@@ -3,7 +3,7 @@
 # Maintainer(s):
 # - Jeroen van Meeuwen <kanarip a fedoraunity.org>
 
-%include ../fedora-live-xfce.ks
+%include ../fedora-livecd-xfce.ks
 
 lang nl_NL
 keyboard us

l10n/fedora-livecd-xfce-pt_PT.ks

@@ -3,7 +3,7 @@
 # Maintainer(s):
 # - Pedro Silva <pedrofsilva a netcabo.pt>
 
-%include ../fedora-live-xfce.ks
+%include ../fedora-livecd-xfce.ks
 
 lang pt_PT.UTF-8
 keyboard pt-latin1

l10n/fedora-livecd-xfce-ru_RU.ks

@@ -3,7 +3,7 @@
 # Maintainer(s):
 # - Sergey Mihailov <sergey.mihailov at gmail.com>
 
-%include ../fedora-live-xfce.ks
+%include ../fedora-livecd-xfce.ks
 
 lang ru_RU.UTF-8
 keyboard ru