Merge pull request #27 from CentOS/squash-sagano

Squash sagano identifier
This commit is contained in:
Liora Milbaum 2023-11-07 16:30:16 +02:00 committed by GitHub
commit 07429c8340
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 31 deletions

View File

@ -7,10 +7,6 @@ from Fedora ELN and CentOS Stream packages.
This is an in-development project not intended for production use yet. This is an in-development project not intended for production use yet.
This project was migrated from [a gitlab repo](https://gitlab.com/centos/cloud/sagano)
and currently container images point to that repository. Reworking
the build system is in progress!
## Trying it out ## Trying it out
See [install.md](./install.md). See [install.md](./install.md).
@ -37,18 +33,18 @@ that can be used as *base images* for RHEL CoreOS; for more on this, see e.g.
## Differences from RHEL for Edge ## Differences from RHEL for Edge
It is an explicit goal that Sagano also becomes a "base input" to RHEL for Edge. It is an explicit goal that CentOS boot also becomes a "base input" to RHEL for Edge.
## What does Sagano means ## What does CentOS boot means
From [Wikipedia](https://en.wikipedia.org/wiki/Bamboo_Forest_(Kyoto,_Japan)): From [Wikipedia](https://en.wikipedia.org/wiki/Bamboo_Forest_(Kyoto,_Japan)):
> Bamboo Forest, Arashiyama Bamboo Grove or Sagano Bamboo Forest, is a natural > Bamboo Forest, Arashiyama Bamboo Grove or CentOS boot Bamboo Forest, is a natural
> forest of bamboo in Arashiyama, Kyoto, Japan > forest of bamboo in Arashiyama, Kyoto, Japan
[1]: https://github.com/openshift/os/blob/master/docs/faq.md#q-what-is-coreos [1]: https://github.com/openshift/os/blob/master/docs/faq.md#q-what-is-coreos
## Demonstration base images for Project Sagano ## Demonstration base images for Project CentOS boot
These images are technology demonstrators, not for production use. The These images are technology demonstrators, not for production use. The
intention is that these images are generated by the OS vendor or intention is that these images are generated by the OS vendor or
@ -87,17 +83,7 @@ users and passwords that way.
## Image matrix (Fedora) ## Image matrix (Fedora)
- `registry.gitlab.com/centos/cloud/sagano/fedora-boot-tier-0:eln` - `quay.io/centos-boot/fedora-tier-1:eln`
- `registry.gitlab.com/centos/cloud/sagano/fedora-boot-tier-1:eln`
## Image matrix (CentOS Stream 9)
- `registry.gitlab.com/centos/cloud/sagano/centos-boot-tier-0:stream9`
- `registry.gitlab.com/centos/cloud/sagano/centos-boot-tier-0-rt:stream9`
(realtime kernel)
- `registry.gitlab.com/centos/cloud/sagano/centos-boot-tier-1:stream9`
- `registry.gitlab.com/centos/cloud/sagano/centos-boot-tier-1-rt:stream9`
(realtime kernel)
### More about image sources ### More about image sources

View File

@ -1,4 +1,4 @@
# Project Sagano tier-1 and cloud agents # Project CentOS boot tier-1 and cloud agents
The tier-0 and tier-1 images today do not contain any special The tier-0 and tier-1 images today do not contain any special
hypervisor-specific agents. The following specifically are not included hypervisor-specific agents. The following specifically are not included

View File

@ -1,4 +1,4 @@
# Trying out Project Sagano development builds # Trying out Project CentOS boot development builds
## Booting directly from KVM guest image ## Booting directly from KVM guest image
@ -16,21 +16,17 @@ Once you've booted this, use e.g. `bootc update` to fetch updates.
[Fedora CoreOS](https://docs.fedoraproject.org/en-US/fedora-coreos/) supports [Fedora CoreOS](https://docs.fedoraproject.org/en-US/fedora-coreos/) supports
many different platforms, and can be used as a starting point to "rebase" to a many different platforms, and can be used as a starting point to "rebase" to a
custom derived image from Sagano. custom derived image from CentOS boot.
```shell ```shell
systemctl mask --now zincati && rm -vf /run/ostree/staged-deployment-locked systemctl mask --now zincati && rm -vf /run/ostree/staged-deployment-locked
echo "# dummy change" >> "/etc/sudoers.d/coreos-sudo-group" echo "# dummy change" >> "/etc/sudoers.d/coreos-sudo-group"
rpm-ostree rebase ostree-unverified-registry:registry.gitlab.com/centos/cloud/sagano/fedora-boot-tier-1-dev:38 rpm-ostree rebase ostree-unverified-registry:quay.io/centos-boot/fedora-tier-1:eln
systemctl reboot systemctl reboot
``` ```
See also [this pull request][1] for more information. See also [this pull request][1] for more information.
## Installing via Anaconda
For this path, see [this page in the sagano-examples](https://gitlab.com/CentOS/cloud/sagano-examples/-/tree/main/tier1-kickstart-unmodified).
## TODO: Use osbuild ## TODO: Use osbuild
Document the ongoing work to materialize a disk image from a container. Document the ongoing work to materialize a disk image from a container.
@ -51,7 +47,7 @@ configuration.
```shell ```shell
dnf -y install podman skopeo dnf -y install podman skopeo
podman run --rm --privileged --pid=host -v /:/target --security-opt label=type:unconfined_t registry.gitlab.com/centos/cloud/sagano-examples/autonomous-podman-hello:latest bootc install-to-filesystem --target-no-signature-verification --karg=console=ttyS0,115200n8 --replace=alongside /target podman run --rm --privileged --pid=host -v /:/target --security-opt label=type:unconfined_t quay.io/centos-boot/fedora-tier-1:eln bootc install-to-filesystem --target-no-signature-verification --karg=console=ttyS0,115200n8 --replace=alongside /target
reboot reboot
``` ```
@ -63,7 +59,6 @@ user state being preserved by the `rpm-ostree rebase`.
What's much more interesting is to generate a custom derived container image, What's much more interesting is to generate a custom derived container image,
and target that instead. For more information, see and target that instead. For more information, see
- <https://gitlab.com/CentOS/cloud/sagano-examples>
- <https://github.com/coreos/layering-examples> - <https://github.com/coreos/layering-examples>
- <https://github.com/openshift/rhcos-image-layering-examples> - <https://github.com/openshift/rhcos-image-layering-examples>

View File

@ -11,6 +11,6 @@ postprocess:
# We want this for systemd-cryptsetup tpm2 locking # We want this for systemd-cryptsetup tpm2 locking
dracutmodules+=" tpm2-tss " dracutmodules+=" tpm2-tss "
EOF EOF
cat > /usr/lib/dracut/dracut.conf.d/01-sagano-base.conf << 'EOF' cat > /usr/lib/dracut/dracut.conf.d/01-centos-boot-base.conf << 'EOF'
dracutmodules+=" kernel-modules dracut-systemd systemd-initrd base " dracutmodules+=" kernel-modules dracut-systemd systemd-initrd base "
EOF EOF

View File

@ -7,7 +7,7 @@
postprocess: postprocess:
- | #!/bin/bash - | #!/bin/bash
mkdir -p /usr/lib/systemd/journald.conf.d/ mkdir -p /usr/lib/systemd/journald.conf.d/
cat >/usr/lib/systemd/journald.conf.d/10-sagano-persistent.conf << EOF cat >/usr/lib/systemd/journald.conf.d/10-centos-boot-persistent.conf << EOF
[Journal] [Journal]
Storage=persistent Storage=persistent
EOF EOF