Compare commits
11 commits
f44-stable
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
87eaa6a42b | ||
|
|
f570c87de9 | ||
|
|
63d2e9c3f5 | ||
|
3738d4889f |
||
|
ce42103746 |
|||
|
|
e49d841a84 | ||
|
|
1b3ede31d9 | ||
|
|
7a121ed5e7 | ||
|
|
e0898e8a38 | ||
|
|
240bff70e7 | ||
|
|
dccd3a2e18 |
7 changed files with 15 additions and 14 deletions
|
|
@ -1,5 +1,5 @@
|
||||||
# KEEP THIS IN SYNC WITH https://github.com/coreos/fedora-coreos-config/blob/testing-devel/manifests/bootupd.yaml
|
# KEEP THIS IN SYNC WITH https://github.com/coreos/fedora-coreos-config/blob/testing-devel/manifests/bootupd.yaml
|
||||||
# See also: https://pagure.io/workstation-ostree-config/blob/main/f/bootupd.yaml
|
# See also: https://forge.fedoraproject.org/atomic-desktops/config/src/branch/main/bootupd.yaml
|
||||||
#
|
#
|
||||||
# Integration with https://github.com/coreos/bootupd
|
# Integration with https://github.com/coreos/bootupd
|
||||||
packages:
|
packages:
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ os_pretty_name = Fedora IoT
|
||||||
tree_name = docker-host
|
tree_name = docker-host
|
||||||
tree_file = %(os_name)s-%(tree_name)s.json
|
tree_file = %(os_name)s-%(tree_name)s.json
|
||||||
arch = x86_64
|
arch = x86_64
|
||||||
release = f44
|
release = f46
|
||||||
ref = %(os_name)s/rawhide/%(arch)s/%(tree_name)s
|
ref = %(os_name)s/rawhide/%(arch)s/%(tree_name)s
|
||||||
yum_baseurl = http://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/%(arch)s/os/
|
yum_baseurl = http://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/%(arch)s/os/
|
||||||
# lorax_additional_repos = http://127.0.0.1/fedora-iot/local-overrides
|
# lorax_additional_repos = http://127.0.0.1/fedora-iot/local-overrides
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
[fedora-44]
|
[fedora-46]
|
||||||
name=Fedora 44 - $basearch
|
name=Fedora 46 - $basearch
|
||||||
failovermethod=priority
|
failovermethod=priority
|
||||||
#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/44/Everything/$basearch/os/
|
#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/46/Everything/$basearch/os/
|
||||||
metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-44&arch=$basearch
|
metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-46&arch=$basearch
|
||||||
enabled=1
|
enabled=1
|
||||||
#metadata_expire=7d
|
#metadata_expire=7d
|
||||||
repo_gpgcheck=0
|
repo_gpgcheck=0
|
||||||
type=rpm
|
type=rpm
|
||||||
gpgcheck=1
|
gpgcheck=1
|
||||||
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-44-$basearch
|
gpgkey=file:///usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-46-$basearch
|
||||||
skip_if_unavailable=False
|
skip_if_unavailable=False
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
include:
|
include:
|
||||||
- bootupd.yaml
|
- bootupd.yaml
|
||||||
# Enable composefs
|
# Enable composefs
|
||||||
- composefs.yaml
|
- composefs.yaml
|
||||||
|
|
@ -10,8 +10,8 @@ selinux: true
|
||||||
tmp-is-dir: true
|
tmp-is-dir: true
|
||||||
recommends: false
|
recommends: false
|
||||||
documentation: false
|
documentation: false
|
||||||
automatic_version_prefix: '44'
|
automatic_version_prefix: '46'
|
||||||
mutate-os-release: '44'
|
mutate-os-release: '46'
|
||||||
initramfs-args:
|
initramfs-args:
|
||||||
- "--no-hostonly"
|
- "--no-hostonly"
|
||||||
- "--add"
|
- "--add"
|
||||||
|
|
@ -122,7 +122,6 @@ packages:
|
||||||
- greenboot-default-health-checks
|
- greenboot-default-health-checks
|
||||||
- gzip
|
- gzip
|
||||||
- hostname
|
- hostname
|
||||||
- ignition
|
|
||||||
- ignition-edge
|
- ignition-edge
|
||||||
- ima-evm-utils
|
- ima-evm-utils
|
||||||
- iproute
|
- iproute
|
||||||
|
|
@ -131,6 +130,7 @@ packages:
|
||||||
- iwlwifi-mvm-firmware
|
- iwlwifi-mvm-firmware
|
||||||
- kernel
|
- kernel
|
||||||
- keyutils
|
- keyutils
|
||||||
|
- kmscon
|
||||||
- less
|
- less
|
||||||
- libsss_sudo
|
- libsss_sudo
|
||||||
- linux-firmware
|
- linux-firmware
|
||||||
|
|
@ -163,6 +163,7 @@ packages:
|
||||||
- sssd-client
|
- sssd-client
|
||||||
- sudo
|
- sudo
|
||||||
- systemd
|
- systemd
|
||||||
|
- systemd-pam
|
||||||
- systemd-resolved
|
- systemd-resolved
|
||||||
- tar
|
- tar
|
||||||
- tmux
|
- tmux
|
||||||
|
|
|
||||||
|
|
@ -2,4 +2,4 @@ include: fedora-iot-base.yaml
|
||||||
ref: fedora/rawhide/${basearch}/iot
|
ref: fedora/rawhide/${basearch}/iot
|
||||||
|
|
||||||
repos:
|
repos:
|
||||||
- fedora-44
|
- fedora-46
|
||||||
|
|
|
||||||
2
justfile
2
justfile
|
|
@ -87,7 +87,7 @@ compose-legacy variant=default_variant:
|
||||||
|
|
||||||
${CMD} compose tree ${ARGS} \
|
${CMD} compose tree ${ARGS} \
|
||||||
--add-metadata-string="version=${variant_pretty} ${version}.${buildid}" \
|
--add-metadata-string="version=${variant_pretty} ${version}.${buildid}" \
|
||||||
"${variant}-ostree.yaml" \
|
"${variant}.yaml" \
|
||||||
|& tee "logs/${variant}_${version}_${buildid}.${timestamp}.log"
|
|& tee "logs/${variant}_${version}_${buildid}.${timestamp}.log"
|
||||||
|
|
||||||
if [[ ${EUID} -ne 0 ]]; then
|
if [[ ${EUID} -ne 0 ]]; then
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,7 @@ done
|
||||||
|
|
||||||
# Remove loader directory causing issues in Anaconda in unified core mode
|
# Remove loader directory causing issues in Anaconda in unified core mode
|
||||||
# Will be obsolete once we start using bootupd
|
# Will be obsolete once we start using bootupd
|
||||||
# See - https://pagure.io/workstation-ostree-config/pull-request/344
|
# See - https://forge.fedoraproject.org/atomic-desktops/config/pulls/344
|
||||||
rm -rf /usr/lib/ostree-boot/loader
|
rm -rf /usr/lib/ostree-boot/loader
|
||||||
|
|
||||||
# Undo RPM scripts enabling units; we want the presets to be canonical
|
# Undo RPM scripts enabling units; we want the presets to be canonical
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue