Compare commits
No commits in common. "51e439c16943149d150e87d7ea75d273327a985e" and "ab5852d7d3cef4daa9950b9a5a21cda87717e267" have entirely different histories.
51e439c169
...
ab5852d7d3
|
|
@ -1,15 +0,0 @@
|
|||
# These are supported funding model platforms
|
||||
|
||||
#github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
|
||||
|
||||
#patreon: # Replace with a single Patreon username
|
||||
#open_collective: # Replace with a single Open Collective username
|
||||
#ko_fi: # Replace with a single Ko-fi username
|
||||
#tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
|
||||
#community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
|
||||
#liberapay: # Replace with a single Liberapay username
|
||||
#issuehunt: # Replace with a single IssueHunt username
|
||||
#otechie: # Replace with a single Otechie username
|
||||
#custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
|
||||
#github: [Valeria-Fadeeva]
|
||||
custom: ["https://www.tinkoff.ru/rm/fadeeva.valeriya96/9bLRi79066", "https://yoomoney.ru/to/4100115921160758", "https://qiwi.com/n/VALERIAFADEEVA", "valeria.fadeeva.me"]
|
||||
|
|
@ -8,7 +8,3 @@ The package does a few things:
|
|||
* Installs hooks to automate the installation and removal of kernels using kernel-install
|
||||
* Enables support for both full fallback images and optimized "hostonly" images
|
||||
* Saves kernel options to /etc/kernel/cmdline to support recovery in a chroot
|
||||
|
||||
There is a configuration file located in `/etc/kernel-install-for-dracut` with options described in the file.
|
||||
|
||||
To make changes to the kernel options/params, you can edit `/etc/kernel/cmdline` directly. If you would like different kernel options for the fallback initrd, you can optionally create `/etc/kernel/cmdline_fb` with the same format.
|
||||
|
|
|
|||
|
|
@ -1,7 +0,0 @@
|
|||
# This config file controls the automation provided by kernel-install-for-dracut
|
||||
|
||||
# When DRACUT_QUIET is set to true, dracut will operate with quiet flag set suppressing most output
|
||||
#DRACUT_QUIET="false"
|
||||
|
||||
# When NO_FALLBACK is set to true, no fallback initrd will be generated
|
||||
#NO_DRACUT_FALLBACK="false"
|
||||
|
|
@ -5,9 +5,6 @@ KERNEL_VERSION="$2"
|
|||
BOOT_DIR_ABS="$3"
|
||||
KERNEL_IMAGE="$4"
|
||||
|
||||
# Read the optional config file for automation
|
||||
[[ -f /etc/kernel-install-for-dracut.conf ]] && source /etc/kernel-install-for-dracut.conf
|
||||
|
||||
# If KERNEL_INSTALL_MACHINE_ID is defined but empty, BOOT_DIR_ABS is a fake directory.
|
||||
# So, let's skip to create initrd.
|
||||
if ! [[ ${KERNEL_INSTALL_MACHINE_ID-x} ]]; then
|
||||
|
|
@ -57,8 +54,7 @@ case "$COMMAND" in
|
|||
break
|
||||
fi
|
||||
done
|
||||
[[ ${DRACUT_QUIET} == "true" ]] && DRACUT_EXTRA_PARAMS=" --quiet"
|
||||
dracut --hostonly --no-hostonly-cmdline -f${DRACUT_EXTRA_PARAMS} ${noimageifnotneeded:+--noimageifnotneeded} "$BOOT_DIR_ABS/$INITRD" "$KERNEL_VERSION"
|
||||
dracut --hostonly --no-hostonly-cmdline -f ${noimageifnotneeded:+--noimageifnotneeded} "$BOOT_DIR_ABS/$INITRD" "$KERNEL_VERSION"
|
||||
ret=$?
|
||||
;;
|
||||
remove)
|
||||
|
|
|
|||
|
|
@ -16,52 +16,46 @@
|
|||
# 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 <https://www.gnu.org/licenses/>.
|
||||
# along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
set -e
|
||||
|
||||
COMMAND="${1:?}"
|
||||
KERNEL_VERSION="${2:?}"
|
||||
ENTRY_DIR_ABS="${3:?}"
|
||||
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"
|
||||
|
||||
[ -n "$BOOT_MNT" ] || BOOT_MNT="$(stat -c %m "$BOOT_ROOT")"
|
||||
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 ${LOADER_ENTRY%.conf}*.conf"
|
||||
echo "Removing $BOOT_ROOT/loader/entries/$ENTRY_TOKEN-$KERNEL_VERSION*.conf"
|
||||
exec rm -f \
|
||||
"$LOADER_ENTRY" \
|
||||
"${LOADER_ENTRY%.conf}"*".conf"
|
||||
"$BOOT_ROOT/loader/entries/$ENTRY_TOKEN-$KERNEL_VERSION.conf" \
|
||||
"$BOOT_ROOT/loader/entries/$ENTRY_TOKEN-$KERNEL_VERSION+"*".conf"
|
||||
;;
|
||||
add)
|
||||
;;
|
||||
*)
|
||||
exit 0
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
if [ -f /etc/os-release ]; then
|
||||
if [ -r /etc/os-release ]; then
|
||||
# shellcheck source=/dev/null
|
||||
. /etc/os-release
|
||||
elif [ -f /usr/lib/os-release ]; then
|
||||
elif [ -r /usr/lib/os-release ]; then
|
||||
# shellcheck source=/dev/null
|
||||
. /usr/lib/os-release
|
||||
fi
|
||||
|
|
@ -71,13 +65,9 @@ fi
|
|||
SORT_KEY="$IMAGE_ID"
|
||||
[ -z "$SORT_KEY" ] && SORT_KEY="$ID-$KERNEL_VERSION"
|
||||
|
||||
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
|
||||
if [ -r /etc/kernel/cmdline ]; then
|
||||
BOOT_OPTIONS="$(tr -s "$IFS" ' ' </etc/kernel/cmdline)"
|
||||
elif [ -f /usr/lib/kernel/cmdline ]; then
|
||||
elif [ -r /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' ' ')"
|
||||
|
|
@ -89,19 +79,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" ] && ! echo "$BOOT_OPTIONS" | grep -q "systemd.machine_id="; then
|
||||
if [ "$ENTRY_TOKEN" = "$MACHINE_ID" ]; then
|
||||
BOOT_OPTIONS="$BOOT_OPTIONS systemd.machine_id=$MACHINE_ID"
|
||||
fi
|
||||
|
||||
TRIES_FILE="${KERNEL_INSTALL_CONF_ROOT:-/etc/kernel}/tries"
|
||||
|
||||
if [ -f "$TRIES_FILE" ]; then
|
||||
read -r TRIES <"$TRIES_FILE"
|
||||
if [ -r /etc/kernel/tries ]; then
|
||||
read -r TRIES </etc/kernel/tries
|
||||
if ! echo "$TRIES" | grep -q '^[0-9][0-9]*$'; then
|
||||
echo "$TRIES_FILE does not contain an integer." >&2
|
||||
echo "/etc/kernel/tries does not contain an integer." >&2
|
||||
exit 1
|
||||
fi
|
||||
LOADER_ENTRY="${LOADER_ENTRY%.conf}+$TRIES.conf"
|
||||
LOADER_ENTRY="$BOOT_ROOT/loader/entries/$ENTRY_TOKEN-$KERNEL_VERSION+$TRIES.conf"
|
||||
else
|
||||
LOADER_ENTRY="$BOOT_ROOT/loader/entries/$ENTRY_TOKEN-$KERNEL_VERSION.conf"
|
||||
fi
|
||||
|
||||
if ! [ -d "$ENTRY_DIR_ABS" ]; then
|
||||
|
|
@ -109,31 +99,26 @@ if ! [ -d "$ENTRY_DIR_ABS" ]; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
install -m 0644 "$KERNEL_IMAGE" "$KERNEL_DEST" || {
|
||||
echo "Error: could not copy '$KERNEL_IMAGE' to '$KERNEL_DEST'." >&2
|
||||
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
|
||||
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}"/microcode* "${@}" "${KERNEL_INSTALL_STAGING_AREA}"/initrd*; do
|
||||
for initrd in "$@" "${KERNEL_INSTALL_STAGING_AREA}"/initrd*; do
|
||||
[ -f "$initrd" ] || {
|
||||
case "$initrd" in
|
||||
"${KERNEL_INSTALL_STAGING_AREA}/initrd*" | "${KERNEL_INSTALL_STAGING_AREA}/microcode*")
|
||||
continue ;;
|
||||
esac
|
||||
echo "Error: '$initrd' is not a file." >&2
|
||||
[ "$initrd" = "${KERNEL_INSTALL_STAGING_AREA}/initrd*" ] && continue
|
||||
echo "Error: initrd '$initrd' not a file." >&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
initrd_basename="${initrd##*/}"
|
||||
[ "$KERNEL_INSTALL_VERBOSE" -gt 0 ] && echo "Installing $ENTRY_DIR_ABS/$initrd_basename"
|
||||
install -m 0644 "$initrd" "$ENTRY_DIR_ABS/$initrd_basename" || {
|
||||
install -g root -o root -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%/*}" || {
|
||||
|
|
@ -143,8 +128,6 @@ 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
|
||||
|
|
@ -153,10 +136,10 @@ mkdir -p "${LOADER_ENTRY%/*}" || {
|
|||
fi
|
||||
[ -n "$SORT_KEY" ] && echo "sort-key $SORT_KEY"
|
||||
echo "options $BOOT_OPTIONS"
|
||||
echo "linux $KERNEL_ENTRY"
|
||||
echo "linux $ENTRY_DIR/linux"
|
||||
|
||||
have_initrd=
|
||||
for initrd in "${KERNEL_INSTALL_STAGING_AREA}"/microcode* "${@}" "${KERNEL_INSTALL_STAGING_AREA}"/initrd* "${ENTRY_DIR_ABS}/initrd"; do
|
||||
for initrd in "${@}" "${KERNEL_INSTALL_STAGING_AREA}"/initrd*; do
|
||||
[ -f "$initrd" ] || continue
|
||||
echo "initrd $ENTRY_DIR/${initrd##*/}"
|
||||
have_initrd=yes
|
||||
|
|
|
|||
|
|
@ -1,35 +0,0 @@
|
|||
#!/usr/bin/env bash
|
||||
#
|
||||
# Rebuild all the initrds using dracut
|
||||
|
||||
# This finds the best token for systemd-boot
|
||||
find_token() {
|
||||
if [[ -s /etc/kernel/entry-token ]] ; then
|
||||
cat /etc/kernel/entry-token
|
||||
elif [[ -s /etc/machine-id ]] ; then
|
||||
cat /etc/machine-id
|
||||
elif [[ $(grep "^IMAGE_ID=" /etc/os-release) ]] ; then
|
||||
grep "^IMAGE_ID=" /etc/os-release | awk -F"=" '{print $2}'
|
||||
elif [[ $(grep "^ID=" /etc/os-release) ]] ; then
|
||||
grep "^ID=" /etc/os-release | awk -F"=" '{print $2}'
|
||||
fi
|
||||
}
|
||||
|
||||
[[ -f /etc/kernel-install-for-dracut.conf ]] && source /etc/kernel-install-for-dracut.conf
|
||||
ESP=$(bootctl --print-esp-path)
|
||||
TOKEN=$(find_token)
|
||||
while read -r pkgbase; do
|
||||
kernelversion=$(basename "${pkgbase%/pkgbase}")
|
||||
kernelname=$(cat "${pkgbase}")
|
||||
INITRD_PATH="${ESP}/${TOKEN}/${kernelversion}"
|
||||
if [[ ! -d "$INITRD_PATH" ]] ; then
|
||||
echo 'Failed to build initrds, use "sudo reinstall-kernels" instead' 1>&2
|
||||
exit 1
|
||||
fi
|
||||
echo "Running dracut for ${kernelname}-${kernelversion}"
|
||||
[[ ${DRACUT_QUIET} == "true" ]] && DRACUT_EXTRA_PARAMS=" --quiet"
|
||||
dracut --force --hostonly --no-hostonly-cmdline${DRACUT_EXTRA_PARAMS} "${INITRD_PATH}/initrd" "${kernelversion}"
|
||||
[[ ${NO_DRACUT_FALLBACK} != "true" ]] && dracut --force --no-hostonly${DRACUT_EXTRA_PARAMS} "${INITRD_PATH}/initrd-fallback" "${kernelversion}"
|
||||
done < <(find /usr/lib/modules -maxdepth 2 -type f -name pkgbase)
|
||||
|
||||
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
#!/usr/bin/env bash
|
||||
#
|
||||
# Calls kernel-install on all kernels found in /usr/lib/modules
|
||||
#
|
||||
# Run kernel install for all the installed kernels
|
||||
while read -r kernel; do
|
||||
kernelversion=$(basename "${kernel%/vmlinuz}")
|
||||
echo "Installing kernel ${kernelversion}"
|
||||
kernel-install add ${kernelversion} ${kernel}
|
||||
done < <(find /usr/lib/modules -maxdepth 2 -type f -name vmlinuz)
|
||||
|
|
@ -5,12 +5,6 @@ KERNEL_VERSION="$2"
|
|||
BOOT_DIR_ABS="$3"
|
||||
KERNEL_IMAGE="$4"
|
||||
|
||||
# Read the optional config file for automation
|
||||
[[ -f /etc/kernel-install-for-dracut.conf ]] && source /etc/kernel-install-for-dracut.conf
|
||||
|
||||
# Do nothing if the user has elected to omit the fallback initrd
|
||||
[[ ${NO_DRACUT_FALLBACK} == "true" ]] && exit 0
|
||||
|
||||
# If KERNEL_INSTALL_MACHINE_ID is defined but empty, BOOT_DIR_ABS is a fake directory.
|
||||
# So, let's skip to create initrd.
|
||||
if ! [[ ${KERNEL_INSTALL_MACHINE_ID-x} ]]; then
|
||||
|
|
@ -60,8 +54,7 @@ case "$COMMAND" in
|
|||
break
|
||||
fi
|
||||
done
|
||||
[[ ${DRACUT_QUIET} == "true" ]] && DRACUT_EXTRA_PARAMS=" --quiet"
|
||||
dracut --no-hostonly --force${DRACUT_EXTRA_PARAMS} ${noimageifnotneeded:+--noimageifnotneeded} "$BOOT_DIR_ABS/$INITRD" "$KERNEL_VERSION"
|
||||
dracut -f ${noimageifnotneeded:+--noimageifnotneeded} "$BOOT_DIR_ABS/$INITRD" "$KERNEL_VERSION"
|
||||
ret=$?
|
||||
;;
|
||||
remove)
|
||||
|
|
|
|||
|
|
@ -16,58 +16,46 @@
|
|||
# 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 <https://www.gnu.org/licenses/>.
|
||||
# along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
set -e
|
||||
|
||||
COMMAND="${1:?}"
|
||||
KERNEL_VERSION="${2:?}"
|
||||
ENTRY_DIR_ABS="${3:?}"
|
||||
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
|
||||
[[ -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:?}"
|
||||
|
||||
[ -n "$BOOT_MNT" ] || BOOT_MNT="$(stat -c %m "$BOOT_ROOT")"
|
||||
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 ${LOADER_ENTRY%.conf}*.conf"
|
||||
echo "Removing $BOOT_ROOT/loader/entries/$ENTRY_TOKEN-$KERNEL_VERSION-fallback*.conf"
|
||||
exec rm -f \
|
||||
"$LOADER_ENTRY" \
|
||||
"${LOADER_ENTRY%.conf}"*".conf"
|
||||
"$BOOT_ROOT/loader/entries/$ENTRY_TOKEN-$KERNEL_VERSION-fallback.conf" \
|
||||
"$BOOT_ROOT/loader/entries/$ENTRY_TOKEN-$KERNEL_VERSION-fallback+"*".conf"
|
||||
;;
|
||||
add)
|
||||
;;
|
||||
*)
|
||||
exit 0
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
# Do nothing if the user has elected to omit the fallback initrd
|
||||
[[ ${NO_DRACUT_FALLBACK} == "true" ]] && exit 0
|
||||
|
||||
if [ -f /etc/os-release ]; then
|
||||
if [ -r /etc/os-release ]; then
|
||||
# shellcheck source=/dev/null
|
||||
. /etc/os-release
|
||||
elif [ -f /usr/lib/os-release ]; then
|
||||
elif [ -r /usr/lib/os-release ]; then
|
||||
# shellcheck source=/dev/null
|
||||
. /usr/lib/os-release
|
||||
fi
|
||||
|
|
@ -75,17 +63,11 @@ 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 [ -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 [ -f /etc/kernel/cmdline ]; then
|
||||
if [ -r /etc/kernel/cmdline ]; then
|
||||
BOOT_OPTIONS="$(tr -s "$IFS" ' ' </etc/kernel/cmdline)"
|
||||
elif [ -f /usr/lib/kernel/cmdline ]; then
|
||||
elif [ -r /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' ' ')"
|
||||
|
|
@ -97,19 +79,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" ] && ! echo "$BOOT_OPTIONS" | grep -q "systemd.machine_id="; then
|
||||
if [ "$ENTRY_TOKEN" = "$MACHINE_ID" ]; then
|
||||
BOOT_OPTIONS="$BOOT_OPTIONS systemd.machine_id=$MACHINE_ID"
|
||||
fi
|
||||
|
||||
TRIES_FILE="${KERNEL_INSTALL_CONF_ROOT:-/etc/kernel}/tries"
|
||||
|
||||
if [ -f "$TRIES_FILE" ]; then
|
||||
read -r TRIES <"$TRIES_FILE"
|
||||
if [ -r /etc/kernel/tries ]; then
|
||||
read -r TRIES </etc/kernel/tries
|
||||
if ! echo "$TRIES" | grep -q '^[0-9][0-9]*$'; then
|
||||
echo "$TRIES_FILE does not contain an integer." >&2
|
||||
echo "/etc/kernel/tries does not contain an integer." >&2
|
||||
exit 1
|
||||
fi
|
||||
LOADER_ENTRY="${LOADER_ENTRY%.conf}+$TRIES.conf"
|
||||
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"
|
||||
fi
|
||||
|
||||
if ! [ -d "$ENTRY_DIR_ABS" ]; then
|
||||
|
|
@ -117,31 +99,26 @@ if ! [ -d "$ENTRY_DIR_ABS" ]; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
install -m 0644 "$KERNEL_IMAGE" "$KERNEL_DEST" || {
|
||||
echo "Error: could not copy '$KERNEL_IMAGE' to '$KERNEL_DEST'." >&2
|
||||
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
|
||||
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}"/microcode* "${@}" "${KERNEL_INSTALL_STAGING_AREA}"/initrd*; do
|
||||
# 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
|
||||
[ -f "$initrd" ] || {
|
||||
case "$initrd" in
|
||||
"${KERNEL_INSTALL_STAGING_AREA}/initrd*" | "${KERNEL_INSTALL_STAGING_AREA}/microcode*")
|
||||
continue ;;
|
||||
esac
|
||||
echo "Error: '$initrd' is not a file." >&2
|
||||
[ "$initrd" = "${KERNEL_INSTALL_STAGING_AREA}/initrd-fallback*" ] && continue
|
||||
echo "Error: initrd '$initrd' not a file." >&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
initrd_basename="${initrd##*/}"
|
||||
[ "$KERNEL_INSTALL_VERBOSE" -gt 0 ] && echo "Installing $ENTRY_DIR_ABS/$initrd_basename"
|
||||
install -m 0644 "$initrd" "$ENTRY_DIR_ABS/$initrd_basename" || {
|
||||
install -g root -o root -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%/*}" || {
|
||||
|
|
@ -151,20 +128,18 @@ 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 $KERNEL_ENTRY"
|
||||
echo "linux $ENTRY_DIR/linux"
|
||||
|
||||
have_initrd=
|
||||
for initrd in "${KERNEL_INSTALL_STAGING_AREA}"/microcode* "${@}" "${KERNEL_INSTALL_STAGING_AREA}"/initrd* "${ENTRY_DIR_ABS}/initrd-fallback"; do
|
||||
for initrd in "${@}" "${KERNEL_INSTALL_STAGING_AREA}"/initrd-fallback*; do
|
||||
[ -f "$initrd" ] || continue
|
||||
echo "initrd $ENTRY_DIR/${initrd##*/}"
|
||||
have_initrd=yes
|
||||
|
|
|
|||
|
|
@ -3,8 +3,6 @@ Type = Path
|
|||
Operation = Install
|
||||
Operation = Upgrade
|
||||
Target = usr/lib/modules/*/vmlinuz
|
||||
Target = usr/lib/firmware/*
|
||||
Target = usr/src/*/dkms.conf
|
||||
|
||||
[Trigger]
|
||||
Type = Package
|
||||
|
|
@ -13,6 +11,7 @@ Operation = Upgrade
|
|||
Operation = Remove
|
||||
Target = amd-ucode
|
||||
Target = intel-ucode
|
||||
Target = linux-firmware
|
||||
|
||||
[Action]
|
||||
Description = Running kernel-install...
|
||||
|
|
|
|||
|
|
@ -8,15 +8,9 @@ while read -r line; do
|
|||
fi
|
||||
|
||||
version=$(basename "${line%/vmlinuz}")
|
||||
if [[ $1 == "remove" ]]; then
|
||||
echo ":: kernel-install removing kernel $version"
|
||||
kernel-install remove "${version}"
|
||||
elif [[ $1 == "add" ]]; then
|
||||
echo ":: kernel-install installing kernel $version"
|
||||
kernel-install add "${version}" "${line}"
|
||||
else
|
||||
echo ":: Invalid option passed to kernel-install script"
|
||||
fi
|
||||
echo ":: Running kernel-install for kernel $version"
|
||||
|
||||
kernel-install $1 "${version}" "${line}"
|
||||
done
|
||||
|
||||
if [[ $all == 1 ]]; then
|
||||
|
|
@ -40,11 +34,9 @@ if [[ ! -e /etc/kernel/cmdline ]]; then
|
|||
|
||||
BOOT_OPTIONS=""
|
||||
read -r -d '' -a line < /proc/cmdline
|
||||
# Add the items from /proc/cmdline excluding the items we don't need
|
||||
for i in "${line[@]}"; do
|
||||
[[ "${i#initrd=*}" != "$i" ]] && continue
|
||||
[[ "${i#BOOT_IMAGE=*}" != "$i" ]] && continue
|
||||
[[ "${i#systemd.machine_id=*}" != "$i" ]] && continue
|
||||
BOOT_OPTIONS+="$i "
|
||||
done
|
||||
echo ${BOOT_OPTIONS} > /etc/kernel/cmdline
|
||||
|
|
|
|||
Loading…
Reference in New Issue