forked from pool/grub2
8ee92f5194
- Implement NV index mode for TPM 2.0 key protector
0001-protectors-Implement-NV-index.patch
- Fall back to passphrase mode when the key protector fails to
unlock the disk
0002-cryptodisk-Fallback-to-passphrase.patch
- Wipe out the cached key cleanly
0003-cryptodisk-wipe-out-the-cached-keys-from-protectors.patch
- Make diskfiler to look up cryptodisk devices first
0004-diskfilter-look-up-cryptodisk-devices-first.patch
- Version bump to 2.12~rc1
* Added:
- grub-2.12~rc1.tar.xz
* Removed:
- grub-2.06.tar.xz
* Patch dropped merged by new version:
- grub2-GRUB_CMDLINE_LINUX_RECOVERY-for-recovery-mode.patch
- grub2-s390x-02-kexec-module-added-to-emu.patch
- grub2-efi-chainloader-root.patch
- grub2-Fix-incorrect-netmask-on-ppc64.patch
- 0001-osdep-Introduce-include-grub-osdep-major.h-and-use-i.patch
- 0002-osdep-linux-hostdisk-Use-stat-instead-of-udevadm-for.patch
- 0002-net-read-bracketed-ipv6-addrs-and-port-numbers.patch
- grub2-s390x-10-keep-network-at-kexec.patch
- 0001-Fix-build-error-in-binutils-2.36.patch
- 0001-emu-fix-executable-stack-marking.patch
- 0046-squash-verifiers-Move-verifiers-API-to-kernel-image.patch
- 0001-30_uefi-firmware-fix-printf-format-with-null-byte.patch
- 0001-tpm-Pass-unknown-error-as-non-fatal-but-debug-print-.patch
- 0001-Filter-out-POSIX-locale-for-translation.patch
OBS-URL: https://build.opensuse.org/request/show/1105405
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=458
76 lines
1.9 KiB
Diff
76 lines
1.9 KiB
Diff
--- a/util/grub-mkconfig.in
|
|
+++ b/util/grub-mkconfig.in
|
|
@@ -299,7 +299,8 @@
|
|
GRUB_OS_PROBER_SKIP_LIST \
|
|
GRUB_DISABLE_SUBMENU \
|
|
SUSE_BTRFS_SNAPSHOT_BOOTING \
|
|
- SUSE_CMDLINE_XENEFI
|
|
+ SUSE_CMDLINE_XENEFI \
|
|
+ SUSE_REMOVE_LINUX_ROOT_PARAM
|
|
|
|
if test "x${grub_cfg}" != "x"; then
|
|
rm -f "${grub_cfg}.new"
|
|
--- a/util/grub.d/10_linux.in
|
|
+++ b/util/grub.d/10_linux.in
|
|
@@ -76,7 +76,7 @@
|
|
else
|
|
rootsubvol="`make_system_path_relative_to_its_root /`"
|
|
rootsubvol="${rootsubvol#/}"
|
|
- if [ "x${rootsubvol}" != x ]; then
|
|
+ if [ "x${rootsubvol}" != x ] && [ "x$SUSE_REMOVE_LINUX_ROOT_PARAM" != "xtrue" ]; then
|
|
GRUB_CMDLINE_LINUX="rootflags=subvol=${rootsubvol} ${GRUB_CMDLINE_LINUX}"
|
|
fi
|
|
fi;;
|
|
@@ -87,6 +87,10 @@
|
|
;;
|
|
esac
|
|
|
|
+if [ "x$SUSE_REMOVE_LINUX_ROOT_PARAM" = "xtrue" ]; then
|
|
+ LINUX_ROOT_DEVICE=""
|
|
+fi
|
|
+
|
|
title_correction_code=
|
|
|
|
hotkey=1
|
|
--- a/util/grub.d/20_linux_xen.in
|
|
+++ b/util/grub.d/20_linux_xen.in
|
|
@@ -100,7 +100,7 @@
|
|
else
|
|
rootsubvol="`make_system_path_relative_to_its_root /`"
|
|
rootsubvol="${rootsubvol#/}"
|
|
- if [ "x${rootsubvol}" != x ]; then
|
|
+ if [ "x${rootsubvol}" != x ] && [ "x$SUSE_REMOVE_LINUX_ROOT_PARAM" != "xtrue" ]; then
|
|
GRUB_CMDLINE_LINUX="rootflags=subvol=${rootsubvol} ${GRUB_CMDLINE_LINUX}"
|
|
fi
|
|
fi;;
|
|
@@ -111,6 +111,10 @@
|
|
;;
|
|
esac
|
|
|
|
+if [ "x$SUSE_REMOVE_LINUX_ROOT_PARAM" = "xtrue" ]; then
|
|
+ LINUX_ROOT_DEVICE=""
|
|
+fi
|
|
+
|
|
title_correction_code=
|
|
|
|
grub2_unquote ()
|
|
--- a/util/s390x/zipl2grub.pl.in
|
|
+++ b/util/s390x/zipl2grub.pl.in
|
|
@@ -384,9 +384,13 @@
|
|
} else {
|
|
$v = "";
|
|
}
|
|
- if ($k eq "GRUB_DEVICE" && $v !~ /^UUID/ && ! -e $v) {
|
|
- s{root=\@$k\@}{}g;
|
|
- next;
|
|
+ if ($k eq "GRUB_DEVICE") {
|
|
+ if (($v !~ /^UUID/ && ! -e $v) ||
|
|
+ (exists( $C{SUSE_REMOVE_LINUX_ROOT_PARAM}) &&
|
|
+ $C{SUSE_REMOVE_LINUX_ROOT_PARAM} eq "true")) {
|
|
+ s{root=\@$k\@}{}g;
|
|
+ next;
|
|
+ }
|
|
}
|
|
s{\@$k\@}{$v}g;
|
|
}
|