Fix default partitioning on IoT images post SBSA fix in blivet

Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>

fedora-arm-base.ks

@@ -6,7 +6,7 @@ firewall --enabled --service=mdns,ssh
 
 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 / --size=2800 --fstype ext4 --asprimary
 
@@ -51,10 +51,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/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
-sed -i '/vfat/ d' /etc/fstab
 
 # work around for poor key import UI in PackageKit
 rm -f /var/lib/rpm/__db*

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

fedora-atomic.ks

@@ -68,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-29-primary fedora-atomic 'https://kojipkgs.fedoraproject.org/atomic/repo/'
+ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-30-primary fedora-atomic 'https://kojipkgs.fedoraproject.org/atomic/repo/'
 
 # older versions of livecd-tools do not follow "rootpw --lock" line above
 # https://bugzilla.redhat.com/show_bug.cgi?id=964299

fedora-cinnamon-common.ks

@@ -11,8 +11,9 @@
 @networkmanager-submodules
 @cinnamon-desktop
 @libreoffice
+parole
 
 # extra backgrounds
-f28-backgrounds-extras-gnome
+f29-backgrounds-extras-gnome
 
 %end

fedora-disk-base.ks

@@ -46,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
@@ -61,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)

fedora-iot.ks

@@ -19,7 +19,7 @@ services --enabled=NetworkManager,sshd,rngd,initial-setup,zram-swap
 firstboot --reconfig --enable
 
 zerombr
-clearpart --all
+clearpart --all --initlabel --disklabel=msdos
 autopart --nohome --noswap --type=plain
 
 # Equivalent of %include fedora-repo.ks
@@ -34,9 +34,7 @@ arch=$(uname -m)
 
 # Setup Raspberry Pi firmware
 if [[ $arch == "aarch64" ]] || [[ $arch == "armv7l" ]]; then
-cp -Pr /usr/share/bcm283x-firmware/* /boot/efi/
 if [[ $arch == "aarch64" ]]; then
-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
 else
 cp -P /usr/share/uboot/rpi_2/u-boot.bin /boot/fw/rpi2-u-boot.bin

fedora-live-base.ks

@@ -95,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
 
@@ -154,7 +153,6 @@ findPersistentHome() {
   for arg in \`cat /proc/cmdline\` ; do
     if [ "\${arg##persistenthome=}" != "\${arg}" ]; then
       homedev=\${arg##persistenthome=}
-      return
     fi
   done
 }

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

fedora-live-design_suite.ks

@@ -32,8 +32,8 @@ powerline
 powerline-fonts
 
 # Extra wallpapers
-# f26-backgrounds-extras-base
+f28-backgrounds-extras-base
-# f26-backgrounds-extras-gnome
+f28-backgrounds-extras-gnome
 
 # removal of unneeded applications
 -gnome-boxes

fedora-live-minimization.ks

@@ -5,11 +5,8 @@
 
 # save some space
 -mpage
--sox
 -hplip
--numactl
 -isdn4k-utils
--autofs
 
 # scanning takes quite a bit of space :/
 -xsane

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

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
 
+# Text 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

fedora-mate-common.ks

@@ -35,7 +35,6 @@ nss-mdns
 # Drop things for size
 -@3d-printing
 -brasero
--colord
 -fedora-icon-theme
 -gnome-icon-theme
 -gnome-icon-theme-symbolic

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

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)

fedora-scientific-common.ks

@@ -70,11 +70,16 @@ rkward
 qtoctave
 
 # julia
-julia
+# Comment out till build failure is sorted
-julia-doc
+# julia
+# julia-doc
 
 # IDEs for the IDE folks
 @eclipse
+
+# Workaround for https://pagure.io/releng/issue/7814
+-eclipse-linuxtools-vagrant
+
 spyder
 
 #writing & publishing

fedora-soas-common.ks

@@ -92,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*
@@ -163,6 +163,16 @@ 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
+
+# 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
 
 %end

fedora-xfce-common.ks

@@ -38,6 +38,5 @@ system-config-printer
 -desktop-backgrounds-basic
 -aspell-*                   # dictionaries are big
 -xfce4-sensors-plugin
--foomatic-db-ppds
 
 %end

l10n/fedora-livedvd-games-ja_JP.ks

@@ -0,0 +1,40 @@
+# fedora-livedvd-games-ja_JP.ks
+#
+# Description:
+# - Japanese Fedora Live Spin with the game Desktop Environment
+# 
+# Maintainer(s):
+# - Mika Tsukada  <mika.tsukada@miraclelinux.com>
+
+%include ../fedora-live-games.ks
+
+lang ja_JP.UTF-8
+keyboard ja
+timezone Asia/Tokyo
+
+%packages
+@japanese-support
+# exclude input methods except ibus:
+-m17n*
+-scim*
+-iok
+glibc-langpack-ja
+# ibus-stuff
+ibus-kkc
+ibus-mozc
+%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
+
+