parent
31d56efd68
commit
e96185bcaa
@ -0,0 +1,73 @@
|
||||
From e4c5d0c83aa43aa5d644e025352b5ed90cb8043e Mon Sep 17 00:00:00 2001
|
||||
From: tigro <arkadiy.sheyn@softline.com>
|
||||
Date: Sat, 29 Jul 2023 21:12:05 +0200
|
||||
Subject: [PATCH 5/5] Disable geo location
|
||||
|
||||
---
|
||||
80-rhel/efi.tmpl | 4 ++--
|
||||
80-rhel/live/efi.tmpl | 4 ++--
|
||||
80-rhel/live/x86.tmpl | 2 +-
|
||||
80-rhel/x86.tmpl | 2 +-
|
||||
4 files changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/80-rhel/efi.tmpl b/80-rhel/efi.tmpl
|
||||
index 172f27c..436d547 100644
|
||||
--- a/80-rhel/efi.tmpl
|
||||
+++ b/80-rhel/efi.tmpl
|
||||
@@ -53,9 +53,9 @@ ${make_efiboot("images/efiboot.img")}
|
||||
replace @INITRDPATH@ /${kdir}/initrd.img ${eficonf}
|
||||
replace @ISOLABEL@ '${isolabel}' ${eficonf}
|
||||
%if disk:
|
||||
- replace @ROOT@ inst.stage2=hd:LABEL=ANACONDA ${eficonf}
|
||||
+ replace @ROOT@ 'inst.stage2=hd:LABEL=ANACONDA inst.geoloc=0' ${eficonf}
|
||||
%else:
|
||||
- replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev}' ${eficonf}
|
||||
+ replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev} inst.geoloc=0' ${eficonf}
|
||||
%endif
|
||||
%if efiarch32 == 'IA32':
|
||||
copy ${eficonf} ${EFIBOOTDIR}/BOOT.conf
|
||||
diff --git a/80-rhel/live/efi.tmpl b/80-rhel/live/efi.tmpl
|
||||
index 806e602..a225a88 100644
|
||||
--- a/80-rhel/live/efi.tmpl
|
||||
+++ b/80-rhel/live/efi.tmpl
|
||||
@@ -53,9 +53,9 @@ ${make_efiboot("images/efiboot.img")}
|
||||
replace @ISOLABEL@ '${isolabel}' ${eficonf}
|
||||
replace @EXTRA@ '${extra_boot_args}' ${eficonf}
|
||||
%if disk:
|
||||
- replace @ROOT@ root=live:LABEL=ANACONDA ${eficonf}
|
||||
+ replace @ROOT@ 'root=live:LABEL=ANACONDA inst.geoloc=0' ${eficonf}
|
||||
%else:
|
||||
- replace @ROOT@ 'root=live:CDLABEL=${isolabel|udev}' ${eficonf}
|
||||
+ replace @ROOT@ 'root=live:CDLABEL=${isolabel|udev} inst.geoloc=0' ${eficonf}
|
||||
%endif
|
||||
%if efiarch32 == 'IA32':
|
||||
copy ${eficonf} ${EFIBOOTDIR}/BOOT.conf
|
||||
diff --git a/80-rhel/live/x86.tmpl b/80-rhel/live/x86.tmpl
|
||||
index bcfaf53..516e147 100644
|
||||
--- a/80-rhel/live/x86.tmpl
|
||||
+++ b/80-rhel/live/x86.tmpl
|
||||
@@ -55,7 +55,7 @@ replace @PRODUCT@ '${product.name}' ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg
|
||||
replace @FLAVOR@ '' ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg
|
||||
%endif
|
||||
replace @PRODUCT@ '${product.name}' ${BOOTDIR}/grub.conf
|
||||
-replace @ROOT@ 'root=live:CDLABEL=${isolabel|udev}' ${BOOTDIR}/isolinux.cfg
|
||||
+replace @ROOT@ 'root=live:CDLABEL=${isolabel|udev} inst.geoloc=0' ${BOOTDIR}/isolinux.cfg
|
||||
replace @EXTRA@ '${extra_boot_args}' ${BOOTDIR}/isolinux.cfg
|
||||
|
||||
## convert BIOS bootloader configs to cp866 encoding
|
||||
diff --git a/80-rhel/x86.tmpl b/80-rhel/x86.tmpl
|
||||
index 4de8bf8..e5d02cb 100644
|
||||
--- a/80-rhel/x86.tmpl
|
||||
+++ b/80-rhel/x86.tmpl
|
||||
@@ -61,7 +61,7 @@ replace @PRODUCT@ '${product.name}' ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg
|
||||
%endif
|
||||
replace @PRODUCT@ '${product.name}' ${BOOTDIR}/grub.conf
|
||||
replace @FLAVOR@ '${FLAVOR}' ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg
|
||||
-replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev}' ${BOOTDIR}/isolinux.cfg
|
||||
+replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev} inst.geoloc=0' ${BOOTDIR}/isolinux.cfg
|
||||
|
||||
## convert BIOS bootloader configs to cp866 encoding
|
||||
iconv 'cp866' ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg
|
||||
--
|
||||
2.41.0
|
||||
|
Loading…
Reference in new issue