IoT: Update F-30 for stable ostree branch

Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>
Explicitly set the container base image locale to C.UTF-8
2025-12-10 09:00:30 +08:00 · 2019-10-02 08:18:19 +01:00 · 2019-07-12 19:12:29 +02:00 · 2019-07-07 10:56:56 +02:00 · 2019-07-05 18:21:08 +02:00 · 2019-07-05 08:03:23 +02:00
3 changed files with 22 additions and 5 deletions
--- a/fedora-container-base.ks
+++ b/fedora-container-base.ks
@@ -13,6 +13,8 @@ dnf
 dnf-yum  # https://fedorahosted.org/fesco/ticket/1312#comment:29
 sssd-client
 sudo
+-glibc-langpack-en
+-cracklib-dicts
 %end

 %post --erroronfail --log=/root/anaconda-post.log
@@ -45,3 +47,15 @@ systemd-tmpfiles --prefix=/run/ --prefix=/var/run/ --create --boot || true
 rm /run/nologin # https://pagure.io/atomic-wg/issue/316

 %end
+
+%post --nochroot --erroronfail --log=/mnt/sysimage/root/anaconda-post-nochroot.log
+set -eux
+
+# See: https://bugzilla.redhat.com/show_bug.cgi?id=1051816
+# NOTE: run this in nochroot because "find" does not exist in chroot
+KEEPLANG=en_US
+for dir in locale i18n; do
+    find /mnt/sysimage/usr/share/${dir} -mindepth  1 -maxdepth 1 -type d -not \( -name "${KEEPLANG}" -o -name POSIX \) -exec rm -rfv {} +
+done
+
+%end
--- a/fedora-container-common.ks
+++ b/fedora-container-common.ks
@@ -61,6 +61,9 @@ set -eux
 LANG="en_US"
 echo "%_install_langs $LANG" > /etc/rpm/macros.image-language-conf

+# https://bugzilla.redhat.com/show_bug.cgi?id=1727489
+echo 'LANG="C.UTF-8"' >  /etc/locale.conf
+
 # https://bugzilla.redhat.com/show_bug.cgi?id=1400682
 echo "Import RPM GPG key"
 releasever=$(rpm -q --qf '%{version}\n' fedora-release-container)
--- a/fedora-iot.ks
+++ b/fedora-iot.ks
@@ -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/devel/${basearch}/iot
+ostreesetup --nogpg --osname=fedora-iot --remote=fedora-iot --url=https://kojipkgs.fedoraproject.org/compose/iot/repo/ --ref=fedora/stable/${basearch}/iot

 reboot

@@ -44,19 +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/devel/${arch}/iot"
+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/devel/${arch}/iot" --create "fedora-iot:fedora/devel/${arch}/iot"
+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/devel/${arch}/iot" --delete
+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'
+ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/ --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
Author	SHA1	Message	Date
Peter Robinson	fae67ed384	IoT: Update F-30 for stable ostree branch Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>	2019-10-02 08:18:19 +01:00
Clement Verna	fd6025e168	Explicitly set the container base image locale to C.UTF-8 Signed-off-by: Clement Verna <cverna@tutanota.com>	2019-07-12 19:12:29 +02:00
Clement Verna	7c254d7c60	Setup the correct locale in the base image. Since the base image is now using the minimal glibc langpack we need to use the POSIX locale. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1727489 Signed-off-by: Clement Verna <cverna@tutanota.com>	2019-07-07 10:56:56 +02:00
Clement Verna	3bb07d1948	Remove cracklib-dicts from the base container image. This commit remove the cracklib-dicts package which provides tests passwords to help user choose strong password. The package is not required by any other packages. This will save ~9MB from the base image size. Signed-off-by: Clement Verna <cverna@tutanota.com>	2019-07-05 18:21:08 +02:00
Clement Verna	81e49bbfd0	Remove the glibc-langpack-en from the base container image. This commit makes sure that we don't install the all the en locale in the base image. This remove around 60MB of the size of the container Signed-off-by: Clement Verna <cverna@tutanota.com>	2019-07-05 08:03:23 +02:00