Fix default partitioning on IoT images post SBSA fix in blivet

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

fedora-arm-base.ks

@@ -39,6 +39,7 @@ initial-setup-gui
 -iwl*
 -ipw*
 -usb_modeswitch
+-iproute-tc
 #lets resize / on first boot
 # dracut-modules-growroot
 

fedora-atomic-testing-base.ks

@@ -1,27 +0,0 @@
-
-# ./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

fedora-atomic-testing.ks

@@ -1,6 +0,0 @@
-
-# ./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

fedora-atomic-updates-base.ks

@@ -1,27 +0,0 @@
-
-# ./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

fedora-atomic-updates.ks

@@ -1,6 +0,0 @@
-
-# ./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

fedora-atomic-vagrant-testing.ks

@@ -1,6 +0,0 @@
-
-# ./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

fedora-atomic-vagrant-updates.ks

@@ -1,6 +0,0 @@
-
-# ./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

fedora-atomic.ks

@@ -58,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/ostree/repo/ --ref=fedora/29/${basearch}/atomic-host
+ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=https://kojipkgs.fedoraproject.org/compose/atomic/repo/ --ref=fedora/rawhide/${basearch}/atomic-host
 
 reboot
 
@@ -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 --set=contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist fedora-atomic 'https://ostree.fedoraproject.org'
+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-docker-base.ks

@@ -12,7 +12,7 @@ vim-minimal
 dnf
 dnf-yum  # https://fedorahosted.org/fesco/ticket/1312#comment:29
 sssd-client
-sudo
+
 %end
 
 %post --erroronfail --log=/root/anaconda-post.log

fedora-docker-common.ks

@@ -30,9 +30,9 @@ clearpart --all
 autopart --noboot --nohome --noswap --nolvm
 
 %packages --excludedocs --instLangs=en --nocore
-fedora-release-container
+fedora-release
 bash
-coreutils
+coreutils-single
 glibc-minimal-langpack
 libcrypt
 rpm
@@ -49,7 +49,6 @@ util-linux
 -shared-mime-info
 -trousers
 -xkeyboard-config
--grubby
 
 %end
 
@@ -63,7 +62,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-container)
+releasever=$(rpm -q --qf '%{version}\n' fedora-release)
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
 
 echo "# fstab intentionally empty for containers" > /etc/fstab

fedora-iot.ks

@@ -10,7 +10,7 @@ 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"
+bootloader --timeout=1 --append="console=tty1 console=ttyS0,115200n8 console=ttyS1,115200n8 console=ttyAMA0,115200n8 net.ifnames=0 modprobe.blacklist=vc4"
 
 network --bootproto=dhcp --device=link --activate --onboot=on
 services --enabled=NetworkManager,sshd,rngd,initial-setup,zram-swap
@@ -24,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/29/${basearch}/iot
 
 reboot
 
@@ -44,22 +44,19 @@ 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://kojipkgs.fedoraproject.org/iot/29/ "fedora/29/${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/29/${arch}/iot" --create "fedora-iot:fedora/29/${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/29/${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
+ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-29-primary fedora-iot 'https://dl.fedoraproject.org/iot/repo/'
 
 # older versions of livecd-tools do not follow "rootpw --lock" line above
 # https://bugzilla.redhat.com/show_bug.cgi?id=964299
@@ -108,6 +105,10 @@ rm -f /etc/sysconfig/network-scripts/ifcfg-ens3
 echo "Adding Developer Mode GRUB2 menu item."
 /usr/libexec/atomic-devmode/bootentry add
 
+# Disable network service here, as doing it in the services line
+# fails due to RHBZ #1369794
+/sbin/chkconfig network off
+
 # 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-live-base.ks

@@ -342,19 +342,8 @@ 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
-    # 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
+  if [ ! -d $LIVE_ROOT/LiveOS ]; then mkdir -p $LIVE_ROOT/LiveOS ; fi
+  cp /usr/bin/livecd-iso-to-disk $LIVE_ROOT/LiveOS
 fi
 
 %end

fedora-live-design_suite.ks

@@ -40,10 +40,6 @@ f28-backgrounds-extras-gnome
 -eog
 -rdesktop
 
-# temporarily removing conflicting application
--LuxRender-blender
--mypaint
-
 %end
 
 %post

fedora-live-python-classroom.ks

@@ -5,4 +5,5 @@
 # The Workstion based Python Classroom Lab
 
 %include fedora-live-workstation.ks
+%include fedora-live-minimization.ks
 %include fedora-python-classroom-gnome-common.ks

fedora-lxqt-common.ks

@@ -27,7 +27,7 @@ pavucontrol-qt-l10n
 # MP3
 gstreamer1-plugin-mpg123
 
-# Editor
+# Text Editor
 enki
 
 # remove unneeded stuff to get a lightweight system

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

fedora-scientific-common.ks

@@ -70,14 +70,16 @@ rkward
 qtoctave
 
 # julia
-# Comment out till https://koji.fedoraproject.org/koji/buildinfo?buildID=1135023 is fixed
+# Comment out till build failure is sorted
 # julia
 # julia-doc
 
 # IDEs for the IDE folks
 @eclipse
-# Workaround for: https://pagure.io/releng/issue/7814
+
+# Workaround for https://pagure.io/releng/issue/7814
 -eclipse-linuxtools-vagrant
+
 spyder
 
 #writing & publishing

fedora-soas-common.ks

@@ -165,4 +165,14 @@ automatic=true
 EOF
 /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

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