From 69055103c00285d279d17e9f54ddc8d1e7854ca4 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Wed, 10 Jul 2019 15:25:50 +0200 Subject: [PATCH] syste, booting: ensure all references are prefixed with sysboot_ namespace Signed-off-by: Thomas Lamprecht --- local-zfs.adoc | 2 +- qm-pci-passthrough.adoc | 6 +++--- system-booting.adoc | 22 +++++++++++----------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/local-zfs.adoc b/local-zfs.adoc index aae89e0..d4500da 100644 --- a/local-zfs.adoc +++ b/local-zfs.adoc @@ -156,7 +156,7 @@ Bootloader Depending on whether the system is booted in EFI or legacy BIOS mode the {pve} installer sets up either `grub` or `systemd-boot` as main bootloader. -See the chapter on xref:system_booting[bootladers] for details. +See the chapter on xref:sysboot[{pve} host bootladers] for details. ZFS Administration diff --git a/qm-pci-passthrough.adoc b/qm-pci-passthrough.adoc index 452ecb7..d9b842a 100644 --- a/qm-pci-passthrough.adoc +++ b/qm-pci-passthrough.adoc @@ -46,7 +46,7 @@ some configuration to enable PCI(e) passthrough. .IOMMU The IOMMU has to be activated on the -xref:edit_kernel_cmdline[kernel commandline]. +xref:sysboot_edit_kernel_cmdline[kernel commandline]. The command line parameters are: @@ -83,7 +83,7 @@ After changing anything modules related, you need to refresh your ---- If you are using `systemd-boot` make sure to -xref:systemd-boot-refresh[sync the new initramfs to the bootable partitions]. +xref:sysboot_systemd_boot_refresh[sync the new initramfs to the bootable partitions]. .Finish Configuration @@ -316,7 +316,7 @@ v5 and E3 v6 Xeon Processors. To enable it for Intel Graphics, you have to make sure to load the module 'kvmgt' (for example via `/etc/modules`) and to enable it on the -xref:edit_kernel_cmdline[Kernel commandline] and add the following parameter: +xref:sysboot_edit_kernel_cmdline[Kernel commandline] and add the following parameter: ---- i915.enable_gvt=1 diff --git a/system-booting.adoc b/system-booting.adoc index 38dacb1..4fad044 100644 --- a/system-booting.adoc +++ b/system-booting.adoc @@ -1,18 +1,18 @@ -[[system_booting]] -Bootloaders ------------ +[[sysboot]] +Host Bootloader +--------------- ifdef::wiki[] :pve-toplevel: endif::wiki[] -{pve} uses one of two bootloaders depending on the disk setup selected in the -installer. +{pve} currently uses one of two bootloaders depending on the disk setup +selected in the installer. For EFI Systems installed with ZFS as the root filesystem `systemd-boot` is used. All other deployments use the standard `grub` bootloader (this usually also applies to systems which are installed on top of Debian). -[[installer_partitioning_scheme]] +[[sysboot_installer_part_scheme]] Partitioning scheme used by the installer ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -39,6 +39,7 @@ The created partitions are: Partition of all bootable disks for supporting older systems. +[[sysboot_grub]] Grub ~~~~ @@ -59,6 +60,7 @@ the `/boot/grub/grub.cfg` after a change to the configuration run: `update-grub`. ---- +[[sysboot_systemd_boot]] Systemd-boot ~~~~~~~~~~~~ @@ -91,7 +93,7 @@ which keeps an ESP mounted on `/boot/efi`. This helps to prevent filesystem corruption to the `vfat` formatted ESPs in case of a system crash, and removes the need to manually adapt `/etc/fstab` in case the primary boot device fails. -[[systemd_boot_config]] +[[sysboot_systemd_boot_config]] Configuration ^^^^^^^^^^^^^ @@ -140,7 +142,7 @@ cat /etc/kernel/cmdline >> /mnt/esp/loader/entries/preferred.conf ---- -[[systemd-boot-refresh]] +[[sysboot_systemd_boot_refresh]] .Updating the configuration on all ESPs To copy and configure all bootable kernels and keep all ESPs in sync you just @@ -151,7 +153,7 @@ This is necessary should you make changes to the kernel commandline, or if you want to add another ESP (e.g. when replacing a failed disk in a redundant ZFS pool). -[[edit_kernel_cmdline]] +[[sysboot_edit_kernel_cmdline]] Editing the kernel commandline ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -170,5 +172,3 @@ The kernel commandline needs to be placed in the variable The kernel commandline needs to be placed as line in `/etc/kernel/cmdline` Running `/etc/kernel/postinst.d/zz-pve-efiboot` sets it as `option` line for all config files in `loader/entries/proxmox-*.conf`. - - -- 2.39.2