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

Jump to bottom

Fix ZFSBootMenu initialization with systemd #613

Closed
wants to merge 1 commit into from
Closed

Fix ZFSBootMenu initialization with systemd #613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions zfsbootmenu/pre-init/zfsbootmenu-parse-commandline.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,9 @@ else
zinfo "defaulting controlling terminal to: ${control_term}"
fi

# Make sure control_term is available for zfsbootmenu-preinit.sh
export control_term

# hostid - discover the hostid used to import a pool on failure, assume it
# force - append -f to zpool import
# strict - legacy behavior, drop to an emergency shell on failure
Expand Down
2 changes: 1 addition & 1 deletion zfsbootmenu/pre-init/zfsbootmenu-preinit.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,5 @@ EOF
echo "ZFSBootMenu" > /proc/sys/kernel/hostname

# https://busybox.net/FAQ.html#job_control
ZFSBOOTMENU_CONSOLE=yes exec setsid \
ZFSBOOTMENU_CONSOLE=yes setsid \
bash -c "exec /libexec/zfsbootmenu-init <${control_term} >${control_term} 2>&1"