Update 90-loaderentry* to systemd 254 and add support for loading additional images
This commit is contained in:
dalto
parent
56f8cfe6a5
commit
de5c9bcd38
|
|
@ -16,46 +16,52 @@
|
|||
# General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Lesser General Public License
|
||||
# along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
||||
# along with systemd; If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
COMMAND="$1"
|
||||
KERNEL_VERSION="$2"
|
||||
ENTRY_DIR_ABS="$3"
|
||||
set -e
|
||||
|
||||
COMMAND="${1:?}"
|
||||
KERNEL_VERSION="${2:?}"
|
||||
ENTRY_DIR_ABS="${3:?}"
|
||||
KERNEL_IMAGE="$4"
|
||||
INITRD_OPTIONS_SHIFT=4
|
||||
|
||||
[ "$KERNEL_INSTALL_LAYOUT" = "bls" ] || exit 0
|
||||
|
||||
MACHINE_ID="$KERNEL_INSTALL_MACHINE_ID"
|
||||
ENTRY_TOKEN="$KERNEL_INSTALL_ENTRY_TOKEN"
|
||||
BOOT_ROOT="$KERNEL_INSTALL_BOOT_ROOT"
|
||||
MACHINE_ID="${KERNEL_INSTALL_MACHINE_ID:?}"
|
||||
ENTRY_TOKEN="${KERNEL_INSTALL_ENTRY_TOKEN:?}"
|
||||
BOOT_ROOT="${KERNEL_INSTALL_BOOT_ROOT:?}"
|
||||
|
||||
BOOT_MNT="$(stat -c %m "$BOOT_ROOT")"
|
||||
[ -n "$BOOT_MNT" ] || BOOT_MNT="$(stat -c %m "$BOOT_ROOT")"
|
||||
if [ "$BOOT_MNT" = '/' ]; then
|
||||
ENTRY_DIR="$ENTRY_DIR_ABS"
|
||||
else
|
||||
ENTRY_DIR="${ENTRY_DIR_ABS#"$BOOT_MNT"}"
|
||||
fi
|
||||
|
||||
KERNEL_DEST="$ENTRY_DIR_ABS/linux"
|
||||
KERNEL_ENTRY="$ENTRY_DIR/linux"
|
||||
LOADER_ENTRY="$BOOT_ROOT/loader/entries/$ENTRY_TOKEN-$KERNEL_VERSION.conf"
|
||||
|
||||
case "$COMMAND" in
|
||||
remove)
|
||||
[ "$KERNEL_INSTALL_VERBOSE" -gt 0 ] && \
|
||||
echo "Removing $BOOT_ROOT/loader/entries/$ENTRY_TOKEN-$KERNEL_VERSION*.conf"
|
||||
echo "Removing ${LOADER_ENTRY%.conf}*.conf"
|
||||
exec rm -f \
|
||||
"$BOOT_ROOT/loader/entries/$ENTRY_TOKEN-$KERNEL_VERSION.conf" \
|
||||
"$BOOT_ROOT/loader/entries/$ENTRY_TOKEN-$KERNEL_VERSION+"*".conf"
|
||||
"$LOADER_ENTRY" \
|
||||
"${LOADER_ENTRY%.conf}"*".conf"
|
||||
;;
|
||||
add)
|
||||
;;
|
||||
*)
|
||||
exit 1
|
||||
exit 0
|
||||
;;
|
||||
esac
|
||||
|
||||
if [ -r /etc/os-release ]; then
|
||||
if [ -f /etc/os-release ]; then
|
||||
# shellcheck source=/dev/null
|
||||
. /etc/os-release
|
||||
elif [ -r /usr/lib/os-release ]; then
|
||||
elif [ -f /usr/lib/os-release ]; then
|
||||
# shellcheck source=/dev/null
|
||||
. /usr/lib/os-release
|
||||
fi
|
||||
|
|
@ -65,9 +71,13 @@ fi
|
|||
SORT_KEY="$IMAGE_ID"
|
||||
[ -z "$SORT_KEY" ] && SORT_KEY="$ID-$KERNEL_VERSION"
|
||||
|
||||
if [ -r /etc/kernel/cmdline ]; then
|
||||
if [ -n "$KERNEL_INSTALL_CONF_ROOT" ]; then
|
||||
if [ -f "$KERNEL_INSTALL_CONF_ROOT/cmdline" ]; then
|
||||
BOOT_OPTIONS="$(tr -s "$IFS" ' ' <"$KERNEL_INSTALL_CONF_ROOT/cmdline")"
|
||||
fi
|
||||
elif [ -f /etc/kernel/cmdline ]; then
|
||||
BOOT_OPTIONS="$(tr -s "$IFS" ' ' </etc/kernel/cmdline)"
|
||||
elif [ -r /usr/lib/kernel/cmdline ]; then
|
||||
elif [ -f /usr/lib/kernel/cmdline ]; then
|
||||
BOOT_OPTIONS="$(tr -s "$IFS" ' ' </usr/lib/kernel/cmdline)"
|
||||
else
|
||||
BOOT_OPTIONS="$(tr -s "$IFS" '\n' </proc/cmdline | grep -ve '^BOOT_IMAGE=' -e '^initrd=' | tr '\n' ' ')"
|
||||
|
|
@ -79,19 +89,19 @@ BOOT_OPTIONS="${BOOT_OPTIONS% }"
|
|||
# command line with the machine ID we use, so that the machine ID remains
|
||||
# stable, even during factory reset, in the initrd (where the system's machine
|
||||
# ID is not directly accessible yet), and if the root file system is volatile.
|
||||
if [ "$ENTRY_TOKEN" = "$MACHINE_ID" ]; then
|
||||
if [ "$ENTRY_TOKEN" = "$MACHINE_ID" ] && ! echo "$BOOT_OPTIONS" | grep -q "systemd.machine_id="; then
|
||||
BOOT_OPTIONS="$BOOT_OPTIONS systemd.machine_id=$MACHINE_ID"
|
||||
fi
|
||||
|
||||
if [ -r /etc/kernel/tries ]; then
|
||||
read -r TRIES </etc/kernel/tries
|
||||
TRIES_FILE="${KERNEL_INSTALL_CONF_ROOT:-/etc/kernel}/tries"
|
||||
|
||||
if [ -f "$TRIES_FILE" ]; then
|
||||
read -r TRIES <"$TRIES_FILE"
|
||||
if ! echo "$TRIES" | grep -q '^[0-9][0-9]*$'; then
|
||||
echo "/etc/kernel/tries does not contain an integer." >&2
|
||||
echo "$TRIES_FILE does not contain an integer." >&2
|
||||
exit 1
|
||||
fi
|
||||
LOADER_ENTRY="$BOOT_ROOT/loader/entries/$ENTRY_TOKEN-$KERNEL_VERSION+$TRIES.conf"
|
||||
else
|
||||
LOADER_ENTRY="$BOOT_ROOT/loader/entries/$ENTRY_TOKEN-$KERNEL_VERSION.conf"
|
||||
LOADER_ENTRY="${LOADER_ENTRY%.conf}+$TRIES.conf"
|
||||
fi
|
||||
|
||||
if ! [ -d "$ENTRY_DIR_ABS" ]; then
|
||||
|
|
@ -99,26 +109,31 @@ if ! [ -d "$ENTRY_DIR_ABS" ]; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
install -g root -o root -m 0644 "$KERNEL_IMAGE" "$ENTRY_DIR_ABS/linux" || {
|
||||
echo "Error: could not copy '$KERNEL_IMAGE' to '$ENTRY_DIR_ABS/linux'." >&2
|
||||
install -m 0644 "$KERNEL_IMAGE" "$KERNEL_DEST" || {
|
||||
echo "Error: could not copy '$KERNEL_IMAGE' to '$KERNEL_DEST'." >&2
|
||||
exit 1
|
||||
}
|
||||
chown root:root "$KERNEL_DEST" || :
|
||||
|
||||
shift "$INITRD_OPTIONS_SHIFT"
|
||||
# All files listed as arguments, and staged files starting with "initrd" are installed as initrds.
|
||||
for initrd in "$@" "${KERNEL_INSTALL_STAGING_AREA}"/initrd*; do
|
||||
for initrd in "${KERNEL_INSTALL_STAGING_AREA}"/microcode* "${@}" "${KERNEL_INSTALL_STAGING_AREA}"/initrd*; do
|
||||
[ -f "$initrd" ] || {
|
||||
[ "$initrd" = "${KERNEL_INSTALL_STAGING_AREA}/initrd*" ] && continue
|
||||
echo "Error: initrd '$initrd' not a file." >&2
|
||||
case "$initrd" in
|
||||
"${KERNEL_INSTALL_STAGING_AREA}/initrd*" | "${KERNEL_INSTALL_STAGING_AREA}/microcode*")
|
||||
continue ;;
|
||||
esac
|
||||
echo "Error: '$initrd' is not a file." >&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
initrd_basename="${initrd##*/}"
|
||||
[ "$KERNEL_INSTALL_VERBOSE" -gt 0 ] && echo "Installing $ENTRY_DIR_ABS/$initrd_basename"
|
||||
install -g root -o root -m 0644 "$initrd" "$ENTRY_DIR_ABS/$initrd_basename" || {
|
||||
install -m 0644 "$initrd" "$ENTRY_DIR_ABS/$initrd_basename" || {
|
||||
echo "Error: could not copy '$initrd' to '$ENTRY_DIR_ABS/$initrd_basename'." >&2
|
||||
exit 1
|
||||
}
|
||||
chown root:root "$ENTRY_DIR_ABS/$initrd_basename" || :
|
||||
done
|
||||
|
||||
mkdir -p "${LOADER_ENTRY%/*}" || {
|
||||
|
|
@ -128,6 +143,8 @@ mkdir -p "${LOADER_ENTRY%/*}" || {
|
|||
|
||||
[ "$KERNEL_INSTALL_VERBOSE" -gt 0 ] && echo "Creating $LOADER_ENTRY"
|
||||
{
|
||||
echo "# Boot Loader Specification type#1 entry"
|
||||
echo "# File created by $0 (systemd 254.1-1-arch)"
|
||||
echo "title $PRETTY_NAME"
|
||||
echo "version $KERNEL_VERSION"
|
||||
if [ "$ENTRY_TOKEN" = "$MACHINE_ID" ]; then
|
||||
|
|
@ -136,10 +153,10 @@ mkdir -p "${LOADER_ENTRY%/*}" || {
|
|||
fi
|
||||
[ -n "$SORT_KEY" ] && echo "sort-key $SORT_KEY"
|
||||
echo "options $BOOT_OPTIONS"
|
||||
echo "linux $ENTRY_DIR/linux"
|
||||
echo "linux $KERNEL_ENTRY"
|
||||
|
||||
have_initrd=
|
||||
for initrd in "${@}" "${KERNEL_INSTALL_STAGING_AREA}"/initrd*; do
|
||||
for initrd in "${KERNEL_INSTALL_STAGING_AREA}"/microcode* "${@}" "${KERNEL_INSTALL_STAGING_AREA}"/initrd* "${ENTRY_DIR_ABS}/initrd"; do
|
||||
[ -f "$initrd" ] || continue
|
||||
echo "initrd $ENTRY_DIR/${initrd##*/}"
|
||||
have_initrd=yes
|
||||
|
|
|
|||
|
|
@ -16,52 +16,52 @@
|
|||
# General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Lesser General Public License
|
||||
# along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
||||
# along with systemd; If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
COMMAND="$1"
|
||||
KERNEL_VERSION="$2"
|
||||
ENTRY_DIR_ABS="$3"
|
||||
set -e
|
||||
|
||||
COMMAND="${1:?}"
|
||||
KERNEL_VERSION="${2:?}"
|
||||
ENTRY_DIR_ABS="${3:?}"
|
||||
KERNEL_IMAGE="$4"
|
||||
INITRD_OPTIONS_SHIFT=4
|
||||
|
||||
[ "$KERNEL_INSTALL_LAYOUT" = "bls" ] || exit 0
|
||||
|
||||
# Read the optional config file for automation
|
||||
[[ -f /etc/kernel-install-for-dracut.conf ]] && source /etc/kernel-install-for-dracut.conf
|
||||
MACHINE_ID="${KERNEL_INSTALL_MACHINE_ID:?}"
|
||||
ENTRY_TOKEN="${KERNEL_INSTALL_ENTRY_TOKEN:?}"
|
||||
BOOT_ROOT="${KERNEL_INSTALL_BOOT_ROOT:?}"
|
||||
|
||||
MACHINE_ID="$KERNEL_INSTALL_MACHINE_ID"
|
||||
ENTRY_TOKEN="$KERNEL_INSTALL_ENTRY_TOKEN"
|
||||
BOOT_ROOT="$KERNEL_INSTALL_BOOT_ROOT"
|
||||
|
||||
BOOT_MNT="$(stat -c %m "$BOOT_ROOT")"
|
||||
[ -n "$BOOT_MNT" ] || BOOT_MNT="$(stat -c %m "$BOOT_ROOT")"
|
||||
if [ "$BOOT_MNT" = '/' ]; then
|
||||
ENTRY_DIR="$ENTRY_DIR_ABS"
|
||||
else
|
||||
ENTRY_DIR="${ENTRY_DIR_ABS#"$BOOT_MNT"}"
|
||||
fi
|
||||
|
||||
KERNEL_DEST="$ENTRY_DIR_ABS/linux"
|
||||
KERNEL_ENTRY="$ENTRY_DIR/linux"
|
||||
LOADER_ENTRY="$BOOT_ROOT/loader/entries/${ENTRY_TOKEN}-${KERNEL_VERSION}-fallback.conf"
|
||||
|
||||
case "$COMMAND" in
|
||||
remove)
|
||||
[ "$KERNEL_INSTALL_VERBOSE" -gt 0 ] && \
|
||||
echo "Removing $BOOT_ROOT/loader/entries/$ENTRY_TOKEN-$KERNEL_VERSION-fallback*.conf"
|
||||
echo "Removing ${LOADER_ENTRY%.conf}*.conf"
|
||||
exec rm -f \
|
||||
"$BOOT_ROOT/loader/entries/$ENTRY_TOKEN-$KERNEL_VERSION-fallback.conf" \
|
||||
"$BOOT_ROOT/loader/entries/$ENTRY_TOKEN-$KERNEL_VERSION-fallback+"*".conf" 2> /dev/null || true
|
||||
"$LOADER_ENTRY" \
|
||||
"${LOADER_ENTRY%.conf}"*".conf"
|
||||
;;
|
||||
add)
|
||||
;;
|
||||
*)
|
||||
exit 1
|
||||
exit 0
|
||||
;;
|
||||
esac
|
||||
|
||||
# Do nothing if the user has elected to omit the fallback initrd
|
||||
[[ ${NO_DRACUT_FALLBACK} == "true" ]] && exit 0
|
||||
|
||||
if [ -r /etc/os-release ]; then
|
||||
if [ -f /etc/os-release ]; then
|
||||
# shellcheck source=/dev/null
|
||||
. /etc/os-release
|
||||
elif [ -r /usr/lib/os-release ]; then
|
||||
elif [ -f /usr/lib/os-release ]; then
|
||||
# shellcheck source=/dev/null
|
||||
. /usr/lib/os-release
|
||||
fi
|
||||
|
|
@ -69,13 +69,17 @@ fi
|
|||
[ -n "$PRETTY_NAME" ] || PRETTY_NAME="Linux $KERNEL_VERSION"
|
||||
|
||||
SORT_KEY="$IMAGE_ID"
|
||||
[ -z "$SORT_KEY" ] && SORT_KEY="$ID-$KERNEL_VERSION-fallback"
|
||||
[ -z "$SORT_KEY" ] && SORT_KEY="$ID-${KERNEL_VERSION}-fallback"
|
||||
|
||||
if [ -r /etc/kernel/cmdline_fb ]; then
|
||||
if [ -n "$KERNEL_INSTALL_CONF_ROOT" ]; then
|
||||
if [ -f "$KERNEL_INSTALL_CONF_ROOT/cmdline" ]; then
|
||||
BOOT_OPTIONS="$(tr -s "$IFS" ' ' <"$KERNEL_INSTALL_CONF_ROOT/cmdline")"
|
||||
fi
|
||||
elif [ -r /etc/kernel/cmdline_fb ]; then
|
||||
BOOT_OPTIONS="$(tr -s "$IFS" ' ' </etc/kernel/cmdline_fb)"
|
||||
elif [ -r /etc/kernel/cmdline ]; then
|
||||
elif [ -f /etc/kernel/cmdline ]; then
|
||||
BOOT_OPTIONS="$(tr -s "$IFS" ' ' </etc/kernel/cmdline)"
|
||||
elif [ -r /usr/lib/kernel/cmdline ]; then
|
||||
elif [ -f /usr/lib/kernel/cmdline ]; then
|
||||
BOOT_OPTIONS="$(tr -s "$IFS" ' ' </usr/lib/kernel/cmdline)"
|
||||
else
|
||||
BOOT_OPTIONS="$(tr -s "$IFS" '\n' </proc/cmdline | grep -ve '^BOOT_IMAGE=' -e '^initrd=' | tr '\n' ' ')"
|
||||
|
|
@ -87,19 +91,19 @@ BOOT_OPTIONS="${BOOT_OPTIONS% }"
|
|||
# command line with the machine ID we use, so that the machine ID remains
|
||||
# stable, even during factory reset, in the initrd (where the system's machine
|
||||
# ID is not directly accessible yet), and if the root file system is volatile.
|
||||
if [ "$ENTRY_TOKEN" = "$MACHINE_ID" ]; then
|
||||
if [ "$ENTRY_TOKEN" = "$MACHINE_ID" ] && ! echo "$BOOT_OPTIONS" | grep -q "systemd.machine_id="; then
|
||||
BOOT_OPTIONS="$BOOT_OPTIONS systemd.machine_id=$MACHINE_ID"
|
||||
fi
|
||||
|
||||
if [ -r /etc/kernel/tries ]; then
|
||||
read -r TRIES </etc/kernel/tries
|
||||
TRIES_FILE="${KERNEL_INSTALL_CONF_ROOT:-/etc/kernel}/tries"
|
||||
|
||||
if [ -f "$TRIES_FILE" ]; then
|
||||
read -r TRIES <"$TRIES_FILE"
|
||||
if ! echo "$TRIES" | grep -q '^[0-9][0-9]*$'; then
|
||||
echo "/etc/kernel/tries does not contain an integer." >&2
|
||||
echo "$TRIES_FILE does not contain an integer." >&2
|
||||
exit 1
|
||||
fi
|
||||
LOADER_ENTRY="$BOOT_ROOT/loader/entries/$ENTRY_TOKEN-$KERNEL_VERSION-fallback+$TRIES.conf"
|
||||
else
|
||||
LOADER_ENTRY="$BOOT_ROOT/loader/entries/$ENTRY_TOKEN-$KERNEL_VERSION-fallback.conf"
|
||||
LOADER_ENTRY="${LOADER_ENTRY%.conf}+$TRIES.conf"
|
||||
fi
|
||||
|
||||
if ! [ -d "$ENTRY_DIR_ABS" ]; then
|
||||
|
|
@ -107,26 +111,31 @@ if ! [ -d "$ENTRY_DIR_ABS" ]; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
install -g root -o root -m 0644 "$KERNEL_IMAGE" "$ENTRY_DIR_ABS/linux" || {
|
||||
echo "Error: could not copy '$KERNEL_IMAGE' to '$ENTRY_DIR_ABS/linux'." >&2
|
||||
install -m 0644 "$KERNEL_IMAGE" "$KERNEL_DEST" || {
|
||||
echo "Error: could not copy '$KERNEL_IMAGE' to '$KERNEL_DEST'." >&2
|
||||
exit 1
|
||||
}
|
||||
chown root:root "$KERNEL_DEST" || :
|
||||
|
||||
shift "$INITRD_OPTIONS_SHIFT"
|
||||
# All files listed as arguments, and staged files starting with "initrd-fallback" are installed as initrds.
|
||||
for initrd in "$@" "${KERNEL_INSTALL_STAGING_AREA}"/initrd-fallback*; do
|
||||
# All files listed as arguments, and staged files starting with "initrd" are installed as initrds.
|
||||
for initrd in "${KERNEL_INSTALL_STAGING_AREA}"/microcode* "${@}" "${KERNEL_INSTALL_STAGING_AREA}"/initrd*; do
|
||||
[ -f "$initrd" ] || {
|
||||
[ "$initrd" = "${KERNEL_INSTALL_STAGING_AREA}/initrd-fallback*" ] && continue
|
||||
echo "Error: initrd '$initrd' not a file." >&2
|
||||
case "$initrd" in
|
||||
"${KERNEL_INSTALL_STAGING_AREA}/initrd*" | "${KERNEL_INSTALL_STAGING_AREA}/microcode*")
|
||||
continue ;;
|
||||
esac
|
||||
echo "Error: '$initrd' is not a file." >&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
initrd_basename="${initrd##*/}"
|
||||
[ "$KERNEL_INSTALL_VERBOSE" -gt 0 ] && echo "Installing $ENTRY_DIR_ABS/$initrd_basename"
|
||||
install -g root -o root -m 0644 "$initrd" "$ENTRY_DIR_ABS/$initrd_basename" || {
|
||||
install -m 0644 "$initrd" "$ENTRY_DIR_ABS/$initrd_basename" || {
|
||||
echo "Error: could not copy '$initrd' to '$ENTRY_DIR_ABS/$initrd_basename'." >&2
|
||||
exit 1
|
||||
}
|
||||
chown root:root "$ENTRY_DIR_ABS/$initrd_basename" || :
|
||||
done
|
||||
|
||||
mkdir -p "${LOADER_ENTRY%/*}" || {
|
||||
|
|
@ -136,18 +145,20 @@ mkdir -p "${LOADER_ENTRY%/*}" || {
|
|||
|
||||
[ "$KERNEL_INSTALL_VERBOSE" -gt 0 ] && echo "Creating $LOADER_ENTRY"
|
||||
{
|
||||
echo "# Boot Loader Specification type#1 entry"
|
||||
echo "# File created by $0 (systemd 254.1-1-arch)"
|
||||
echo "title $PRETTY_NAME"
|
||||
echo "version $KERNEL_VERSION-fallback"
|
||||
echo "version ${KERNEL_VERSION}-fallback"
|
||||
if [ "$ENTRY_TOKEN" = "$MACHINE_ID" ]; then
|
||||
# See similar logic above for the systemd.machine_id= kernel command line option
|
||||
echo "machine-id $MACHINE_ID"
|
||||
fi
|
||||
[ -n "$SORT_KEY" ] && echo "sort-key $SORT_KEY"
|
||||
echo "options $BOOT_OPTIONS"
|
||||
echo "linux $ENTRY_DIR/linux"
|
||||
echo "linux $KERNEL_ENTRY"
|
||||
|
||||
have_initrd=
|
||||
for initrd in "${@}" "${KERNEL_INSTALL_STAGING_AREA}"/initrd-fallback*; do
|
||||
for initrd in "${KERNEL_INSTALL_STAGING_AREA}"/microcode* "${@}" "${KERNEL_INSTALL_STAGING_AREA}"/initrd* "${ENTRY_DIR_ABS}/initrd-fallback"; do
|
||||
[ -f "$initrd" ] || continue
|
||||
echo "initrd $ENTRY_DIR/${initrd##*/}"
|
||||
have_initrd=yes
|
||||
|
|
|
|||
Loading…
Reference in New Issue