Compare commits

..

41 Commits
f39 ... f40

Author SHA1 Message Date
Adam Williamson
a2bb6793db Bump root sizes for lxqt and i3 lives
These are both failing to build on aarch64 due to lack of space.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
2024-03-26 15:21:35 -07:00
Adam Williamson
f9ac9f9ddc Remove mrpt-devel from robotics (it was retired)
Signed-off-by: Adam Williamson <awilliam@redhat.com>
2024-03-21 12:25:59 -07:00
Kevin Fenzi
176a09fe80 lxqt: final size bump I hope
This time I actually tested things to confirm that there was enough
size. x86_64 builds fine with this size. aarch64 fails, but not due to
size, it's the dbus aarch64 bug.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2024-03-19 16:35:49 -07:00
Adam Williamson
69af25020c Bump root partition size for scientific_kde
It seems to need about 1.4G more according to recent failure logs.
Let's give it a bit of a buffer.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
2024-03-19 15:46:25 -07:00
Kevin Fenzi
4912db2d9d lxqt: add more space.
I added a tiny bit of space, but turns out theres not quit enough for
the initramfs to be generated and the compose still fails.

So, lets add 100MB. That should be enough for the scriptlets to
complete.

I'd like to cherry pick this into f40 as well.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2024-03-18 14:44:04 -07:00
Debarshi Ray
82222e16e8 container-toolbox: Use 'toolbx' as VARIANT_ID in os-release(5)
This is meant to distinguish OCI containers and images that are designed
specifically for Toolbx from others.  Toolbx containers are long-lasting
pet containers for interactive command line use, which makes them
substantially different from short-lived containers running services.

Therefore, it can be useful to be able to identify Toolbx containers and
images when generating statistics about Fedora usage.

https://pagure.io/Fedora-Council/tickets/issue/449
https://pagure.io/fedora-kickstarts/pull-request/1026
2024-03-17 01:31:30 +00:00
Kevin Fenzi
6e55750be4 lxqt live: bump space a slight bit to fit
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2024-03-16 15:30:31 -07:00
raveit65
0da52a87fd Mate: drop earlyoom from livecd 2024-02-24 20:21:42 +01:00
Dennis Gilmore
ec16205216 AArch64 livemedia isos are running out of space.
Increase the image slightly. In a test it is enough to build a iso.

Signed-off-by: Dennis Gilmore <dennis@ausil.us>
2024-02-22 18:52:42 -06:00
Adam Williamson
3fb39f8710 Drop anaconda-webui from Workstation: Change was deferred
The anaconda webui change was deferred to F41 by FESCo:
https://bugzilla.redhat.com/show_bug.cgi?id=2231339#c6
so we should drop the package.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
2024-02-21 11:54:37 -08:00
Samyak Jain
045ff6a282 Branch Fedora 40 from Rawhide
Signed-off-by: Samyak Jain <samyak.jn11@gmail.com>
2024-02-13 00:24:03 +05:30
Michal Hlavinka
d6c06a16f9 replace iotop with iotop-c
iotop was retired, replaced with iotop-c
see https://fedoraproject.org/wiki/Changes/Replace_iotop_with_iotop-c
2024-02-07 20:15:43 +01:00
Adam Williamson
268181498d Replace all 'wget' with 'wget2-wget': Wget2asWget Change
Per https://fedoraproject.org/wiki/Changes/Wget2asWget , wget
has been retired from Rawhide and replaced by wget2-wget.

I think kickstarts *do* resolve Provides so this probably works
okay as-is, but it seems clearer to update the name.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
2024-01-31 09:17:37 -08:00
Neal Gompa
f70868470d kde: Add kde-spin-initial-setup to ensure we retain firstboot wizard
The initial-setup packages for firstboot were split into their own
comps group that ensures initial-setup-gui is configured to use
kwin as the Wayland compositor.
2024-01-04 12:02:57 -05:00
Ian Wienand
eab4fdc148 fedora-container-toolbox: drop systemd
Since change 48e2c3b559 this kickstart
is pulling in systemd.

This was noticed because since
49306cb6ea started bringing in
weak-dependencies, we started installing systemd-resolved is which
created a symlinked /etc/resolv.conf in the image.  Toolbox will not
currently reset this on container start, as it is a symlink (this
behaviour is a bit complicated; see [1]).  This leads to an
incompatability running the toolbox on *non* systemd-resolved hosts
(e.g. RHEL9); you are left with a dangling symlink and no
name-resolution in the toolbox.

We do not want systemd in the toolbox image by default it; remove it
from the list.  Exclude systemd-resolved specifically, so if something
else brings in systemd we still don't include this.

[1] https://github.com/containers/toolbox/issues/1410
2023-12-18 10:00:13 +11:00
Neal Gompa
c245ee3524 Use "systemctl set-default" to set the default target
This mimics what people actually are supposed to do on
running systems.
2023-11-19 22:26:23 -05:00
Debarshi Ray
c0884eadaf container-toolbox: Sprinkle some comments
https://pagure.io/fedora-kickstarts/pull-request/1008
2023-10-31 01:34:49 +01:00
Debarshi Ray
8e97664cb7 container-toolbox: Synchronize the tests with the Container/Dockerfile
The same changes were made to the Container/Dockerfile equivalent of the
fedora-toolbox OCI images in recent times [1, 2, 3].

[1] Toolbx commit 20188a097a1a7a16
    https://github.com/containers/toolbox/commit/20188a097a1a7a16
    https://github.com/containers/toolbox/pull/1384

[2] Toolbx commit e41d920dd9a847cc
    https://github.com/containers/toolbox/commit/e41d920dd9a847cc
    https://github.com/containers/toolbox/pull/1390

[3] Toolbx commit 9b5313e5a76c9278
    https://github.com/containers/toolbox/commit/9b5313e5a76c9278
    https://github.com/containers/toolbox/pull/1394

https://pagure.io/fedora-kickstarts/pull-request/1008
2023-10-31 01:34:45 +01:00
Debarshi Ray
7725ee859c container-toolbox: Restore the tests
The tests can't be run inside the '%post --nochroot' section because
the paths being tested don't include the /mnt/sysimage prefix.  The
tests must be run in the %post section without --nochroot so that they
are run inside the chroot environment.

The translations for the RPM manuals were removed upstream during the
RPM 4.19 development cycle [1].  So, replace them with rpm2cpio(8),
which is another popular command shipped by the rpm package.

[1] RPM commit 4df74a9644b18136
    https://github.com/rpm-software-management/rpm/commit/4df74a9644b18136
    https://github.com/rpm-software-management/rpm/pull/2245

https://pagure.io/fedora-kickstarts/pull-request/1008
2023-10-31 01:34:40 +01:00
Luya Tshimbalanga
53e29feb51 Drop unmaintained gnome-photos 2023-10-26 22:47:26 +00:00
Chihurumnaya Ibiam
94361299b0 Add xfce-polkit to SOAS
Signed-off-by: Chihurumnaya Ibiam <ibiam@sugarlabs.org>
2023-10-26 21:49:02 +00:00
Debarshi Ray
744a9fd9aa container-toolbox: Add psmisc
It's currently being pulled in as a dependency of iproute.  However,
since it's explicitly mentioned in the list of default packages on
Fedora Silverblue and Workstation [1], it should be mentioned here too.

The same change was also made to the Container/Dockerfile equivalent of
the fedora-toolbox OCI images [2].

[1] fedora-comps commit e4ed54dfcc497fd0
    https://pagure.io/fedora-comps/c/e4ed54dfcc497fd0
    https://pagure.io/fedora-comps/pull-request/379

[2] Toolbx commit e41d920dd9a847cc
    https://github.com/containers/toolbox/commit/e41d920dd9a847cc
    https://github.com/containers/toolbox/pull/1390

https://bugzilla.redhat.com/show_bug.cgi?id=2244503
https://pagure.io/fedora-kickstarts/pull-request/1003
2023-10-25 18:31:29 +02:00
Debarshi Ray
d6aac886a0 container-toolbox: Use vim-minimal, not vim-enhanced
Fedora Silverblue and Workstation, and hence the Container/Dockerfile
equivalent of the fedora-toolbox OCI images, contain vim-minimal by
default, not vim-enhanced.  This is because the default editor is GNU
nano, not Vim.

https://bugzilla.redhat.com/show_bug.cgi?id=2244503
https://pagure.io/fedora-kickstarts/pull-request/1003
2023-10-25 18:31:29 +02:00
Debarshi Ray
30f76d387d container-toolbox: Install all languages (part 2)
This is a continuation from commit 69555b7b91, which tried to
ensure that all languages are present in the fedora-toolbox OCI image by
removing --inst-langs=en from fedora-container-toolbox.ks.  Sadly, this
wasn't enough.

The image was still missing various localization bits like translations
for programs and manuals.  All translations for all programs, such as
LC_MESSAGES and LC_TIME, were missing, except for those coming from
glibc-all-langpacks.  eg., see:
  $ LANG=cs_CZ.UTF-8 cp foo bar
  cp: cannot stat 'foo': Adresář nebo soubor neexistuje

Only the part coming from glibc is translated.  The part coming from
coreutils isn't.  There are lots and lots of such packages.  eg., bash,
coreutils, dnf, grep, rpm, sed, tar, etc..

Any package with translated manuals marked with %lang() in their %files
section were missing them.  eg., man-db, passwd, psmisc, etc..

Finally, even though the %pre section in fedora-container-toolbox.ks
removes %_install_langs from /etc/rpm/macros.image-language-conf, it was
still set to en_US in the final image.

This was happening because fedora-container-toolbox.ks includes
fedora-container-common.ks, and some unintended bits from the latter
were leaking into the fedora-toolbox OCI image's build.

The image was still being built with '%packages --inst-langs=en',
possibly since fedora-container-common.ks has '%package --instLangs=en'.
That option wasn't just being applied to the packages being installed by
fedora-container-common.ks, but also to those being installed by
fedora-container-toolbox.ks [1].

Secondly, fedora-container-common.ks sets %_install_langs to en_US in
its %post section.  This will strip out all non-English languages from
future RPM transactions in containers created from the image.

To address this, fedora-container-toolbox.ks has now been decoupled from
fedora-container-common.ks, by copying over the relevant bits.

[1] https://koji.fedoraproject.org/koji/buildinfo?buildID=2311452
    https://kojipkgs.fedoraproject.org//packages/Fedora-Container-Toolbox/Rawhide/20231025.n.0/images/fedora-container-toolbox.ks
    https://kojipkgs.fedoraproject.org//packages/Fedora-Container-Toolbox/Rawhide/20231025.n.0/images/koji-f40-build-108073454-base.ks
    https://kojipkgs.fedoraproject.org//packages/Fedora-Container-Toolbox/Rawhide/20231025.n.0/data/logs/image/oz-aarch64.log

https://bugzilla.redhat.com/show_bug.cgi?id=2244503
https://pagure.io/fedora-kickstarts/pull-request/1002
2023-10-25 18:25:45 +02:00
Carlos O'Donell
04e1ba3b6e Only base containers should have tzdata
The base container should always install tzdata to ensure that it is
available for applications built on top of the base container.

The minimal container should never have tzdata installed, and the
application should install it as part of the application dependencies.

Starting with Fedora 39 we have the capability to remove tzdata from
the minimal images without resorting to deleting files:
https://fedoraproject.org/wiki/Changes/AllowRemovalOfTzdata
2023-10-24 07:33:29 -04:00
Stephen Gallagher
0dda83fc8a ELN container: Add dnf-plugins-core
Fixes: https://github.com/fedora-eln/eln/issues/166

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
2023-10-17 15:32:29 +00:00
Debarshi Ray
69555b7b91 container-toolbox: Install all languages
The Container/Dockerfile equivalent of the fedora-toolbox OCI images
installed all languages by removing %_install_langs (set to en_US by the
fedora base image) from /etc/rpm/macros.image-language-conf [1].  The
Kickstart does the same in the %pre section.

Therefore, it's self-contradictory to have '%packages --inst-langs=en'.

The fedora-toolbox OCI image is meant for interactive command line
environments, not for deploying server applications.  Therefore, they
need a fully featured CLI user experience at par with what's offered on
Fedora Silverblue and Workstation.  Among the Kickstart files defined
here, other than fedora-container-toolbox.ks, only these ones don't
install all languages:
  * fedora-cloud-base.ks
  * fedora-container-base-minimal.ks
  * fedora-container-base.ks
  * fedora-container-common.ks
  * fedora-eln-container-base.ks
  * fedora-server-vm-full.ks

All the other Kickstarts, and definitely those for Fedora Workstation,
install all languages.

[1] https://src.fedoraproject.org/container/fedora-toolbox
    https://github.com/containers/toolbox/tree/main/images/fedora

https://bugzilla.redhat.com/show_bug.cgi?id=2244503
https://pagure.io/fedora-kickstarts/pull-request/997
2023-10-16 19:14:17 +02:00
Debarshi Ray
49306cb6ea container-toolbox: Include weak dependencies
The Container/Dockerfile equivalent of the fedora-toolbox OCI images
didn't exclude weak dependencies [1] so the Kickstart shouldn't either.

The fedora-toolbox OCI image is meant for interactive command line
environments, not for deploying server applications.  Therefore, they
need a fully featured CLI user experience at par with what's offered on
Fedora Silverblue and Workstation.  Among the Kickstart files defined
here, other than fedora-container-toolbox.ks, only these ones exclude
weak dependencies:
  * fedora-container-base-minimal.ks
  * fedora-container-base.ks
  * fedora-container-common.ks
  * fedora-eln-container-base.ks
  * fedora-modular-disk-minimal.ks

None of the other Kickstarts, and definitely not those for Fedora
Workstation, exclude weak dependencies.

As a concrete example, the default-editor meta RPM relies on Recommends
for its functionality [2].

[1] https://src.fedoraproject.org/container/fedora-toolbox
    https://github.com/containers/toolbox/tree/main/images/fedora

[2] fedora nano commit e53ee57baa33a1d8
    https://src.fedoraproject.org/rpms/nano/c/e53ee57baa33a1d8
    https://src.fedoraproject.org/rpms/nano/pull-request/7
    https://bugzilla.redhat.com/show_bug.cgi?id=1955884

https://pagure.io/fedora-kickstarts/pull-request/995
2023-10-16 06:39:34 +00:00
Chihurumnaya Ibiam
3409578950 Update maintainer email
Signed-off-by: Chihurumnaya Ibiam <ibiam@sugarlabs.org>
2023-10-13 13:33:40 +01:00
Debarshi Ray
f10385252a container-toolbox: Fix typo between %pre and %post
The snippet to fix the /run/lock breakage and the lines following it
were copied from the first %post section in fedora-container-base.ks.
However, the %end marker to terminate the previous %pre section, and the
starting %post marker went missing in fedora-container-toolbox.ks

https://pagure.io/fedora-kickstarts/pull-request/993
2023-10-06 02:59:50 +02:00
Debarshi Ray
0087ea3b3f container-toolbox: Use default-editor, not nano-default-editor
In Fedora 33, nano-default-editor was introduced to make GNU nano the
default editor [1].  After a year, it was found out that it breaks
upgrades across Fedora releases if the user had chosen some other editor
as the default [2].

The difference doesn't matter here because the fedora-toolbox OCI image
is being created from scratch without involving any upgrades.  However,
since fedora-comps was switched to default-editor [3], it's better to
do the same and stay consistent.  If nothing else, it won't make the
reader stop and ponder if there's any real reason that it was done
differently for the fedora-toolbox image.

[1] fedora nano commit cf1ce689f154d0a1
    https://src.fedoraproject.org/rpms/nano/c/cf1ce689f154d0a1
    https://src.fedoraproject.org/rpms/nano/pull-request/1
    https://fedoraproject.org/wiki/Changes/UseNanoByDefault

[2] fedora nano commit e53ee57baa33a1d8
    https://src.fedoraproject.org/rpms/nano/c/e53ee57baa33a1d8
    https://src.fedoraproject.org/rpms/nano/pull-request/7
    https://bugzilla.redhat.com/show_bug.cgi?id=1955884

[3] fedora-comps commit 3496ed634cf452da
    https://pagure.io/fedora-comps/c/3496ed634cf452da
    https://pagure.io/fedora-comps/pull-request/663
    https://bugzilla.redhat.com/show_bug.cgi?id=1955884

https://pagure.io/fedora-kickstarts/pull-request/992
2023-10-06 01:03:57 +02:00
Odilon Sousa
5a2c67dbf7 Add xfce-polkit to i3-Spin
This fix https://bugzilla.redhat.com/show_bug.cgi?id=2240823 and https://pagure.io/i3-sig/Fedora-i3-Spin/issue/68
2023-09-26 16:57:32 -03:00
Jeremy Linton
ffd1a4f387 fedora-live-base: Exclude sdubby from live installs
systemd-boot is not yet supported on live media. Yet we
want it to appear on images where anaconda is installing
a system from RPMs (ex: the server dvd image).
The fix for this problem at the moment is to exclude anaconda
packages during the live media creation.

Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
2023-09-18 14:44:33 -05:00
Adam Williamson
a468873f9a Bump root partition size for KDE live
The aarch64 KDE live image build is failing due to lack of space:
https://kojipkgs.fedoraproject.org//work/tasks/6017/105476017/livemedia-out.log
so let's bump it.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
2023-08-29 13:15:50 -07:00
Adam Williamson
cb5067475b Security: exclude default-fonts-core-math
See a90d590e00 - this is the same
fix, for the security image. As with LXDE, since
https://fedoraproject.org/wiki/Changes/ImproveDefaultFontHandling
we need to also drop default-fonts-core-math if we want to drop
stix-fonts, or the image build fails.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
2023-08-29 19:44:14 +00:00
Adam Williamson
5fec4c4ee1 Drop python3-spyder from astronomy_kde and scientific
It is FTI with Python 3.12, and fixing it requires handling two
rather complex dependency chains:
https://bugzilla.redhat.com/show_bug.cgi?id=2220598
so it's not going to be fixed overnight. Let's drop it from the
spins for now to get them building again.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
2023-08-29 12:18:37 -07:00
Kevin Fenzi
58c856ae88 Revert "Revert "Turn on anaconda-webui for workstation""
This reverts commit 53584f236d.

Now we have things working again we want to give this another go in
rawhide. So, revert the revert you revert.
2023-08-22 18:02:23 -07:00
Adam Williamson
53584f236d Revert "Turn on anaconda-webui for workstation"
This reverts commit ce5b31416f.
The anaconda update with the webUI changes is failing tests,
and we do not have time to resolve this right away. We can't
leave this in place without also pushing the anaconda update
stable and adjusting the openQA tests, so let's revert it for
now so tests pass on other updates, until we can come back and
clean up the webUI stuff tomorrow.
2023-08-21 17:36:31 -07:00
Ray Strode
ce5b31416f Turn on anaconda-webui for workstation 2023-08-21 11:26:37 -04:00
Mamoru TASAKA
01a66b8b9d F40 LXDE: remove midori from kickstart
midiri got retired on F-40: 450c4d62d2
remove this from kickstart.
2023-08-21 14:48:42 +09:00
Mamoru TASAKA
a90d590e00 F40 LXDE: exclude default-fonts-core-math
LXDE already excluded math related stix-fonts to save space.

Now with https://fedoraproject.org/wiki/Changes/ImproveDefaultFontHandling ,
fonts entry on comps now includes default-fonts-core-math as default
package, so exclude this also.
2023-08-10 22:13:46 +09:00
25 changed files with 87 additions and 72 deletions

View File

@@ -85,14 +85,14 @@ gtk-recordmydesktop
gconf-editor gconf-editor
dconf-editor dconf-editor
nautilus-open-terminal nautilus-open-terminal
iotop iotop-c
htop htop
# Add favorite power-user tools # Add favorite power-user tools
mc mc
vim vim
nano nano
wget wget2-wget
# Add dependencies for the welcome screen # Add dependencies for the welcome screen
# (this makes it run also on non-GNOME systems) # (this makes it run also on non-GNOME systems)

View File

@@ -6,7 +6,7 @@
%packages --excludedocs --instLangs=en --nocore --excludeWeakdeps %packages --excludedocs --instLangs=en --nocore --excludeWeakdeps
microdnf microdnf
-tzdata
%end %end
%post --erroronfail --log=/root/anaconda-post.log %post --erroronfail --log=/root/anaconda-post.log
@@ -33,11 +33,6 @@ rm -fv /usr/bin/pinky
# we lose presets by removing /usr/lib/systemd but we do not care # we lose presets by removing /usr/lib/systemd but we do not care
rm -rfv /usr/lib/systemd rm -rfv /usr/lib/systemd
# if you want to change the timezone, bind-mount it from the host or reinstall tzdata
rm -fv /etc/localtime
mv /usr/share/zoneinfo/UTC /etc/localtime
rm -rfv /usr/share/zoneinfo
# Final pruning # Final pruning
rm -rfv /var/cache/* /var/log/* /tmp/* rm -rfv /var/cache/* /var/log/* /tmp/*

View File

@@ -35,6 +35,7 @@ fedora-release-container
bash bash
coreutils coreutils
glibc-minimal-langpack glibc-minimal-langpack
tzdata
rpm rpm
util-linux-core util-linux-core
-kernel -kernel

View File

@@ -26,13 +26,14 @@ bzip2
coreutils coreutils
coreutils-common coreutils-common
curl curl
default-editor
diffutils diffutils
dnf dnf
dnf-yum # https://fedorahosted.org/fesco/ticket/1312#comment:29 dnf-yum # https://fedorahosted.org/fesco/ticket/1312#comment:29
dnf-plugins-core dnf-plugins-core
-dosfstools -dosfstools
-e2fsprogs -e2fsprogs
fedora-release-container fedora-release-toolbx
findutils findutils
flatpak-spawn flatpak-spawn
fpaste fpaste
@@ -62,7 +63,6 @@ man-pages
mesa-dri-drivers mesa-dri-drivers
mesa-vulkan-drivers mesa-vulkan-drivers
mtr mtr
nano-default-editor
nss-mdns nss-mdns
openssh-clients openssh-clients
openssl openssl
@@ -92,13 +92,14 @@ time
traceroute traceroute
tree tree
-trousers -trousers
tzdata
unzip unzip
util-linux util-linux
util-linux-core util-linux-core
vim-minimal vim-minimal
vte-profile vte-profile
vulkan-loader vulkan-loader
wget wget2-wget
which which
whois whois
words words
@@ -163,6 +164,55 @@ rm -f /run/nologin # https://pagure.io/atomic-wg/issue/316
# Final pruning # Final pruning
rm -rfv /var/cache/* /var/log/* /tmp/* rm -rfv /var/cache/* /var/log/* /tmp/*
# Check if specified files exist
declare -a files=(
# bash
"/usr/share/man/man1/bash.1*"
"/usr/share/man/man1/cd.1*"
"/usr/share/man/man1/export.1*"
# coreutils-common
"/usr/share/man/man1/cat.1*"
"/usr/share/man/man1/cp.1*"
"/usr/share/man/man1/ls.1*"
# gnupg2
"/usr/share/man/man1/gpg2.1*"
"/usr/share/man/man7/gnupg2.7*"
# psmisc
"/usr/share/man/fr/man1/pstree.1*"
"/usr/share/man/ko/man1/pstree.1*"
"/usr/share/man/man1/pstree.1*"
# rpm
"/usr/share/man/man8/rpm.8*"
"/usr/share/man/man8/rpm2cpio.8*"
# shadow-utils
"/usr/share/man/fr/man8/useradd.8*"
"/usr/share/man/ja/man8/useradd.8*"
"/usr/share/man/man8/useradd.8*"
# util-linux
"/usr/share/man/man1/cal.1.*"
"/usr/share/man/man1/getopt.1*"
"/usr/share/man/man1/hexdump.1*"
# util-linux-core
"/usr/share/man/man1/kill.1*"
"/usr/share/man/man8/mount.8*"
# xz
"/usr/share/man/fr/man1/xz.1*"
"/usr/share/man/ko/man1/xz.1*"
"/usr/share/man/man1/xz.1*"
)
ret_val=0
for file in "${files[@]}"; do
if ! compgen -G "$file" >/dev/null; then
echo "$file: No such file or directory" >&2
ret_val=1
break
fi
done
if [ "$ret_val" -ne 0 ]; then
false
fi
%end %end
# Perform any necessary post-installation configurations specific to Fedora Toolbox (nochroot environment) # Perform any necessary post-installation configurations specific to Fedora Toolbox (nochroot environment)
@@ -171,36 +221,6 @@ rm -rfv /var/cache/* /var/log/* /tmp/*
%post --nochroot --erroronfail --log=/mnt/sysimage/root/anaconda-post-nochroot.log %post --nochroot --erroronfail --log=/mnt/sysimage/root/anaconda-post-nochroot.log
set -eux set -eux
# Check if specified files exist
#declare -a files=(
# "/usr/share/man/man1/bash.1*"
# "/usr/share/man/man1/cd.1*"
# "/usr/share/man/man1/export.1*"
# "/usr/share/man/man1/cat.1*"
# "/usr/share/man/man1/cp.1*"
# "/usr/share/man/man1/ls.1*"
# "/usr/share/man/man1/gpg2.1*"
# "/usr/share/man/man7/gnupg2.7*"
# "/usr/share/man/fr/man8/rpm.8*"
# "/usr/share/man/ja/man8/rpm.8*"
# "/usr/share/man/man8/rpm.8*"
# "/usr/share/man/man1/kill.1*"
# "/usr/share/man/man8/mount.8*"
#)
#ret_val=0
#for file in "${files[@]}"; do
# if ! compgen -G "$file" >/dev/null; then
# echo "$file: No such file or directory" >&2
# ret_val=1
# break
# fi
#done
#if [ "$ret_val" -ne 0 ]; then
# false
#fi
# Clean up dnf cache # Clean up dnf cache
dnf clean all dnf clean all

View File

@@ -26,8 +26,7 @@ fedora-release-server
# setup systemd to boot to the right runlevel # setup systemd to boot to the right runlevel
echo -n "Setting default runlevel to multiuser text mode" echo -n "Setting default runlevel to multiuser text mode"
rm -f /etc/systemd/system/default.target systemctl set-default multi-user.target
ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
echo . echo .
%end %end

View File

@@ -7,5 +7,6 @@ autopart --type=btrfs --noswap
%packages %packages
-initial-setup -initial-setup
-initial-setup-gui -initial-setup-gui
gnome-initial-setup
%end %end

View File

@@ -17,6 +17,6 @@ glibc-all-langpacks
%post %post
# Explicitly set graphical.target as default as this is how initial-setup detects which version to run # Explicitly set graphical.target as default as this is how initial-setup detects which version to run
ln -sf /lib/systemd/system/graphical.target /etc/systemd/system/default.target systemctl set-default graphical.target
%end %end

View File

@@ -12,6 +12,7 @@ tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920
vim-minimal vim-minimal
dnf dnf
dnf-yum # https://fedorahosted.org/fesco/ticket/1312#comment:29 dnf-yum # https://fedorahosted.org/fesco/ticket/1312#comment:29
python3-dnf-plugins-core # https://github.com/fedora-eln/eln/issues/166
sudo sudo
-glibc-langpack-en -glibc-langpack-en
-langpacks-en -langpacks-en

View File

@@ -136,8 +136,7 @@ passwd -l root
# setup systemd to boot to the right runlevel # setup systemd to boot to the right runlevel
echo -n "Setting default runlevel to multiuser text mode" echo -n "Setting default runlevel to multiuser text mode"
rm -f /etc/systemd/system/default.target systemctl set-default multi-user.target
ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
echo . echo .
# this is installed by default but we don't need it in virt # this is installed by default but we don't need it in virt

View File

@@ -21,7 +21,7 @@ thunar
gnome-keyring-pam gnome-keyring-pam
# Admin tools are handy to have # Admin tools are handy to have
@admin-tools @admin-tools
wget wget2-wget
# Better more popular browser # Better more popular browser
system-config-printer system-config-printer
# Install XFCE polkit # Install XFCE polkit

View File

@@ -19,7 +19,7 @@ autopart --nohome --noswap --type=plain
# Equivalent of %include fedora-repo.ks # Equivalent of %include fedora-repo.ks
# Pull from the ostree repo that was created during the compose # 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/39/${basearch}/iot ostreesetup --nogpg --osname=fedora-iot --remote=fedora-iot --url=https://kojipkgs.fedoraproject.org/compose/iot/repo/ --ref=fedora/40/${basearch}/iot
reboot reboot
@@ -34,14 +34,14 @@ fi
# Set the origin to the "main ref", distinct from /updates/ which is where bodhi writes. # 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. # 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/39/${arch}/iot" ostree admin set-origin --index 0 fedora-iot https://dl.fedoraproject.org/iot/repo/ "fedora/40/${arch}/iot"
# Make sure the ref we're supposedly sitting on (according # Make sure the ref we're supposedly sitting on (according
# to the updated origin) exists. # to the updated origin) exists.
ostree refs "fedora-iot:fedora/39/${arch}/iot" --create "fedora-iot:fedora/39/${arch}/iot" ostree refs "fedora-iot:fedora/40/${arch}/iot" --create "fedora-iot:fedora/40/${arch}/iot"
# Remove the old ref so that the commit eventually gets cleaned up. # Remove the old ref so that the commit eventually gets cleaned up.
ostree refs "fedora-iot:fedora/39/${arch}/iot" --delete ostree refs "fedora-iot:fedora/40/${arch}/iot" --delete
# delete/add the remote with new options to enable gpg verification # delete/add the remote with new options to enable gpg verification
# and to point them at the cdn url # and to point them at the cdn url

View File

@@ -7,6 +7,8 @@
@kde-apps @kde-apps
@kde-media @kde-media
@kde-pim @kde-pim
# Ensure we have Anaconda initial setup using kwin
@kde-spin-initial-setup
@libreoffice @libreoffice
# add libreoffice-draw and libreoffice-math (pagureio:fedora-kde/SIG#103) # add libreoffice-draw and libreoffice-math (pagureio:fedora-kde/SIG#103)
libreoffice-draw libreoffice-draw

View File

@@ -13,6 +13,9 @@
%include fedora-live-minimization.ks %include fedora-live-minimization.ks
%include fedora-i3-common.ks %include fedora-i3-common.ks
# need a bigger /
part / --size 6000
%post %post
# i3 configuration # i3 configuration

View File

@@ -11,6 +11,9 @@
%include fedora-live-minimization.ks %include fedora-live-minimization.ks
%include fedora-lxqt-common.ks %include fedora-lxqt-common.ks
# need a bigger /
part / --size 6000
%packages %packages
dracut-config-generic dracut-config-generic
%end %end

View File

@@ -19,7 +19,6 @@ part / --size 10752
pcl-devel pcl-devel
player-devel player-devel
stage-devel stage-devel
mrpt-devel
# Add version control packages # Add version control packages
git git

View File

@@ -12,8 +12,7 @@
%include fedora-live-minimization.ks %include fedora-live-minimization.ks
%include fedora-scientific-common.ks %include fedora-scientific-common.ks
# The recommended part size for DVDs is too close to use for the scientific spin part / --size 17000
part / --size 15000
%post %post

View File

@@ -4,7 +4,7 @@
# - A Sugar environment that you can carry in your pocket # - A Sugar environment that you can carry in your pocket
# #
# Maintainers: # Maintainers:
# - Chihurumnaya Ibiam <ibiamchihurumnaya AT gmail DOT com> # - Chihurumnaya Ibiam <ibiam AT sugarlabs DOT org>
# - Alex Perez <aperez AT alexperez DOT com> # - Alex Perez <aperez AT alexperez DOT com>
%include fedora-live-base.ks %include fedora-live-base.ks

View File

@@ -10,7 +10,11 @@
# #
#include snippets/packagekit-cached-metadata.ks #include snippets/packagekit-cached-metadata.ks
part / --size 7750 part / --size 8192
%packages
gnome-initial-setup
%end
%post %post

View File

@@ -15,9 +15,6 @@
@lxde-media @lxde-media
@lxde-office @lxde-office
# FIXME: can be omitted once comps is updated
midori
# pam-fprint causes a segfault in LXDM when enabled # pam-fprint causes a segfault in LXDM when enabled
-fprintd-pam -fprintd-pam

View File

@@ -20,12 +20,6 @@ fusion-icon
# blacklist applications which breaks mate-desktop # blacklist applications which breaks mate-desktop
-audacious -audacious
# see https://bugzilla.redhat.com/show_bug.cgi?id=2068699
# and https://bugzilla.redhat.com/show_bug.cgi?id=1933494
# use earlyoom instead of systemd-oomd-defaults
earlyoom
-systemd-oomd-defaults
# office # office
@libreoffice @libreoffice

View File

@@ -17,8 +17,7 @@ NetworkManager-wifi
# setup systemd to boot to the right runlevel # setup systemd to boot to the right runlevel
echo -n "Setting default runlevel to multiuser text mode" echo -n "Setting default runlevel to multiuser text mode"
rm -f /etc/systemd/system/default.target systemctl set-default multi-user.target
ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
echo . echo .
%end %end

View File

@@ -10,7 +10,7 @@
nano nano
openssh-clients openssh-clients
vim-enhanced vim-enhanced
wget wget2-wget
# Remove Pythons possibly recommended by tox # Remove Pythons possibly recommended by tox
-python2 -python2

View File

@@ -193,8 +193,7 @@ sync /
# setup systemd to boot to the right runlevel # setup systemd to boot to the right runlevel
echo -n "Setting default runlevel to multiuser text mode" echo -n "Setting default runlevel to multiuser text mode"
rm -f /etc/systemd/system/default.target systemctl set-default multi-user.target
ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
echo . echo .
%end %end

View File

@@ -4,7 +4,7 @@
# - A Sugar environment that you can carry in your pocket # - A Sugar environment that you can carry in your pocket
# #
# Maintainers: # Maintainers:
# - Chihurumnaya Ibiam <ibiamchihurumnaya AT gmail DOT com> # - Chihurumnaya Ibiam <ibiam AT sugarlabs DOT org>
# - Alex Perez <aperez AT alexperez DOT com> # - Alex Perez <aperez AT alexperez DOT com>
firewall --enabled --service=mdns,presence firewall --enabled --service=mdns,presence

View File

@@ -19,7 +19,7 @@ fedora-release-xfce
@xfce-media @xfce-media
@xfce-office @xfce-office
wget wget2-wget
system-config-printer system-config-printer
# save some space # save some space