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>
IoT: minor ks tweaks
2025-12-09 00:20:31 +08:00 · 2019-05-05 14:12:59 +02:00 · 2019-02-14 15:54:33 +00:00 · 2019-02-07 14:29:21 +00:00 · 2019-02-07 11:59:19 +05:30 · 2019-02-05 16:01:02 +01:00
55 changed files with 569 additions and 278 deletions
--- a/fedora-arm-base.ks
+++ b/fedora-arm-base.ks
@@ -4,18 +4,16 @@ auth --useshadow --passalgo=sha512
 selinux --enforcing
 firewall --enabled --service=mdns,ssh

-# configure extlinux bootloader
-bootloader extlinux
+bootloader --location=mbr

-part /boot/fw --size=30 --fstype vfat --asprimary
+part /boot/efi --size=80 --fstype vfat --asprimary
 part /boot --size=512 --fstype ext4 --asprimary
-part swap --size=512 --fstype swap --asprimary
 part / --size=2800 --fstype ext4 --asprimary

 # make sure that initial-setup runs and lets us do all the configuration bits
 firstboot --reconfig

-services --enabled=sshd,NetworkManager,avahi-daemon,rsyslog,chronyd,initial-setup
+services --enabled=sshd,NetworkManager,avahi-daemon,chronyd,initial-setup,zram-swap

 %include fedora-repo.ks

@@ -23,6 +21,7 @@ services --enabled=sshd,NetworkManager,avahi-daemon,rsyslog,chronyd,initial-setu
@core
@standard
@hardware-support
+zram

 kernel
 # remove this in %post
@@ -39,9 +38,7 @@ initial-setup
 initial-setup-gui
 -iwl*
 -ipw*
-trousers-lib
 -usb_modeswitch
-iproute-tc
 #lets resize / on first boot
 # dracut-modules-growroot

@@ -53,10 +50,8 @@ glibc-all-langpacks
 %post

 # Setup Raspberry Pi firmware
-cp -Pr /usr/share/bcm283x-firmware/* /boot/fw/
-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/fw/rpi3-u-boot.bin
-sed -i '/vfat/ d' /etc/fstab
+cp -P /usr/share/uboot/rpi_2/u-boot.bin /boot/efi/rpi2-u-boot.bin
+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*
--- a/fedora-arm-kde.ks
+++ b/fedora-arm-kde.ks
@@ -2,7 +2,7 @@
 %include fedora-arm-xbase.ks
 %include fedora-kde-common.ks

-part / --size=5690 --fstype ext4
+part / --size=6300 --fstype ext4

 %post

--- a/fedora-arm-lxde.ks
+++ b/fedora-arm-lxde.ks
@@ -2,6 +2,8 @@
 %include fedora-arm-xbase.ks
 %include fedora-lxde-common.ks

+part / --size=4000 --fstype ext4
+
 %post

 %end
--- a/fedora-arm-lxqt.ks
+++ b/fedora-arm-lxqt.ks
@@ -2,7 +2,7 @@
 %include fedora-arm-xbase.ks
 %include fedora-lxqt-common.ks

-part / --size=3800 --fstype ext4 --asprimary
+part / --size=4200 --fstype ext4 --asprimary

 %packages
 # trojita not available on non-x86 platforms
--- a/fedora-arm-mate.ks
+++ b/fedora-arm-mate.ks
@@ -2,7 +2,7 @@
 %include fedora-arm-xbase.ks
 %include fedora-mate-common.ks

-part / --size=5500 --fstype ext4
+part / --size=6000 --fstype ext4

 %post

--- a/fedora-arm-minimal.ks
+++ b/fedora-arm-minimal.ks
@@ -2,7 +2,6 @@
 %include fedora-minimal-common.ks

 part /boot --size=512 --fstype ext4
-part swap --size=256 --fstype swap
 part / --size=1256 --fstype ext4

 %packages
--- a/fedora-arm-server.ks
+++ b/fedora-arm-server.ks
@@ -4,10 +4,13 @@
 part / --size=2500 --fstype xfs

 %packages
-# install the default groups for the server evironment since installing the environment is not working
+# install the default groups for the server environment since installing the environment is not working
@server-product
@standard
@headless-management
+@hardware-support
+@networkmanager-submodules
+
@container-management
@domain-client
 -initial-setup-gui
--- a/fedora-arm-workstation.ks
+++ b/fedora-arm-workstation.ks
@@ -2,7 +2,7 @@
 %include fedora-arm-xbase.ks
 %include fedora-workstation-common.ks

-part / --size=5500 --fstype ext4
+part / --size=6200 --fstype ext4

 %packages
 -initial-setup
--- a/fedora-arm-xfce.ks
+++ b/fedora-arm-xfce.ks
@@ -2,7 +2,7 @@
 %include fedora-arm-xbase.ks
 %include fedora-xfce-common.ks

-part / --size=4500 --fstype ext4
+part / --size=4700 --fstype ext4

 %post

--- a/fedora-atomic-testing-base.ks
+++ b/fedora-atomic-testing-base.ks
@@ -0,0 +1,27 @@
+
+# ./fedora-atomic-testing-base.ks - for building media from the testing
+# refs (fedora/29/${basearch}/testing/atomic-host)
+
+ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=https://kojipkgs.fedoraproject.org/compose/ostree/repo/ --ref=fedora/29/${basearch}/testing/atomic-host
+
+%post --erroronfail
+# Find the architecture we are on
+arch=$(uname -m)
+# Set the origin to the "main stable ref", distinct from /testing/ which is where bodhi writes.
+# We want consumers of this image to track the two week releases.
+ostree admin set-origin --index 0 fedora-atomic https://ostree.fedoraproject.org "fedora/29/${arch}/atomic-host"
+
+# Make sure the ref we're supposedly sitting on (according
+# to the updated origin) exists.
+ostree refs "fedora-atomic:fedora/29/${arch}/testing/atomic-host" --create "fedora-atomic:fedora/29/${arch}/atomic-host"
+
+# Remove the old ref so that the commit eventually gets
+# cleaned up.
+ostree refs "fedora-atomic:fedora/29/${arch}/testing/atomic-host" --delete
+
+# delete/add the remote with new options to enable gpg verification
+# and to point them at the cdn url
+ostree remote delete fedora-atomic
+ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-29-primary --set=contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist fedora-atomic 'https://ostree.fedoraproject.org'
+
+%end
--- a/fedora-atomic-testing.ks
+++ b/fedora-atomic-testing.ks
@@ -0,0 +1,6 @@
+
+# ./fedora-atomic-testing.ks - for building base cloud media 
+# from the testing refs (fedora/29/${basearch}/testing/atomic-host)
+
+%include fedora-atomic.ks
+%include fedora-atomic-testing-base.ks
--- a/fedora-atomic-updates-base.ks
+++ b/fedora-atomic-updates-base.ks
@@ -0,0 +1,27 @@
+
+# ./fedora-atomic-updates-base.ks - for building media from the updates
+# refs (fedora/29/${basearch}/updates/atomic-host)
+
+ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=https://kojipkgs.fedoraproject.org/compose/ostree/repo/ --ref=fedora/29/${basearch}/updates/atomic-host
+
+%post --erroronfail
+# Find the architecture we are on
+arch=$(uname -m)
+# Set the origin to the "main stable 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-atomic https://ostree.fedoraproject.org "fedora/29/${arch}/atomic-host"
+
+# Make sure the ref we're supposedly sitting on (according
+# to the updated origin) exists.
+ostree refs "fedora-atomic:fedora/29/${arch}/updates/atomic-host" --create "fedora-atomic:fedora/29/${arch}/atomic-host"
+
+# Remove the old ref so that the commit eventually gets
+# cleaned up.
+ostree refs "fedora-atomic:fedora/29/${arch}/updates/atomic-host" --delete
+
+# delete/add the remote with new options to enable gpg verification
+# and to point them at the cdn url
+ostree remote delete fedora-atomic
+ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-29-primary --set=contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist fedora-atomic 'https://ostree.fedoraproject.org'
+
+%end
--- a/fedora-atomic-updates.ks
+++ b/fedora-atomic-updates.ks
@@ -0,0 +1,6 @@
+
+# ./fedora-atomic-updates.ks - for building base cloud media 
+# from the updates refs (fedora/29/${basearch}/updates/atomic-host)
+
+%include fedora-atomic.ks
+%include fedora-atomic-updates-base.ks
--- a/fedora-atomic-vagrant-testing.ks
+++ b/fedora-atomic-vagrant-testing.ks
@@ -0,0 +1,6 @@
+
+# ./fedora-atomic-vagrant-testing.ks - for building media from the testing
+# refs (fedora/29/${basearch}/testing/atomic-host) for vagrant
+
+%include fedora-atomic-vagrant.ks
+%include fedora-atomic-testing-base.ks
--- a/fedora-atomic-vagrant-updates.ks
+++ b/fedora-atomic-vagrant-updates.ks
@@ -0,0 +1,6 @@
+
+# ./fedora-atomic-vagrant-updates.ks - for building media from the updates
+# refs (fedora/29/${basearch}/updates/atomic-host) for vagrant
+
+%include fedora-atomic-vagrant.ks
+%include fedora-atomic-updates-base.ks
--- a/fedora-atomic.ks
+++ b/fedora-atomic.ks
@@ -41,7 +41,8 @@ services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
 zerombr
 clearpart --all
 # Implement: https://pagure.io/atomic-wg/issue/281
-# The bare metal layout default is in http://pkgs.fedoraproject.org/cgit/rpms/fedora-productimg-atomic.git
+# The bare metal layout currently inherits from fedora server and is in
+# https://github.com/rhinstaller/anaconda/blob/master/pyanaconda/installclasses/fedora_atomic_host.py
 # However, the disk size is currently just 6GB for the cloud image (defined in pungi-fedora).  So the
 # "15GB, rest unallocated" model doesn't make sense.  The Vagrant box is 40GB (apparently a number of
 # Vagrant boxes come big and rely on thin provisioning).
@@ -57,7 +58,7 @@ logvol / --size=3000 --grow --fstype="xfs" --name=root --vgname=atomicos

 # Equivalent of %include fedora-repo.ks
 # Pull from the ostree repo that was created during the compose
-ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=https://kojipkgs.fedoraproject.org/compose/atomic/rawhide/ --ref=fedora/rawhide/${basearch}/atomic-host
+ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=https://kojipkgs.fedoraproject.org/compose/ostree/repo/ --ref=fedora/29/${basearch}/atomic-host

 reboot

@@ -67,7 +68,7 @@ reboot
 # This location is where the compose gets synced to after the compose
 # is done.
 ostree remote delete fedora-atomic
-ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-28-primary fedora-atomic 'https://kojipkgs.fedoraproject.org/atomic/rawhide/'
+ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-29-primary --set=contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist fedora-atomic 'https://ostree.fedoraproject.org'

 # older versions of livecd-tools do not follow "rootpw --lock" line above
 # https://bugzilla.redhat.com/show_bug.cgi?id=964299
--- a/fedora-cinnamon-common.ks
+++ b/fedora-cinnamon-common.ks
@@ -11,8 +11,9 @@
@networkmanager-submodules
@cinnamon-desktop
@libreoffice
+parole

 # extra backgrounds
-f27-backgrounds-extras-gnome
+f29-backgrounds-extras-gnome

 %end
--- a/fedora-cloud-base-vagrant.ks
+++ b/fedora-cloud-base-vagrant.ks
@@ -32,6 +32,8 @@ dnf-yum
 # users setup. This can actually take a bit of time.  Just fold it
 # in to the base box disk image
 rsync
+# Add in sshfs for vagrant-sshfs plugin
+fuse-sshfs
 %end

 %post --erroronfail
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -15,9 +15,9 @@
 # For a TDL file, I store one here:
 # https://pagure.io/fedora-atomic/raw/master/f/fedora-atomic-rawhide.tdl
 # (Koji generates one internally...what we really want is Koji to publish it statically)
-# 
+#
 # Once you have imagefactory and imagefactory-plugins installed, run:
-# 
+#
 #   curl -O https://pagure.io/fedora-atomic/raw/master/f/fedora-atomic-rawhide.tdl
 #   tempfile=$(mktemp --suffix=.ks)
 #   ksflatten -v F22 -c fedora-cloud-base.ks > ${tempfile}
@@ -35,7 +35,8 @@ rootpw --lock --iscrypted locked

 firewall --disabled

-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
+# We pass net.ifnames=0 because we always want to use eth0 here on all the cloud images.
+bootloader --timeout=1 --append="no_timer_check net.ifnames=0 console=tty1 console=ttyS0,115200n8"

 network --bootproto=dhcp --device=link --activate --onboot=on
 services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
@@ -74,7 +75,6 @@ which
 # 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
 # Now that BZ#1199868 is fixed kbd really gets removed but it breaks
 # systemd-vconsole-setup.service on boot. Comment out for now
@@ -170,11 +170,6 @@ NOZEROCONF=yes
 DEVTIMEOUT=10
 EOF

-# For cloud images, 'eth0' _is_ the predictable device name, since
-# we don't want to be tied to specific virtual (!) hardware
-rm -f /etc/udev/rules.d/70*
-ln -s /dev/null /etc/udev/rules.d/80-net-setup-link.rules
-
 # simple eth0 config, again not hard-coded to the build hardware
 cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF
 DEVICE="eth0"
@@ -245,8 +240,12 @@ 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
+# When we build the image with oz, dracut is used
+# and sets up a ifcfg-en<whatever> for the device. We don't
+# want to use this, we use eth0 so it is always the same.
+# So we remove all these ifcfg-en<whatever> devices so
+# The 'network' service can come up cleanly.
+rm -f /etc/sysconfig/network-scripts/ifcfg-en*

 # Enable network service here, as doing it in the services line
 # fails due to RHBZ #1369794
--- a/fedora-disk-base.ks
+++ b/fedora-disk-base.ks
@@ -14,7 +14,7 @@ timezone US/Eastern
 auth --useshadow --passalgo=sha512
 selinux --enforcing
 firewall --enabled --service=mdns
-services --enabled=sshd,NetworkManager,chronyd
+services --enabled=sshd,NetworkManager,chronyd,zram-swap
 network --bootproto=dhcp --device=link --activate
 rootpw --lock --iscrypted locked
 shutdown
@@ -33,6 +33,7 @@ firstboot --reconfig
@core
@standard
@hardware-support
+zram

 kernel
 # remove this in %post
@@ -45,11 +46,10 @@ rng-tools
 chrony
 bcm283x-firmware
 initial-setup
+# Intel wireless firmware assumed never of use for disk images
 -iwl*
 -ipw*
-trousers-lib
 -usb_modeswitch
-iproute-tc
 -generic-release*

 # make sure all the locales are available for inital0-setup and anaconda to work
@@ -60,8 +60,6 @@ glibc-all-langpacks
 %post

 # Setup Raspberry Pi firmware
-cp -Pr /usr/share/bcm283x-firmware/* /boot/efi/
-mv -f /boot/efi/config-64.txt /boot/efi/config.txt
 cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin

 releasever=$(rpm -q --qf '%{version}\n' fedora-release)
--- a/fedora-disk-minimal.ks
+++ b/fedora-disk-minimal.ks
@@ -1,9 +1,9 @@
 %include fedora-disk-base.ks
 %include fedora-minimal-common.ks

-services --enabled=sshd,NetworkManager,chronyd,initial-setup
+services --enabled=sshd,NetworkManager,chronyd,initial-setup,zram-swap

-autopart --type=plain
+autopart --type=plain --noswap

 %packages
 -xkeyboard-config
--- a/fedora-disk-server.ks
+++ b/fedora-disk-server.ks
@@ -1,14 +1,17 @@
 %include fedora-disk-base.ks

-services --enabled=sshd,NetworkManager,chronyd,initial-setup
+services --enabled=sshd,NetworkManager,chronyd,initial-setup,zram-swap

-autopart
+autopart --noswap

 %packages
-# install the default groups for the server evironment since installing the environment is not working
+# install the default groups for the server environment since installing the environment is not working
@server-product
@standard
@headless-management
+@hardware-support
+@networkmanager-submodules
+
@container-management
@domain-client
 -initial-setup-gui
--- a/fedora-disk-workstation.ks
+++ b/fedora-disk-workstation.ks
@@ -4,9 +4,9 @@

 bootloader --append="cma=256MB"

-services --enabled=sshd,NetworkManager,chronyd
+services --enabled=sshd,NetworkManager,chronyd,zram-swap

-autopart --type=plain
+autopart --type=plain --noswap

 %packages
 -initial-setup
--- a/fedora-docker-base.ks
+++ b/fedora-docker-base.ks
@@ -5,12 +5,14 @@

 %packages --excludedocs --instLangs=en --nocore
 rootfiles
+# https://communityblog.fedoraproject.org/modularity-dead-long-live-modularity/
+fedora-repos-modular
 tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920
 vim-minimal
 dnf
 dnf-yum  # https://fedorahosted.org/fesco/ticket/1312#comment:29
 sssd-client
-
+sudo
 %end

 %post --erroronfail --log=/root/anaconda-post.log
@@ -21,6 +23,9 @@ rm -rf /tmp/*
 # https://pagure.io/atomic-wg/issue/308
 printf "tsflags=nodocs\n" >>/etc/dnf/dnf.conf

+# https://bugzilla.redhat.com/show_bug.cgi?id=1576993
+systemctl disable dnf-makecache.timer
+
 #Mask mount units and getty service so that we don't get login prompt
 systemctl mask systemd-remount-fs.service dev-hugepages.mount sys-fs-fuse-connections.mount systemd-logind.service getty.target console-getty.service

--- a/fedora-docker-common.ks
+++ b/fedora-docker-common.ks
@@ -30,9 +30,9 @@ clearpart --all
 autopart --noboot --nohome --noswap --nolvm

 %packages --excludedocs --instLangs=en --nocore
-fedora-release
+fedora-release-container
 bash
-coreutils-single
+coreutils
 glibc-minimal-langpack
 libcrypt
 rpm
@@ -49,6 +49,7 @@ util-linux
 -shared-mime-info
 -trousers
 -xkeyboard-config
+-grubby

 %end

@@ -62,7 +63,7 @@ echo "%_install_langs $LANG" > /etc/rpm/macros.image-language-conf

 # https://bugzilla.redhat.com/show_bug.cgi?id=1400682
 echo "Import RPM GPG key"
-releasever=$(rpm -q --qf '%{version}\n' fedora-release)
+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
--- a/fedora-iot.ks
+++ b/fedora-iot.ks
@@ -0,0 +1,117 @@
+# This is the kickstart for Fedora IoT disk images.
+
+text # don't use cmdline -- https://github.com/rhinstaller/anaconda/issues/931
+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
+services --enabled=NetworkManager,sshd,rngd,initial-setup,zram-swap
+
+# tell Initial Setup to run in the reconfig mode
+firstboot --reconfig --enable
+
+zerombr
+clearpart --all --initlabel --disklabel=msdos
+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
+
+reboot
+
+%post --erroronfail
+# Find the architecture we are on
+arch=$(uname -m)
+
+# Setup Raspberry Pi firmware
+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/fw/rpi2-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"
+
+# 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"
+
+# Remove the old ref so that the commit eventually gets cleaned up.
+ostree refs "fedora-iot:fedora/stable/${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/RPM-GPG-KEY-fedora-iot-2019 --set=contenturl=mirrorlist=https://ostree.fedoraproject.org/iot/mirrorlist  fedora-iot 'https://ostree.fedoraproject.org/iot'
+
+# 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
+# https://bugzilla.redhat.com/show_bug.cgi?id=964299
+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
+cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF
+DEVICE="eth0"
+BOOTPROTO="dhcp"
+ONBOOT="yes"
+TYPE="Ethernet"
+PERSISTENT_DHCLIENT="yes"
+EOF
+
+echo "Removing random-seed so it's not the same in every image."
+rm -f /var/lib/systemd/random-seed
+
+echo "Packages within this iot image:"
+echo "-----------------------------------------------------------------------"
+rpm -qa
+echo "-----------------------------------------------------------------------"
+# Note that running rpm recreates the rpm db files which aren't needed/wanted
+rm -f /var/lib/rpm/__db*
+
+echo "Zeroing out empty space."
+# This forces the filesystem to reclaim space from deleted files
+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://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:
+# https://bugs.launchpad.net/cloud-init/+bug/1670052
+truncate -s 0 /etc/resolv.conf
+
+%end
--- a/fedora-kde-common.ks
+++ b/fedora-kde-common.ks
@@ -5,13 +5,12 @@
@kde-desktop
@kde-media
@kde-office
-@kde-telepathy
@networkmanager-submodules

 ### The KDE-Desktop

 ### Browser
-qupzilla
+falkon

 ### fixes

@@ -45,16 +44,6 @@ mediawriter

 ### space issues

-# fonts (we make no bones about admitting we're english-only)
-wqy-microhei-fonts			# a compact CJK font, to replace:
-naver-nanum-gothic-fonts		# Korean
-vlgothic-fonts				# Japanese
-adobe-source-han-sans-cn-fonts		# simplified Chinese
-adobe-source-han-sans-tw-fonts 	# traditional Chinese
-
-paratype-pt-sans-fonts	# Cyrillic (already supported by DejaVu), huge
-#-stix-fonts		# mathematical symbols
-
 # admin-tools
 -gnome-disk-utility
 # kcm_clock still lacks some features, so keep system-config-date around
--- a/fedora-kde-minimization.ks
+++ b/fedora-kde-minimization.ks
@@ -2,8 +2,6 @@
 %packages
 -@input-methods
 -scim*
-m17n*
-ibus*
 -iok
 %end

--- a/fedora-live-astronomy_kde.ks
+++ b/fedora-live-astronomy_kde.ks
@@ -14,7 +14,8 @@
 # Maintainer: Christian Dersch <lupinix@fedoraproject.org>
 #             https://fedoraproject.org/wiki/User:Lupinix

-%include fedora-live-kde.ks
+%include fedora-live-kde-base.ks
+%include fedora-live-minimization.ks

 # The recommended part size for DVDs is too close to use for the astronomy spin
 part / --size 14500
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -49,6 +49,7 @@ memtest86+

 # The point of a live image is to install
 anaconda
+anaconda-install-env-deps
@anaconda-tools

 # Need aajohan-comfortaa-fonts for the SVG rnotes images
@@ -94,11 +95,10 @@ livedir="LiveOS"
 for arg in \`cat /proc/cmdline\` ; do
  if [ "\${arg##rd.live.dir=}" != "\${arg}" ]; then
    livedir=\${arg##rd.live.dir=}
-    return
+    continue
  fi
  if [ "\${arg##live_dir=}" != "\${arg}" ]; then
    livedir=\${arg##live_dir=}
-    return
  fi
 done

@@ -153,7 +153,6 @@ findPersistentHome() {
  for arg in \`cat /proc/cmdline\` ; do
    if [ "\${arg##persistenthome=}" != "\${arg}" ]; then
      homedev=\${arg##persistenthome=}
-      return
    fi
  done
 }
@@ -206,6 +205,10 @@ systemctl --no-reload disable atd.service 2> /dev/null || :
 systemctl stop crond.service 2> /dev/null || :
 systemctl stop atd.service 2> /dev/null || :

+# turn off abrtd on a live image
+systemctl --no-reload disable abrtd.service 2> /dev/null || :
+systemctl stop abrtd.service 2> /dev/null || :
+
 # Don't sync the system clock when running live (RHBZ #1018162)
 sed -i 's/rtcsync//' /etc/chrony.conf

@@ -339,8 +342,19 @@ cp $INSTALL_ROOT/usr/share/licenses/*-release/* $LIVE_ROOT/

 # only works on x86, x86_64
 if [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ]; then
-  if [ ! -d $LIVE_ROOT/LiveOS ]; then mkdir -p $LIVE_ROOT/LiveOS ; fi
-  cp /usr/bin/livecd-iso-to-disk $LIVE_ROOT/LiveOS
+    # For livecd-creator builds
+    if [ ! -d $LIVE_ROOT/LiveOS ]; then mkdir -p $LIVE_ROOT/LiveOS ; fi
+    cp /usr/bin/livecd-iso-to-disk $LIVE_ROOT/LiveOS
+
+    # For lorax/livemedia-creator builds
+    sed -i '
+    /## make boot.iso/ i\
+    # Add livecd-iso-to-disk script to .iso filesystem at /LiveOS/\
+    <% f = "usr/bin/livecd-iso-to-disk" %>\
+    %if exists(f):\
+        install ${f} ${LIVEDIR}/${f|basename}\
+    %endif\
+    ' /usr/share/lorax/templates.d/99-generic/live/x86.tmpl
 fi

 %end
--- a/fedora-live-cinnamon.ks
+++ b/fedora-live-cinnamon.ks
@@ -7,7 +7,6 @@
 # - Dan Book <grinnz@grinnz.com>

 %include fedora-live-base.ks
-%include fedora-live-minimization.ks
 %include fedora-cinnamon-common.ks

 part / --size=6144
--- a/fedora-live-design_suite.ks
+++ b/fedora-live-design_suite.ks
@@ -31,16 +31,19 @@ gnome-todo
 powerline
 powerline-fonts

-
 # Extra wallpapers
-f26-backgrounds-extras-base
-f26-backgrounds-extras-gnome
+f28-backgrounds-extras-base
+f28-backgrounds-extras-gnome

 # removal of unneeded applications
 -gnome-boxes
 -eog
 -rdesktop

+# temporarily removing conflicting application
+-LuxRender-blender
+-mypaint
+
 %end

 %post
--- a/fedora-live-jam_kde.ks
+++ b/fedora-live-jam_kde.ks
@@ -77,7 +77,7 @@ sooperlooper

 #recodring and DAW
 audacity
-ardour4
+ardour5
 rosegarden4
 seq24
 muse
--- a/fedora-live-kde.ks
+++ b/fedora-live-kde.ks
@@ -12,7 +12,7 @@
 %include fedora-kde-minimization.ks

 # DVD payload
-part / --size=6144
+part / --size=6500

 %post
 %end
--- a/fedora-live-minimization.ks
+++ b/fedora-live-minimization.ks
@@ -5,14 +5,8 @@

 # save some space
 -mpage
-sox
 -hplip
-numactl
 -isdn4k-utils
-autofs
-# smartcards won't really work on the livecd.
-coolkey
-wget

 # scanning takes quite a bit of space :/
 -xsane
--- a/fedora-live-python-classroom.ks
+++ b/fedora-live-python-classroom.ks
@@ -5,5 +5,4 @@
 # The Workstion based Python Classroom Lab

 %include fedora-live-workstation.ks
-%include fedora-live-minimization.ks
 %include fedora-python-classroom-gnome-common.ks
--- a/fedora-live-robotics.ks
+++ b/fedora-live-robotics.ks
@@ -47,7 +47,6 @@ firefox

 # Dictionaries are big
 -aspell-*
-hunspell-*
 -man-pages*
 -words

--- a/fedora-live-scientific_kde.ks
+++ b/fedora-live-scientific_kde.ks
@@ -10,168 +10,11 @@

 %include fedora-live-kde-base.ks
 %include fedora-live-minimization.ks
+%include fedora-scientific-common.ks

 # The recommended part size for DVDs is too close to use for the scientific spin
 part / --size 14500

-%packages
-
-# Installing the default/mandatory packages from engineering & scientific
-@engineering-and-scientific
-
-# scilab
-scilab
-scilab-devel
-scilab-doc
-
-# Remove sagemath explicitly?
-sagemath
-
-#Devel tools
-
-#Install the mandatory packages from dev-tools and dev-libs
-# C/C++ compiler, gdb, autotools, bison, flex, make, strace..
-@development-tools
-@development-libs
-@c-development
-@rpm-development-tools
-#others, not included
-# C++ libraries
-blitz-devel
-armadillo-devel
-
-# Misc. related utils
-ddd
-valgrind
-
-#python 2 tools/libraries not included from the groups
-python2-tools
-python-ipython
-python-ipython-console
-python-ipython-notebook
-sympy
-python-networkx
-python-pandas
-
-#python 3 and tools/libraries not included from the groups
-python3
-python3-tools
-python3-matplotlib
-python3-scipy
-python3-numpy
-python3-ipython
-python3-ipython-console
-python3-ipython-notebook
-python3-sympy
-python3-networkx
-python3-pandas
-
-# matplotlib backends
-python-matplotlib-qt4
-python-matplotlib-tk
-python3-matplotlib-qt4
-python3-matplotlib-tk
-
-# Include Java development tools
-@java-development
-apache-commons-math
-
-#fortran compiler
-gcc-gfortran
-
-# GUI for R
-rkward
-
-# GUI for Octave
-qtoctave
-
-# julia
-julia
-julia-doc
-
-# IDEs for the IDE folks
-@eclipse
-spyder
-
-#writing & publishing
-emacs
-emacs-color-theme
-vim
-scribus
-#scite
-lyx
-kile
-
-#Presentation, Bibliography & Document arrangement 
-#tools
-BibTool
-pdfshuffler
-
-# Parallel/Distributed computing libraries/tools
-openmpi
-openmpi-devel
-valgrind-openmpi
-libgomp
-python-pp
-mpi4py-openmpi
-python3-mpi4py-openmpi
-
-#Version control- a GUI for each as well
-
-# Installing rapidsvn will also install subversion package
-rapidsvn 
-git
-git-gui
-# Mercurial
-mercurial
-mercurial-hgk
-
-#Backup Utilities
-backintime-kde
-
-#needs to install this specifically because of some conflict between openmpi
-#and emacs (http://lists.fedoraproject.org/pipermail/devel/2011-July/153812.html)
-libotf
-
-#root
-root
-root-gui-fitpanel
-root-python
-
-#Multiple jobs/clustering system
-# torque
-# torque-server
-# torque-scheduler
-# torque-gui
-# torque-libs
-# torque-mom
-# python-pbs
-
-#Drawing, Picture viewing tools, Visualization tools
-dia
-inkscape
-xzgv
-gimp
-ggobi
-ggobi-devel
-#g3data
-#Mayavi
-
-#Misc. Utils
-screen
-tmux
-rlwrap
-hexchat
-shutter
-fig2ps
-bibtex2html
-hevea
-
-#Include Mozilla Firefox
-firefox
-
-%end
-
 %post

 %end
--- a/fedora-live-security.ks
+++ b/fedora-live-security.ks
@@ -36,7 +36,6 @@ gnome-keyring-pam
 -acpid
 -gimp-help
 -desktop-backgrounds-basic
-realmd                     # only seems to be used in GNOME
 -PackageKit*                # we switched to dnfdragora, so we don't need this
 -aspell-*                   # dictionaries are big
 -gnumeric
--- a/fedora-live-soas.ks
+++ b/fedora-live-soas.ks
@@ -5,8 +5,6 @@
 #
 # Maintainers:
 # - Peter Robinson <pbrobinson AT gmail DOT com>
-# - Sebastian Dziallas <sdz AT fedoraproject DOT org>
-# - Mel Chua <mchua AT fedoraproject DOT org>

 %include fedora-live-base.ks
 %include fedora-live-minimization.ks
--- a/fedora-live-workstation.ks
+++ b/fedora-live-workstation.ks
@@ -17,12 +17,20 @@ part / --size 6656
 cat >> /etc/rc.d/init.d/livesys << EOF


-# disable updates plugin
+# disable gnome-software automatically downloading updates
 cat >> /usr/share/glib-2.0/schemas/org.gnome.software.gschema.override << FOE
 [org.gnome.software]
 download-updates=false
 FOE

+# don't autostart gnome-software session service
+rm -f /etc/xdg/autostart/gnome-software-service.desktop
+
+# disable the gnome-software shell search provider
+cat >> /usr/share/gnome-shell/search-providers/org.gnome.Software-search-provider.ini << FOE
+DefaultDisabled=true
+FOE
+
 # don't run gnome-initial-setup
 mkdir ~liveuser/.config
 touch ~liveuser/.config/gnome-initial-setup-done
--- a/fedora-live-xfce.ks
+++ b/fedora-live-xfce.ks
@@ -60,6 +60,9 @@ sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.d
 mkdir /home/liveuser/Desktop
 cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop

+# no updater applet in live environment
+rm -f /etc/xdg/autostart/org.mageia.dnfdragora-updater.desktop
+
 # and mark it as executable (new Xfce security feature)
 chmod +x /home/liveuser/Desktop/liveinst.desktop

--- a/fedora-lxqt-common.ks
+++ b/fedora-lxqt-common.ks
@@ -5,6 +5,7 @@
 #
 # Maintainer(s):
 # – Christian Dersch <lupinix@fedoraproject.org>
+# – Zamir SUN <zsun@fedoraproject.org>
 #

 %packages
@@ -26,6 +27,9 @@ pavucontrol-qt-l10n
 # MP3
 gstreamer1-plugin-mpg123

+# Editor
+enki
+
 # remove unneeded stuff to get a lightweight system
 # fonts (we make no bones about admitting we're english-only)
 wqy-microhei-fonts          # a compact CJK font, to replace:
@@ -41,7 +45,8 @@ wqy-microhei-fonts          # a compact CJK font, to replace:
 -@input-methods
 -scim*
 -m17n*
-ibus*
+# Temporary include ibus to workaround RHBZ 1633225
+# -ibus*
 -iok

 # Fix https://bugzilla.redhat.com/show_bug.cgi?id=1429132
--- a/fedora-mate-common.ks
+++ b/fedora-mate-common.ks
@@ -1,6 +1,4 @@
 %packages
-PackageKit*                # we switched to dnfdragora, so we don't need this
-firefox
@mate
 compiz
 compiz-plugins-main
@@ -16,22 +14,11 @@ emerald-themes
 emerald
 fusion-icon
@networkmanager-submodules
-blueberry

 # some apps from mate-applications
 caja-actions
 mate-disk-usage-analyzer

-# system tools
-system-config-printer
-system-config-printer-applet
-lightdm-gtk-greeter-settings
-
-# audio video
-parole
-exaile
-gstreamer1-plugins-ugly-free # mp3 support
-
 # blacklist applications which breaks mate-desktop
 -audacious

@@ -41,10 +28,6 @@ gstreamer1-plugins-ugly-free # mp3 support
 # dsl tools
 rp-pppoe

-# some tools
-p7zip
-p7zip-plugins
-
 # FIXME; apparently the glibc maintainers dislike this, but it got put into the
 # desktop image at some point.  We won't touch this one for now.
 nss-mdns
@@ -52,7 +35,6 @@ nss-mdns
 # Drop things for size
 -@3d-printing
 -brasero
-colord
 -fedora-icon-theme
 -gnome-icon-theme
 -gnome-icon-theme-symbolic
--- a/fedora-minimal-common.ks
+++ b/fedora-minimal-common.ks
@@ -3,6 +3,10 @@
 -initial-setup-gui
 -generic-release*
 -glibc-all-langpacks
+# recommended by iproute, we don't want it in minimal
+-iproute-tc
+# recommended by gnutls, we don't want it in minimal
+-trousers
 glibc-langpack-en
 iw
 NetworkManager-wifi
--- a/fedora-modular-disk-minimal.ks
+++ b/fedora-modular-disk-minimal.ks
@@ -56,8 +56,6 @@ dhcp-client
 %post

 # Setup Raspberry Pi firmware
-#cp -Pr /usr/share/bcm283x-firmware/* /boot/efi/
-mv -f /boot/efi/config-64.txt /boot/efi/config.txt
 cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin

 releasever=$(rpm -q --qf '%{version}\n' fedora-modular-release)
--- a/fedora-python-classroom-gnome-common.ks
+++ b/fedora-python-classroom-gnome-common.ks
@@ -18,7 +18,6 @@ python3-pillow-tk
 -@sound-and-video
 -@multimedia
 -dleyna*
-evolution*
 -gnome-boxes
 -gnome-calendar
 -gnome-clocks
@@ -27,6 +26,7 @@ python3-pillow-tk
 -gnome-documents
 -gnome-font-viewer
 -gnome-maps
+-gnome-photos
 -gnome-weather
 -grilo-plugins
 -cheese
@@ -35,7 +35,6 @@ python3-pillow-tk

 # This is no longer workstation
 -@workstation-product
-fedora-productimg-workstation

 # Add a web browser
@firefox
@@ -56,11 +55,11 @@ python3-pillow-tk

 # Dictionaries are big
 -aspell-*
-hunspell-*
 -words

 # Help and art can be big, too
 -gnome-user-docs
+-gnome-getting-started-docs
 -desktop-backgrounds-basic
 -*backgrounds-extras

--- a/fedora-repo.ks
+++ b/fedora-repo.ks
@@ -3,7 +3,7 @@
 # Exactly one of the following should be uncommented

 # For the master branch the following should be uncommented
-%include fedora-repo-rawhide.ks
+#%include fedora-repo-rawhide.ks

 # For non-master branches the following should be uncommented
-# %include fedora-repo-not-rawhide.ks
+%include fedora-repo-not-rawhide.ks
--- a/fedora-scientific-common.ks
+++ b/fedora-scientific-common.ks
@@ -0,0 +1,160 @@
+%packages
+
+# Installing the default/mandatory packages from engineering & scientific
+@engineering-and-scientific
+
+# scilab
+scilab
+scilab-devel
+scilab-doc
+
+# Remove sagemath explicitly?
+-sagemath
+
+#Devel tools
+
+#Install the mandatory packages from dev-tools and dev-libs
+# C/C++ compiler, gdb, autotools, bison, flex, make, strace..
+@development-tools
+@development-libs
+@c-development
+@rpm-development-tools
+#others, not included
+# C++ libraries
+blitz-devel
+armadillo-devel
+
+# Misc. related utils
+ddd
+valgrind
+
+#python 2 tools/libraries not included from the groups
+python2-tools
+python-ipython
+python-ipython-console
+python-ipython-notebook
+sympy
+python-networkx
+python-pandas
+
+#python 3 and tools/libraries not included from the groups
+python3
+python3-tools
+python3-matplotlib
+python3-scipy
+python3-numpy
+python3-ipython
+python3-ipython-console
+python3-ipython-notebook
+python3-sympy
+python3-networkx
+python3-pandas
+
+# matplotlib backends
+python-matplotlib-qt4
+python-matplotlib-tk
+python3-matplotlib-qt4
+python3-matplotlib-tk
+
+# Include Java development tools
+@java-development
+apache-commons-math
+
+#fortran compiler
+gcc-gfortran
+
+# GUI for R
+rkward
+
+# GUI for Octave
+qtoctave
+
+# julia
+# Comment out till https://koji.fedoraproject.org/koji/buildinfo?buildID=1135023 is fixed
+# julia
+# julia-doc
+
+# IDEs for the IDE folks
+@eclipse
+# Workaround for: https://pagure.io/releng/issue/7814
+-eclipse-linuxtools-vagrant
+spyder
+
+#writing & publishing
+emacs
+emacs-color-theme
+vim
+scribus
+#scite
+lyx
+kile
+
+#Presentation, Bibliography & Document arrangement 
+#tools
+BibTool
+pdfshuffler
+
+# Parallel/Distributed computing libraries/tools
+openmpi
+openmpi-devel
+valgrind-openmpi
+libgomp
+python-pp
+mpi4py-openmpi
+python3-mpi4py-openmpi
+
+#Version control- a GUI for each as well
+
+# Installing rapidsvn will also install subversion package
+rapidsvn 
+git
+git-gui
+# Mercurial
+mercurial
+mercurial-hgk
+
+#Backup Utilities
+backintime-kde
+
+#needs to install this specifically because of some conflict between openmpi
+#and emacs (http://lists.fedoraproject.org/pipermail/devel/2011-July/153812.html)
+libotf
+
+#root
+root
+root-gui-fitpanel
+root-python
+
+#Multiple jobs/clustering system
+# torque
+# torque-server
+# torque-scheduler
+# torque-gui
+# torque-libs
+# torque-mom
+# python-pbs
+
+#Drawing, Picture viewing tools, Visualization tools
+dia
+inkscape
+xzgv
+gimp
+ggobi
+ggobi-devel
+#g3data
+#Mayavi
+
+#Misc. Utils
+screen
+tmux
+rlwrap
+hexchat
+shutter
+fig2ps
+bibtex2html
+hevea
+
+#Include Mozilla Firefox
+firefox
+
+%end
--- a/fedora-scientific-vagrant.ks
+++ b/fedora-scientific-vagrant.ks
@@ -0,0 +1,12 @@
+# Fedora Scientific  Vagrant box
+
+# Fedora Scientific: For researchers in Science and Engineering
+# Fedora-Scientific aims to create a Fedora which has the generic
+# toolset for the researcher
+# Web: https://labs.fedoraproject.org/en/scientific/
+
+# Maintainer: Amit Saha <amitksaha@fedoraproject.org>
+#             https://fedoraproject.org/wiki/User:Amitksaha
+
+%include fedora-cloud-base-vagrant.ks
+%include fedora-scientific-common.ks
--- a/fedora-soas-common.ks
+++ b/fedora-soas-common.ks
@@ -76,6 +76,10 @@ pulseaudio-utils
 # http://bugs.sugarlabs.org/ticket/1951
 rp-pppoe

+# Useful for SoaS duplication from:
+# http://bugs.sugarlabs.org/ticket/74
+livecd-tools
+
 # Get the Sugar boot screen
 -plymouth-system-theme
 -plymouth-theme-charge
@@ -88,7 +92,7 @@ sugar-logos
 # Rebuild initrd for Sugar boot screen
 KERNEL_VERSION=$(rpm -q kernel --qf '%{version}-%{release}.%{arch}\n')
 /usr/sbin/plymouth-set-default-theme sugar
-/sbin/dracut -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION
+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*
@@ -159,6 +163,6 @@ show-logout=false
 [org.sugarlabs.power]
 automatic=true
 EOF
-/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas/sugar.soas.gschema.override
+/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas

 %end
--- a/fedora-workstation-common.ks
+++ b/fedora-workstation-common.ks
@@ -20,9 +20,6 @@
@printing
@workstation-product

-# Branding for the installer
-fedora-productimg-workstation
-
 # Exclude unwanted packages from @anaconda-tools group
 -gfs2-utils
 -reiserfs-utils
--- a/l10n/fedora-live-workstation-ja_JP.ks
+++ b/l10n/fedora-live-workstation-ja_JP.ks
@@ -0,0 +1,40 @@
+# fedora-live-workstation-ja_JP.ks
+#
+# Description:
+# - Japanese Fedora Live Spin with the Gnome Desktop Environment
+#
+# Maintainer(s):
+# - Shintaro Fujiwara <shintaro.fujiwara@miraclelinux.com>
+
+%include ../fedora-live-workstation.ks
+
+lang ja_JP.UTF-8
+keyboard jp
+timezone Asia/Tokyo
+
+%packages
+@japanese-support
+# exclude input methods except ibus:
+-m17n*
+-scim*
+-iok
+# ibus stuff
+ibus-kkc
+imsettings
+%end
+
+%post
+cat > /etc/X11/xorg.conf.d/00-keyboard.conf << "EOF"
+# Read and parsed by systemd-localed. It's probably wise not to edit this file
+# manually too freely.
+Section "InputClass"
+        Identifier "system-keyboard"
+        MatchIsKeyboard "on"
+        Option "XkbLayout" "jp"
+        Option "XkbModel" "jp106"
+EndSection
+EOF
+
+gsettings set org.gnome.desktop.input-sources sources "[('ibus', 'kkc'), ('xkb', 'jp')]"
+
+%end
--- a/l10n/fedora-livecd-kde-ja_JP.ks
+++ b/l10n/fedora-livecd-kde-ja_JP.ks
@@ -0,0 +1,40 @@
+# fedora-livecd-kde-ja_JP.ks
+#
+# Description:
+# - Japanese Fedora Live Spin with the KDE Desktop Environment
+#
+# Maintainer(s):
+# - Shintaro Fujiwara <shintaro.fujiwara@miraclelinux.com>
+
+%include ../fedora-live-kde.ks
+
+lang ja_JP.UTF-8
+keyboard jp
+timezone Asia/Tokyo
+
+%packages
+@japanese-support
+# exclude input methods except ibus:
+-m17n*
+-scim*
+-iok
+# ibus-stuff 
+fcitx-qt5
+ibus-kkc
+ibus-mozc
+ibus-qt
+kcm-fcitx
+%end
+
+%post
+cat > /etc/X11/xorg.conf.d/00-keyboard.conf << "EOF"
+# Read and parsed by systemd-localed. It's probably wise not to edit this file
+# manually too freely.
+Section "InputClass"
+        Identifier "system-keyboard"
+        MatchIsKeyboard "on"
+        Option "XkbLayout" "jp"
+        Option "XkbModel" "jp106"
+EndSection
+EOF
+%end
--- a/l10n/fedora-livecd-lxde-ja_JP.ks
+++ b/l10n/fedora-livecd-lxde-ja_JP.ks
@@ -14,10 +14,9 @@ timezone Asia/Tokyo

 %packages
@japanese-support
-# exclude input methods:
+# exclude input methods except ibus:
 -m17n*
 -scim*
-ibus*
 -iok
 # Better more popular browser
 firefox