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.

Sign up for GitHub

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

improve: sanoid should install on minimal if zfs #182

Closed
wants to merge 2 commits into from
Closed

improve: sanoid should install on minimal if zfs #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d0cafc
improve: sanoid should install on minimal if zfs
johnmmcgee Aug 4, 2024
ad3b3f5
improve: combine into one conditional
johnmmcgee Aug 5, 2024
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 ucore/install-ucore-minimal.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,13 @@ else
/tmp/rpms/kernel/kernel-modules-*.rpm
fi

## CONDITIONAL: install ZFS (and sanoid deps)
## CONDITIONAL: install ZFS (and sanoid with deps)
if [[ "-zfs" == "${ZFS_TAG}" ]]; then
rpm-ostree install pv /tmp/rpms/akmods-zfs/kmods/zfs/*.rpm
# for some reason depmod ran automatically with zfs 2.1 but not with 2.2
depmod -A ${KERNEL_VERSION}

rpm-ostree install sanoid
fi

## CONDITIONAL: install NVIDIA
Expand Down
5 changes: 0 additions & 5 deletions ucore/install-ucore.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,6 @@ set -ouex pipefail

RELEASE="$(rpm -E %fedora)"

## CONDITIONAL: install sanoid if ZFS
if [[ "-zfs" == "${ZFS_TAG}" ]]; then
rpm-ostree install sanoid
fi

# install packages.json stuffs
export IMAGE_NAME=ucore
/ctx/packages.sh
Expand Down