From 1b496a6b058cd367825a1640f8cb7da81a035d1a Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Wed, 1 May 2024 08:56:24 -0500
Subject: [PATCH] contrib: remove system hook, clean up docs

---
 contrib/20-console-autosize.sh | 37 ----------------------------------
 contrib/README.md              | 16 ---------------
 2 files changed, 53 deletions(-)
 delete mode 100755 contrib/20-console-autosize.sh

diff --git a/contrib/20-console-autosize.sh b/contrib/20-console-autosize.sh
deleted file mode 100755
index 0e6ea87c6..000000000
--- a/contrib/20-console-autosize.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-# vim: softtabstop=2 shiftwidth=2 expandtab
-
-## This early-setup hook attempts to get a physical (non-serial) console
-## to at least 100 columns. The Dracut module 'i18n' is required to populate
-## /usr/share/consolefonts and to add the 'setfont' binary.
-##
-## This hook is enabled by default in Release and Recovery builds. To disable,
-## add `zbm.autosize=off` to the ZFSBootMenu kernel commandline.
-## If rd.vconsole.font is defined, autosizing is skipped to not override
-## this font preference.
-
-
-#shellcheck disable=SC1091
-source /lib/zfsbootmenu-kcl.sh || exit 1
-source /lib/kmsg-log-lib.sh || exit 1
-
-if [ -z "${control_term}" ] && [ -f /etc/zfsbootmenu.conf ]; then
-  #shellcheck disable=SC1091
-  source /etc/zfsbootmenu.conf
-fi
-
-[ -c "${control_term}" ] || exit 1
-
-# Ensure that control_term is not a serial console
-tty_re='/dev/tty[0-9]'
-[[ ${control_term} =~ ${tty_re} ]] || exit 1
-
-if get_zbm_bool 1 zbm.autosize && ! font=$( get_zbm_arg rd.vconsole.font ) ; then
-  for font in ter-v32b ter-v28b ter-v24b ter-v20b ter-v14b ; do
-    setfont "${font}" >/dev/null 2>&1
-    if [ "${COLUMNS}" -ge 100 ]; then
-      zdebug "set font to ${font}, screen is ${COLUMNS}x${LINES}"
-      break
-    fi
-  done
-fi
diff --git a/contrib/README.md b/contrib/README.md
index e87530908..d873d98d1 100644
--- a/contrib/README.md
+++ b/contrib/README.md
@@ -14,15 +14,6 @@ ZFSBootMenu images.
 Brief descriptions of contributed scripts appear below for convenience. Please
 review the scripts themselves for more thorough descriptions of their use.
 
-- `10-console-init.sh` - In some configurations, the dracut event loop that
-  configures the ZFSBootMenu environment will fail to initialize the console
-  with desired font and keymap settings. This script can be added as an "early
-  setup" hook to force console initialization.
-
-- `20-console-autosize.sh` - This early-setup hook will run through a set of
-  fonts, selecting the largest font that guarantees a console with at least 100
-  columns. This should ensure a usable default font even on high-DPI displays.
-
 - `esp-sync.sh` - This script can run as a "post-image" hook to `generate-zbm`
   to synchronize the contents of one EFI system partition with others, providing
   tolerance against disk failures.
@@ -50,12 +41,5 @@ review the scripts themselves for more thorough descriptions of their use.
   an extension to basic functionality that was originally built into
   `generate-zbm` itself.
 
-- `xhci-teardown.sh` - ZFSBootMenu relies on `kexec` to launch kernels
-  within boot environments. Some hardware, including certain XHCI USB
-  controllers, cannot be properly re-initialized after `kexec` jumps into the
-  new kernel. This teardown hook unbinds all detected XHCI controllers from the
-  ZFSBootMenu kernel before jumping into the new kernel, allowing devices to be
-  properly initialized.
-
 - `zbm-sign.pl` - A Perl script, suitable for use as a generate-zbm post-run
   hook, that will sign ZFSBootMenu EFI images for use with Secure Boot.