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

Add dm-crypt kernel module to recovery images #470

Merged
merged 2 commits into from
Sep 9, 2023
Merged

Add dm-crypt kernel module to recovery images #470

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
0d0e386
Add dm-crypt to recovery images, so cryptsetup works
ahesford Sep 8, 2023
d7a0a25
releng/docker: update Void base images
ahesford Sep 8, 2023
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
1 change: 1 addition & 0 deletions etc/zfsbootmenu/recovery.conf.d/recovery.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ install_optional_items+=" /bin/efibootmgr "

# LUKS control
install_optional_items+=" /bin/cryptsetup "
add_drivers+=" dm-crypt "

# Networking
install_optional_items+=" /bin/ip /bin/curl /bin/dhclient /sbin/dhclient-script /bin/ssh "
Expand Down
2 changes: 1 addition & 1 deletion releng/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# repository you want on /zbm inside the container.

# Use the official Void Linux container
FROM voidlinux/voidlinux:latest
FROM ghcr.io/void-linux/void-glibc-full:latest
ARG ZBM_COMMIT_HASH

# Ensure everything is up-to-date
Expand Down
2 changes: 1 addition & 1 deletion releng/docker/image-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ if [ ! -r "${ZBM_BUILDER}" ]; then
fi

maintainer="ZFSBootMenu Team, https://zfsbootmenu.org"
container="$(buildah from ghcr.io/void-linux/void-linux:latest-full-x86_64)"
container="$(buildah from ghcr.io/void-linux/void-glibc-full:latest)"

buildah config --label author="${maintainer}" "${container}"

Expand Down