proxmox-mirrors/pve-kernel-meta
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-kernel-meta synced 2025-08-08 02:57:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

efiboot: add manual kernel list

Browse Source 
with 'kernels <add|remove>' command in pve-efiboot-tool to add/remove
kernels to/from manual kernel list, and honor it when generating lists
of kernels to not autoremove/sync to ESPs

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2019-07-12 15:16:46 +02:00 committed by Thomas Lamprecht
parent 0956bd22cb
commit 427fba7112
2 changed files with 72 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
bin/pve-efiboot-tool
View File

@ -200,6 +200,40 @@ refresh() {
exec $hookscript exec $hookscript
} }
add_kernel() {
ver="$1"
if [ -z "$ver" ]; then
warn "E: <kernel-version> is mandatory"
warn ""
exit 1
fi
if [ ! -e "/boot/vmlinuz-$ver" ]; then
warn "E: no kernel image found in /boot for '$ver', not adding."
exit 1
fi
_add_entry_to_list_file "$MANUAL_KERNEL_LIST" "$ver"
echo "Added kernel '$ver' to manual kernel list."
}
remove_kernel() {
ver="$1"
if [ -z "$ver" ]; then
warn "E: <kernel-version> is mandatory"
warn ""
exit 1
fi
if grep -sqFx "$ver" "$MANUAL_KERNEL_LIST"; then
_remove_entry_from_list_file "$MANUAL_KERNEL_LIST" "$ver"
echo "Removed kernel '$ver' from manual kernel list."
else
echo "Kernel '$ver' not found in manual kernel list."
fi
}
usage() { usage() {
warn "USAGE: $0 <commands> [ARGS]" warn "USAGE: $0 <commands> [ARGS]"
warn "" warn ""
@ -207,6 +241,7 @@ usage() {
warn " $0 init <partition>" warn " $0 init <partition>"
warn " $0 clean [--dry-run]" warn " $0 clean [--dry-run]"
warn " $0 refresh" warn " $0 refresh"
warn " $0 kernels <add|remove> <kernel-version>"
warn " $0 help" warn " $0 help"
} }
@ -227,6 +262,10 @@ help() {
echo "" echo ""
echo " refresh all configured EFI system partitions." echo " refresh all configured EFI system partitions."
echo "" echo ""
echo "USAGE: $0 kernels <add|remove> <kernel-version>"
echo ""
echo " add/remove pve-kernel with ABI <kernel-version> to list of synced kernels, in addition to automatically selected ones."
echo ""
} }
if [ -z "$1" ]; then if [ -z "$1" ]; then
@ -268,6 +307,32 @@ case "$1" in
refresh refresh
exit 0 exit 0
;; ;;
'kernels')
shift
if [ -z "$1" ]; then
warn "E: subcommand is mandatory."
warn ""
usage
exit 1
fi
cmd="$1"
case "$cmd" in
'add')
add_kernel "$2"
exit 0
;;
'remove')
remove_kernel "$2"
exit 0
;;
*)
warn "E: invalid subcommand '$cmd'."
warn ""
usage
exit 1
;;
esac
;;
'help') 'help')
shift shift
help help

7
efiboot/functions
View File

@ -4,6 +4,8 @@ set -e
ESP_LIST="/etc/kernel/pve-efiboot-uuids" ESP_LIST="/etc/kernel/pve-efiboot-uuids"
ESPTYPE='c12a7328-f81f-11d2-ba4b-00a0c93ec93b' ESPTYPE='c12a7328-f81f-11d2-ba4b-00a0c93ec93b'
MANUAL_KERNEL_LIST="/etc/kernel/pve-efiboot-manual-kernels"
# relative to the ESP mountpoint # relative to the ESP mountpoint
PMX_ESP_DIR="EFI/proxmox" PMX_ESP_DIR="EFI/proxmox"
PMX_LOADER_CONF="loader/loader.conf" PMX_LOADER_CONF="loader/loader.conf"
@ -44,9 +46,14 @@ kernel_keep_versions() {
oldseries="$(echo "$series_metapackages" | head -n2 | tail -n1)" oldseries="$(echo "$series_metapackages" | head -n2 | tail -n1)"
oldseries_latest_kernel="$(echo "$sorted_list" | grep -E "^${oldseries}\.[^ ]+-pve" | head -n1 )" oldseries_latest_kernel="$(echo "$sorted_list" | grep -E "^${oldseries}\.[^ ]+-pve" | head -n1 )"
if [ -e "$MANUAL_KERNEL_LIST" ]; then
manual_kernels="$(cat "$MANUAL_KERNEL_LIST")"
fi
kernels="$(cat <<-EOF kernels="$(cat <<-EOF
$running_version $running_version
$install_version $install_version
$manual_kernels
$latest_2_versions $latest_2_versions
$series_metapackages $series_metapackages
$oldseries_latest_kernel $oldseries_latest_kernel