Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: add miscellanous improvements #118

Merged
merged 3 commits into from
Jan 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,9 @@ Suitable for running containerized workloads on either bare metal or virtual mac
- [nvidia-container-toolkit](https://docs.nvidia.com/datacenter/cloud-native/container-toolkit/latest/sample-workload.html) - latest toolkit which supports both root and rootless podman containers and CDI
- [nvidia container selinux policy](https://github.com/NVIDIA/dgx-selinux/tree/master/src/nvidia-container-selinux) - allows using `--security-opt label=type:nvidia_container_t` for some jobs (some will still need `--security-opt label=disable` as suggested by nvidia)
- Optional [ZFS versions](#tag-matrix) add:
- [sanoid/syncoid dependencies](https://github.com/jimsalterjrs/sanoid) - [see below](#zfs) for details
- [ZFS driver](https://github.com/ublue-os/ucore-kmods) - latest driver (currently pinned to 2.2.x series)
- [sanoid/syncoid dependencies](https://github.com/jimsalterjrs/sanoid) - [see below](#zfs) for details
- note: on `ucore-minimal` images, only `pv` is installed
- Disables Zincati auto upgrade/reboot service
- Enables staging of automatic system updates via rpm-ostreed
- Enables password based SSH auth (required for locally running cockpit web interface)
Expand All @@ -82,6 +83,7 @@ This image builds on `ucore-minimal` but adds drivers, storage tools and utiliti
- intel wifi firmware - CoreOS omits this despite including atheros wifi firmware... hardware enablement FTW
- [mergerfs](https://github.com/trapexit/mergerfs)
- [snapraid](https://www.snapraid.it/)
- usbutils(and pciutils) - technically pciutils is pulled in by open-vm-tools in ucore-minimal

### `ucore-hci`

Expand Down
1 change: 1 addition & 0 deletions fedora-coreos/Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ ARG NVIDIA_TAG="${NVIDIA_TAG}"
ARG ZFS_TAG="${ZFS_TAG}"
ARG KMOD_SRC="${KMOD_SRC:-ghcr.io/ublue-os/ucore-kmods:${COREOS_VERSION}}"

COPY --from=${KMOD_SRC} /rpms/kmods/*.rpm /tmp/rpms/
COPY --from=${KMOD_SRC} /rpms/kmods/nvidia/*.rpm /tmp/rpms/nvidia/
COPY --from=${KMOD_SRC} /rpms/kmods/zfs/*.rpm /tmp/rpms/zfs/

Expand Down
4 changes: 3 additions & 1 deletion fedora-coreos/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/fedora-cisco-openh264.repo
# inspect to see what RPMS we copied in
find /tmp/rpms/

## CONDITIONAL: install ZFS (and sanoid deps)
rpm-ostree install /tmp/rpms/ublue-os-ucore-addons-*.rpm

## CONDITIONAL: install ZFS
if [[ "-zfs" == "${ZFS_TAG}" ]]; then
rpm-ostree install pv /tmp/rpms/zfs/*.rpm
# for some reason depmod ran automatically with zfs 2.1 but not with 2.2
Expand Down
2 changes: 2 additions & 0 deletions ucore/install-ucore-minimal.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ if [[ "-zfs" == "${ZFS_TAG}" ]]; then
mhash \
perl-Capture-Tiny \
perl-Config-IniFiles \
perl-Data-Dumper \
perl-Getopt-Long \
perl-Sys-Hostname \
pv
# for some reason depmod ran automatically with zfs 2.1 but not with 2.2
depmod -A ${KERNEL}
Expand Down
2 changes: 2 additions & 0 deletions ucore/packages.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@
"iwlegacy-firmware",
"iwlwifi-dvm-firmware",
"iwlwifi-mvm-firmware",
"pciutils",
"snapraid",
"usbutils",
"xdg-dbus-proxy",
"xdg-user-dirs"
],
Expand Down