From 1d8ef79bf6509114b2fac8393e875715ef3159ec Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 17 Feb 2020 07:54:55 +0000 Subject: [PATCH 01/11] Setup for F-32 branched Signed-off-by: Peter Robinson --- config.ini | 4 ++-- fedora-iot-base.json | 2 +- fedora-iot-updates-testing.json | 2 +- fedora-iot.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config.ini b/config.ini index 18ba958..87e9368 100644 --- a/config.ini +++ b/config.ini @@ -11,8 +11,8 @@ tree_name = docker-host tree_file = %(os_name)s-%(tree_name)s.json arch = x86_64 release = f32 -ref = %(os_name)s/rawhide/%(arch)s/%(tree_name)s -yum_baseurl = http://dl.fedoraproject.org/pub/fedora/linux//development/rawhide/%(arch)s/os/ +ref = %(os_name)s/devel/%(arch)s/%(tree_name)s +yum_baseurl = http://dl.fedoraproject.org/pub/fedora/linux/development/32/%(arch)s/os/ # lorax_additional_repos = http://127.0.0.1/fedora-iot/local-overrides lorax_include_packages = fedora-productimg-iot docker_os_name = fedora diff --git a/fedora-iot-base.json b/fedora-iot-base.json index 8c46481..cd9315d 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -1,5 +1,5 @@ { - "ref": "fedora/rawhide/${basearch}/iot", + "ref": "fedora/devel/${basearch}/iot", "ex-jigdo-spec": "fedora-iot.spec", "repos": [], diff --git a/fedora-iot-updates-testing.json b/fedora-iot-updates-testing.json index 96b50ac..d0b3866 100644 --- a/fedora-iot-updates-testing.json +++ b/fedora-iot-updates-testing.json @@ -1,5 +1,5 @@ { - "ref": "fedora/rawhide/${basearch}/testing/iot", + "ref": "fedora/devel/${basearch}/testing/iot", "ex-jigdo-spec": "fedora-iot.spec", "include": "fedora-iot-base.json" } diff --git a/fedora-iot.json b/fedora-iot.json index f19b166..d2d9e9f 100644 --- a/fedora-iot.json +++ b/fedora-iot.json @@ -1,5 +1,5 @@ { - "ref": "fedora/rawhide/${basearch}/iot", + "ref": "fedora/devel/${basearch}/iot", "ex-jigdo-spec": "fedora-iot.spec", "repos": ["fedora-32"], "include": "fedora-iot-base.json" From 3783fd0f9343e57e082a435d9a9bd5d0f6080521 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 24 Feb 2020 12:09:50 +0000 Subject: [PATCH 02/11] drop authselect Signed-off-by: Peter Robinson --- fedora-iot-base.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-iot-base.json b/fedora-iot-base.json index cd9315d..d0b5008 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -78,7 +78,7 @@ "rpm-ostree", "polkit", "lvm2", "chrony", "zram", "cryptsetup", "pinentry", - "authselect", "keyutils", + "keyutils", "e2fsprogs", "xfsprogs", "dosfstools", "gnupg2", "basesystem", "python3", "bash", From a7879208cd027dbccef4fc6f9cea1bb64687826c Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 26 Feb 2020 15:06:31 +0000 Subject: [PATCH 03/11] add cracklib-dicts to stop various things from crashing until they're fixed Signed-off-by: Peter Robinson --- fedora-iot-base.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-iot-base.json b/fedora-iot-base.json index d0b5008..34690b2 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -78,7 +78,7 @@ "rpm-ostree", "polkit", "lvm2", "chrony", "zram", "cryptsetup", "pinentry", - "keyutils", + "keyutils", "cracklib-dicts", "e2fsprogs", "xfsprogs", "dosfstools", "gnupg2", "basesystem", "python3", "bash", From 5d1713c0a27e52237bdec44ecd96a4ecae199c34 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 2 Mar 2020 16:12:21 +0000 Subject: [PATCH 04/11] Update README Signed-off-by: Peter Robinson --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c4dac3d..25e27d2 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ -# atomic +# ostree -Atomic compose configs for Fedora IoT \ No newline at end of file +This is the repo for the ostree compose configs for Fedora IoT. From 5e0a0a2806afe08d1f38e77b5f4279f0fa5644bc Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 2 Mar 2020 16:32:46 +0000 Subject: [PATCH 05/11] Drop chrony Signed-off-by: Peter Robinson --- fedora-iot-base.json | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/fedora-iot-base.json b/fedora-iot-base.json index 34690b2..3a97b11 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -76,13 +76,12 @@ "kernel", "dracut-config-generic", "dracut-network", "rpm-ostree", "polkit", "lvm2", - "chrony", "zram", "cryptsetup", "pinentry", "keyutils", "cracklib-dicts", "e2fsprogs", "xfsprogs", "dosfstools", "gnupg2", "basesystem", "python3", "bash", - "xz", "gzip", + "xz", "gzip", "zram", "coreutils", "which", "curl", "firewalld", "iptables", "NetworkManager", "NetworkManager-wifi", "NetworkManager-wwan", @@ -97,7 +96,7 @@ "fwupd", "usbguard", "greenboot", "greenboot-grub2", "greenboot-rpm-ostree-grub2", "greenboot-reboot", "greenboot-status", "ignition", - "rsync", + "rsync", "attr", "ima-evm-utils", "bash-completion", "tmux", "screen", @@ -108,8 +107,7 @@ "kernel-tools", "libgpiod-utils", "podman", "container-selinux", "skopeo", "criu", "slirp4netns", - "clevis", "clevis-dracut", "clevis-luks", - "attr"], + "clevis", "clevis-dracut", "clevis-luks"], "packages-aarch64": ["grub2-efi-aa64", "efibootmgr", "shim-aa64", "uboot-tools", "uboot-images-armv8", "bcm283x-firmware", From 3d299177fce3b1f20113379ac46d76ca3777df0e Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 5 Mar 2020 10:49:05 +0000 Subject: [PATCH 06/11] re-add chrony, it's not crond :-/ Signed-off-by: Peter Robinson --- fedora-iot-base.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-iot-base.json b/fedora-iot-base.json index 3a97b11..f20d3a5 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -102,7 +102,7 @@ "tmux", "screen", "policycoreutils-python-utils", "setools-console", - "audit", "rng-tools", + "audit", "rng-tools", "chrony", "bluez", "bluez-libs", "bluez-mesh", "wpan-tools", "kernel-tools", "libgpiod-utils", "podman", "container-selinux", "skopeo", "criu", From 885d5b45d4502f91cd79955901a80ef7f567889a Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 18 Mar 2020 13:10:07 +0000 Subject: [PATCH 07/11] Add zezere-ignition for provisioning Signed-off-by: Peter Robinson --- fedora-iot-base.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-iot-base.json b/fedora-iot-base.json index f20d3a5..5144c1a 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -95,7 +95,7 @@ "less", "tar", "fwupd", "usbguard", "greenboot", "greenboot-grub2", "greenboot-rpm-ostree-grub2", "greenboot-reboot", "greenboot-status", - "ignition", + "ignition", "zezere-ignition", "rsync", "attr", "ima-evm-utils", "bash-completion", From 207049b8bfcae02b4f120095db06af24b43f5da4 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 1 Apr 2020 09:02:17 +0100 Subject: [PATCH 08/11] Enable zezere ignition timer in units Signed-off-by: Peter Robinson --- fedora-iot-base.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-iot-base.json b/fedora-iot-base.json index 5144c1a..cf48a47 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -124,5 +124,5 @@ "default_target": "multi-user.target", - "units": ["NetworkManager.service", "firewalld.service", "rngd.service", "sshd.service", "zram-swap.service"] + "units": ["NetworkManager.service", "firewalld.service", "rngd.service", "sshd.service", "zram-swap.service", "zezere_ignition.timer"] } From 429026f6c5316a618a916803eb76a8cef0e6bfd6 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 2 Apr 2020 11:19:35 +0100 Subject: [PATCH 09/11] zezere: enable service to update provisioning banner Signed-off-by: Peter Robinson --- fedora-iot-base.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-iot-base.json b/fedora-iot-base.json index cf48a47..5cf562c 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -124,5 +124,5 @@ "default_target": "multi-user.target", - "units": ["NetworkManager.service", "firewalld.service", "rngd.service", "sshd.service", "zram-swap.service", "zezere_ignition.timer"] + "units": ["NetworkManager.service", "firewalld.service", "rngd.service", "sshd.service", "zram-swap.service", "zezere_ignition.timer", "zezere_ignition_banner.service"] } From 2a030b6eeb8ef8c4611e92c11172300f6ea15906 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 7 Apr 2020 12:55:00 +0100 Subject: [PATCH 10/11] Add fuse-overlayfs for containers (rhbz 1818744) Signed-off-by: Peter Robinson --- fedora-iot-base.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-iot-base.json b/fedora-iot-base.json index 5cf562c..a1b8317 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -106,7 +106,7 @@ "bluez", "bluez-libs", "bluez-mesh", "wpan-tools", "kernel-tools", "libgpiod-utils", "podman", "container-selinux", "skopeo", "criu", - "slirp4netns", + "slirp4netns", "fuse-overlayfs", "clevis", "clevis-dracut", "clevis-luks"], "packages-aarch64": ["grub2-efi-aa64", "efibootmgr", "shim-aa64", From 12a67f8c0f1560aa1f04303892e14b43b5bf7346 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 28 Apr 2020 10:48:40 +0100 Subject: [PATCH 11/11] move F-32 to stable ostree branch Signed-off-by: Peter Robinson --- config.ini | 4 ++-- fedora-iot-base.json | 2 +- fedora-iot-updates-stable.json | 2 +- fedora-iot-updates-testing.json | 2 +- fedora-iot.json | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config.ini b/config.ini index 87e9368..13c1eaa 100644 --- a/config.ini +++ b/config.ini @@ -11,8 +11,8 @@ tree_name = docker-host tree_file = %(os_name)s-%(tree_name)s.json arch = x86_64 release = f32 -ref = %(os_name)s/devel/%(arch)s/%(tree_name)s -yum_baseurl = http://dl.fedoraproject.org/pub/fedora/linux/development/32/%(arch)s/os/ +ref = %(os_name)s/stable/%(arch)s/%(tree_name)s +yum_baseurl = https://dl.fedoraproject.org/pub/fedora/linux/releases/32/Everything/%(arch)s/os/ # lorax_additional_repos = http://127.0.0.1/fedora-iot/local-overrides lorax_include_packages = fedora-productimg-iot docker_os_name = fedora diff --git a/fedora-iot-base.json b/fedora-iot-base.json index a1b8317..bfff8f0 100644 --- a/fedora-iot-base.json +++ b/fedora-iot-base.json @@ -1,5 +1,5 @@ { - "ref": "fedora/devel/${basearch}/iot", + "ref": "fedora/stable/${basearch}/iot", "ex-jigdo-spec": "fedora-iot.spec", "repos": [], diff --git a/fedora-iot-updates-stable.json b/fedora-iot-updates-stable.json index 1bacd21..aeb0024 100644 --- a/fedora-iot-updates-stable.json +++ b/fedora-iot-updates-stable.json @@ -1,5 +1,5 @@ - "ref": "fedora/devel/${basearch}/updates/iot", + "ref": "fedora/stable/${basearch}/updates/iot", "ex-jigdo-spec": "fedora-iot.spec", "include": "fedora-iot-base.json" } diff --git a/fedora-iot-updates-testing.json b/fedora-iot-updates-testing.json index d0b3866..5d008fe 100644 --- a/fedora-iot-updates-testing.json +++ b/fedora-iot-updates-testing.json @@ -1,5 +1,5 @@ { - "ref": "fedora/devel/${basearch}/testing/iot", + "ref": "fedora/stable/${basearch}/testing/iot", "ex-jigdo-spec": "fedora-iot.spec", "include": "fedora-iot-base.json" } diff --git a/fedora-iot.json b/fedora-iot.json index d2d9e9f..ec5a6ca 100644 --- a/fedora-iot.json +++ b/fedora-iot.json @@ -1,5 +1,5 @@ { - "ref": "fedora/devel/${basearch}/iot", + "ref": "fedora/stable/${basearch}/iot", "ex-jigdo-spec": "fedora-iot.spec", "repos": ["fedora-32"], "include": "fedora-iot-base.json"