diff options
| author | Maik Broemme | 2018-02-20 21:48:28 +0100 |
|---|---|---|
| committer | Maik Broemme | 2018-02-20 21:48:28 +0100 |
| commit | f06934c1f74327c9275a90775f427a3df018a50f (patch) | |
| tree | 9c81f4f38d5cacb71bcf597b8f51bc371eecb711 /grub-mkconfig-helper | |
| parent | 73e53e977810745d8d108a8ed7a18978278fb4a8 (diff) | |
| download | aur-f06934c1f74327c9275a90775f427a3df018a50f.tar.gz | |
Update to 4.10.0 with XSA-253 and XSA-254
Diffstat (limited to 'grub-mkconfig-helper')
| -rw-r--r-- | grub-mkconfig-helper | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/grub-mkconfig-helper b/grub-mkconfig-helper index 59ac88ac48fe..993984620ecf 100644 --- a/grub-mkconfig-helper +++ b/grub-mkconfig-helper @@ -157,11 +157,11 @@ menuentry "Xen ${XEN_VERSION} / Arch Linux ${_KERNEL_PKG_} kernel" ${CLASS} { search --no-floppy --fs-uuid --set=root ${BOOT_PART_FS_UUID} fi echo '$(printf "Loading Xen %s ..." ${XEN_VERSION})' - multiboot ${REAL_DIR}/${XEN_BASENAME} ${REAL_DIR}/${XEN_BASENAME} ${XEN_HYPERVISOR_CMDLINE} + multiboot2 ${REAL_DIR}/${XEN_BASENAME} ${REAL_DIR}/${XEN_BASENAME} ${XEN_HYPERVISOR_CMDLINE} echo 'Loading Arch Linux ${_KERNEL_PKG_} kernel ...' - module ${REAL_DIR}/${_KERNEL_FILE_} ${REAL_DIR}/${_KERNEL_FILE_} root=${GRUB_LINUX_ROOT_DEVICE} rw ${GRUB_LINUX_PARAMS} + module2 ${REAL_DIR}/${_KERNEL_FILE_} ${REAL_DIR}/${_KERNEL_FILE_} root=${GRUB_LINUX_ROOT_DEVICE} rw ${GRUB_LINUX_PARAMS} echo 'Loading Arch Linux ${_KERNEL_PKG_} kernel initramfs ...' - module ${REAL_DIR}/${_INITRAMFS_} + module2 ${REAL_DIR}/${_INITRAMFS_} } EOF @@ -188,11 +188,11 @@ menuentry "Xen ${XEN_VERSION} / Arch Linux ${_KERNEL_PKG_} kernel (fallback init search --no-floppy --fs-uuid --set=root ${BOOT_PART_FS_UUID} fi echo '$(printf "Loading Xen %s ..." ${XEN_VERSION})' - multiboot ${REAL_DIR}/${XEN_BASENAME} ${REAL_DIR}/${XEN_BASENAME} ${XEN_HYPERVISOR_CMDLINE} + multiboot2 ${REAL_DIR}/${XEN_BASENAME} ${REAL_DIR}/${XEN_BASENAME} ${XEN_HYPERVISOR_CMDLINE} echo 'Loading Arch Linux ${_KERNEL_PKG_} kernel ...' - module ${REAL_DIR}/${_KERNEL_FILE_} ${REAL_DIR}/${_KERNEL_FILE_} root=${GRUB_LINUX_ROOT_DEVICE} rw ${GRUB_LINUX_PARAMS} + module2 ${REAL_DIR}/${_KERNEL_FILE_} ${REAL_DIR}/${_KERNEL_FILE_} root=${GRUB_LINUX_ROOT_DEVICE} rw ${GRUB_LINUX_PARAMS} echo 'Loading Arch Linux ${_KERNEL_PKG_} kernel fallback initramfs ...' - module ${REAL_DIR}/${_INITRAMFS_FALLBACK_} + module2 ${REAL_DIR}/${_INITRAMFS_FALLBACK_} } EOF @@ -214,9 +214,9 @@ menuentry "Xen ${XEN_VERSION} / Arch Linux ${_KERNEL_PKG_} kernel (no initramfs) search --no-floppy --fs-uuid --set=root ${BOOT_PART_FS_UUID} fi echo '$(printf "Loading Xen %s ..." ${XEN_VERSION})' - multiboot ${REAL_DIR}/${XEN_BASENAME} ${REAL_DIR}/${XEN_BASENAME} ${XEN_HYPERVISOR_CMDLINE} + multiboot2 ${REAL_DIR}/${XEN_BASENAME} ${REAL_DIR}/${XEN_BASENAME} ${XEN_HYPERVISOR_CMDLINE} echo 'Loading Arch Linux ${_KERNEL_PKG_} kernel ...' - module ${REAL_DIR}/${_KERNEL_FILE_} ${REAL_DIR}/${_KERNEL_FILE_} root=${GRUB_LINUX_ROOT_DEVICE} rw ${GRUB_LINUX_PARAMS} + module2 ${REAL_DIR}/${_KERNEL_FILE_} ${REAL_DIR}/${_KERNEL_FILE_} root=${GRUB_LINUX_ROOT_DEVICE} rw ${GRUB_LINUX_PARAMS} } EOF |