Skip to content
Merged
Show file tree
Hide file tree
Changes from 11 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
2 changes: 0 additions & 2 deletions 90zfsbootmenu/zfs-chroot.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ if mountpoint="$( allow_rw=yes mount_zfs "${selected}" )"; then
_SHELL="/bin/sh"
else
zerror "unable to test execute a shell in ${selected}"
color=red timed_prompt "Unable to find a working shell in ${selected}"
fi

if [ -n "${_SHELL}" ]; then
Expand All @@ -45,7 +44,6 @@ if mountpoint="$( allow_rw=yes mount_zfs "${selected}" )"; then
# regardless of shell, set PS1
if ! env "PS1=$( colorize orange "${selected}") > " chroot "${mountpoint}" "${_SHELL}" ; then
zerror "unable to execute ${selected}:${_SHELL}"
color=red timed_prompt "Unable to chroot in to ${selected}"
fi
fi

Expand Down
2 changes: 2 additions & 0 deletions 90zfsbootmenu/zfsbootmenu-countdown.sh
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ fi
unsupported=0
while IFS=$'\t' read -r _pool _property; do
if [[ "${_property}" =~ "unsupported@" ]]; then
zerror "unsupported property: ${_property}"
if ! grep -q "${_pool}" "${BASE}/degraded" >/dev/null 2>&1 ; then
echo "${_pool}" >> "${BASE}/degraded"
fi
Expand All @@ -68,6 +69,7 @@ while IFS=$'\t' read -r _pool _property; do
done <<<"$( zpool get all -H -o name,property )"

if [ "${unsupported}" -ne 0 ]; then
zerror "Unsupported features detected, Upgrade ZFS modules in ZFSBootMenu with generate-zbm"
color=red timed_prompt "Unsupported features detected" "Upgrade ZFS modules in ZFSBootMenu with generate-zbm"
fi

Expand Down
3 changes: 2 additions & 1 deletion 90zfsbootmenu/zfsbootmenu-exec.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ fi
echo "Loading ZFSBootMenu ..."

export BASE="/zfsbootmenu"
mkdir -p "${BASE}"

modprobe zfs 2>/dev/null
udevadm settle
Expand All @@ -44,7 +45,7 @@ udevadm settle
#shellcheck disable=SC2154
if [ -n "${zbm_tmux}" ] && [ -x /bin/tmux ]; then
tmux new-session -n ZFSBootMenu -d /libexec/zfsbootmenu-countdown
tmux new-window -n logs /bin/zlogtail
tmux new-window -n logs /bin/zlogtail -f -n
tmux new-window -n shell /bin/bash
exec tmux attach-session \; select-window -t ZFSBootMenu
else
Expand Down
Loading