Fix default partitioning on IoT images post SBSA fix in blivet

Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>
Update fedora-scientific-common.ks
2025-12-08 16:10:29 +08:00 · 2018-10-11 17:52:26 +01:00 · 2018-09-26 23:38:45 +00:00 · 2018-09-26 23:36:42 +00:00 · 2018-09-26 21:15:16 +08:00 · 2018-09-26 00:14:26 +00:00
19 changed files with 80 additions and 35 deletions
--- a/fedora-arm-base.ks
+++ b/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/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-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-atomic.ks
+++ b/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
--- a/fedora-cinnamon-common.ks
+++ b/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
--- a/fedora-disk-base.ks
+++ b/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)
--- a/fedora-iot.ks
+++ b/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
--- a/fedora-live-base.ks
+++ b/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
 }
--- 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
@@ -32,8 +32,8 @@ 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
--- a/fedora-live-minimization.ks
+++ b/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
--- 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-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

+# 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
--- a/fedora-mate-common.ks
+++ b/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
--- 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-scientific-common.ks
+++ b/fedora-scientific-common.ks
@@ -70,11 +70,16 @@ rkward
 qtoctave

 # julia
-julia
-julia-doc
+# Comment out till build failure is sorted
+# julia
+# julia-doc

 # IDEs for the IDE folks
@eclipse
+
+# Workaround for https://pagure.io/releng/issue/7814
+-eclipse-linuxtools-vagrant
+
 spyder

 #writing & publishing
--- a/fedora-soas-common.ks
+++ b/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
--- a/fedora-xfce-common.ks
+++ b/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
--- a/l10n/fedora-livedvd-games-ja_JP.ks
+++ b/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
+
+
Author	SHA1	Message	Date
Peter Robinson	9e79a58361	Fix default partitioning on IoT images post SBSA fix in blivet Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>	2018-10-11 17:52:26 +01:00
Amit Saha	4665f812c6	Update fedora-scientific-common.ks	2018-09-26 23:38:45 +00:00
Amit Saha	eabc578ca1	Update fedora-scientific-common.ks: Workaround for https://pagure.io/releng/issue/7814 Workaround for https://pagure.io/releng/issue/7814	2018-09-26 23:36:42 +00:00
Zamir SUN	c59f2a3233	LXQt: Temporary include to workaround RHBZ 1621317 Signed-off-by: Zamir SUN <sztsian@gmail.com>	2018-09-26 21:15:16 +08:00
Kevin Fenzi	55e52ee39c	Merge #439 `Drop fedora-live-minimization use from cinnamon`	2018-09-26 00:14:26 +00:00
Kevin Fenzi	e87ad5e42e	Merge #437 `Update fedora-minimization.ks`	2018-09-26 00:13:25 +00:00
Adam Williamson	394a2e80f2	Drop fedora-live-minimization use from cinnamon live-minimization is kinda old, and dates from the time we were trying to fit in CD size. No-one cares much about that any more. One of these exclusions (sane-backends) was contradictory for Cinnamon lives and broke the compose since the recent dnf change to fail compose on dependency issues (because the cinnamon comps group explicitly includes sane-backends-drivers-scanners, but this exclusion excludes one of its deps). To resolve that, @grinnz is fine with just dropping the use of live-minimization from the cinnamon images entirely, so this does that. Signed-off-by: Adam Williamson <awilliam@redhat.com>	2018-09-25 17:01:07 -07:00
Adam Williamson	3c08a7fbe4	Update fedora-minimization.ks All these packages used to be explicitly default or mandatory in comps groups that were on live images, but no longer are. Signed-off-by: Adam Williamson <awilliam@redhat.com>	2018-09-25 16:58:09 -07:00
Adam Williamson	f8a8f37aa5	MATE: drop colord exclusion (required by foomatic) foomatic requires colord. Before dnf-3.5.1-2.fc30, this meant foomatic was being silently excluded from MATE images. Now it means they fail to compose. Let's drop the exclusion so the images compose again. If the MATE maintainers want to reduce size, they will have to explicitly exclude foomatic (and be OK with doing so, as it probably breaks printing). Signed-off-by: Adam Williamson <awilliam@redhat.com>	2018-09-25 16:34:39 -07:00
Adam Williamson	255b48f233	Move exclusions of trousers-lib and iproute-tc to minimal-common These are aiming to leave some weak dependencies out of minimal images, it seems. From @core, gnutls recommends trousers which requires trousers-lib, and iproute recommends iproute-tc. However, both are hard dependencies of things that include fedora-disk-base.ks. fedora-disk-workstation.ks includes fedora-disk.base.ks and fedora-workstation-common.ks, so it installs the Workstation package set, from which gnome-boxes ultimately requires iproute-tc and NetworkManager-openconnect ultimately requires trousers-lib. Prior to the change I recently got merged into DNF, DNF would silently drop gnome-boxes and NetworkManager-openconnect from the Workstation disk image because of this. With the change, it errors out on creation of the image. To make the image compose again and actually include the right packages, let's move the exclusions to fedora-minimal-common.ks, where they make more sense anyway. This does mean the packages will be pulled into other non-minimal images even if they're not strictly required there, but that doesn't seem like a big problem. Signed-off-by: Adam Williamson <awilliam@redhat.com>	2018-09-25 14:57:35 -07:00
Mohan Boddu	7e826a7508	Merge #430 `This seems to now cause dep problems as it's required in the chain`	2018-09-22 18:04:57 +00:00
Kevin Fenzi	1ff983170c	Merge #429 `Add ja-JP.ks to games.iso`	2018-09-22 17:44:11 +00:00
Kevin Fenzi	18d30b363c	Merge #426 `fedora-soas: Include livecd-iso-to-disk in .iso filesystem.`	2018-09-22 17:43:17 +00:00
Kevin Fenzi	36fa64da0a	This seems to now cause dep problems as it's required in the chain of foomatic -> foomatic-db -> foomatic-db-ppds	2018-09-22 10:39:44 -07:00
dahura35	c5a51f6ecd	fixed fedora-livedvd-games-ja_JP.ks	2018-09-20 15:32:35 +09:00
Luya Tshimbalanga	76a92fe25c	Design Suite: use F28 supplemental wallpapers	2018-09-14 23:18:49 -07:00
Frederick Grose	aebb5de8e9	fedora-soas: Include livecd-iso-to-disk in .iso filesystem. Inject install code in lorax template live/x86.tmpl for livemedia- creator builds. Also, remove wrong path for dracut; give glib-compile-schemas the schemas directory; update maintainers.	2018-09-13 21:52:12 -04:00
Zamir SUN	21dbbb93f3	LXQt: Add default editor Signed-off-by: Zamir SUN <sztsian@gmail.com>	2018-09-09 22:21:37 +08:00
Dan Book	1f35ec1248	Cinnamon - update background extras to f29	2018-09-02 14:47:51 -04:00
Frederick Grose	8cfe4eb1aa	livesys: continue instead of return in cmdline do loops. return is an improper exit command for do loops. From dracut.cmdline(7): "The last value in the kernel command line is the value .. honored."	2018-08-31 19:47:01 -04:00
Peter Robinson	d33a56133a	Update to deal with changes for Raspberry Pi firmware handling Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>	2018-08-31 20:04:57 +01:00
Peter Robinson	f96a309329	arm: align the 32 bit images with what we do on aarch64 to make maitenance easier Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>	2018-08-30 18:18:49 +01:00
Peter Robinson	13817ab8f2	drop swap from minimal image, it was missed in the zram PR Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>	2018-08-23 10:52:01 +01:00
Dan Book	e8775547eb	Cinnamon - add parole media player	2018-08-21 14:04:28 -04:00
Amit Saha	113d6b1128	Update fedora-scientific-common.ks Comment julia till package build is fixed	2018-08-16 07:01:47 +00:00
Mohan Boddu	90d8dbec76	Rawhide being F30 Signed-off-by: Mohan Boddu <mboddu@bhujji.com>	2018-08-13 13:39:07 -04:00