summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaik Broemme2018-04-09 21:50:07 +0200
committerMaik Broemme2018-04-09 21:50:07 +0200
commitcc61713a1092641ea34405916af603be3d3bd83a (patch)
treebd1a4fe621dc4ce832b10812e7f019a3c58e5acf
parent1887ec16a6bb75086ffd863534216689107a87a8 (diff)
downloadaur-cc61713a1092641ea34405916af603be3d3bd83a.tar.gz
Removed duplicated parameters in grub-mkconfig-helper to fix '(XEN) parameter "/boot/xen-4.10.0.gz" unknown!' issue
-rw-r--r--PKGBUILD4
-rw-r--r--grub-mkconfig-helper12
2 files changed, 8 insertions, 8 deletions
diff --git a/PKGBUILD b/PKGBUILD
index f15d38154dd..9f65e73a443 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -47,7 +47,7 @@ fi
pkgbase=xen
pkgname=(xen xen-docs)
pkgver="${_xen_version}"
-pkgrel=2
+pkgrel=3
pkgdesc='Virtual Machine Hypervisor & Tools'
url='http://www.xenproject.org/'
license=('GPL2')
@@ -143,7 +143,7 @@ sha256sums=(
'3e45cc3f2ea516e7470083592041e238c0dfe32324790b2fba0e47c9efe38865'
# PKGBUILD files
- '7dd6f1d6c10d4e8793412175b964df2477633cd988810df71e2040bf79e4d56c'
+ '23c3b0eab4cb06260bd07324d2060356560c9bc52270aaaf6130e1c130fc6e5e'
'ceaff798a92a7aef1465a0a0b27b1817aedd2c857332b456aaa6dd78dc72438f'
'3f0af16958c3e057b9baa5afc47050d9adf7dd553274dd97ae4f35938fefb568'
'50a9b7fd19e8beb1dea09755f07318f36be0b7ec53d3c9e74f3266a63e682c0c'
diff --git a/grub-mkconfig-helper b/grub-mkconfig-helper
index 993984620ec..be298eee12a 100644
--- a/grub-mkconfig-helper
+++ b/grub-mkconfig-helper
@@ -157,9 +157,9 @@ 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})'
- multiboot2 ${REAL_DIR}/${XEN_BASENAME} ${REAL_DIR}/${XEN_BASENAME} ${XEN_HYPERVISOR_CMDLINE}
+ multiboot2 ${REAL_DIR}/${XEN_BASENAME} ${XEN_HYPERVISOR_CMDLINE}
echo 'Loading Arch Linux ${_KERNEL_PKG_} kernel ...'
- module2 ${REAL_DIR}/${_KERNEL_FILE_} ${REAL_DIR}/${_KERNEL_FILE_} root=${GRUB_LINUX_ROOT_DEVICE} rw ${GRUB_LINUX_PARAMS}
+ module2 ${REAL_DIR}/${_KERNEL_FILE_} root=${GRUB_LINUX_ROOT_DEVICE} rw ${GRUB_LINUX_PARAMS}
echo 'Loading Arch Linux ${_KERNEL_PKG_} kernel initramfs ...'
module2 ${REAL_DIR}/${_INITRAMFS_}
}
@@ -188,9 +188,9 @@ 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})'
- multiboot2 ${REAL_DIR}/${XEN_BASENAME} ${REAL_DIR}/${XEN_BASENAME} ${XEN_HYPERVISOR_CMDLINE}
+ multiboot2 ${REAL_DIR}/${XEN_BASENAME} ${XEN_HYPERVISOR_CMDLINE}
echo 'Loading Arch Linux ${_KERNEL_PKG_} kernel ...'
- module2 ${REAL_DIR}/${_KERNEL_FILE_} ${REAL_DIR}/${_KERNEL_FILE_} root=${GRUB_LINUX_ROOT_DEVICE} rw ${GRUB_LINUX_PARAMS}
+ module2 ${REAL_DIR}/${_KERNEL_FILE_} root=${GRUB_LINUX_ROOT_DEVICE} rw ${GRUB_LINUX_PARAMS}
echo 'Loading Arch Linux ${_KERNEL_PKG_} kernel fallback initramfs ...'
module2 ${REAL_DIR}/${_INITRAMFS_FALLBACK_}
}
@@ -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})'
- multiboot2 ${REAL_DIR}/${XEN_BASENAME} ${REAL_DIR}/${XEN_BASENAME} ${XEN_HYPERVISOR_CMDLINE}
+ multiboot2 ${REAL_DIR}/${XEN_BASENAME} ${XEN_HYPERVISOR_CMDLINE}
echo 'Loading Arch Linux ${_KERNEL_PKG_} kernel ...'
- module2 ${REAL_DIR}/${_KERNEL_FILE_} ${REAL_DIR}/${_KERNEL_FILE_} root=${GRUB_LINUX_ROOT_DEVICE} rw ${GRUB_LINUX_PARAMS}
+ module2 ${REAL_DIR}/${_KERNEL_FILE_} root=${GRUB_LINUX_ROOT_DEVICE} rw ${GRUB_LINUX_PARAMS}
}
EOF