From e96185bcaa730dafad0664db9e399024cdd1fc21 Mon Sep 17 00:00:00 2001
From: tigro <arkadiy.sheyn@softline.com>
Date: Sat, 29 Jul 2023 21:14:20 +0200
Subject: [PATCH] Disable geo location

---
 SOURCES/0005-Disable-geo-location.patch | 73 +++++++++++++++++++++++++
 SPECS/lorax-templates-rhel.spec         |  7 ++-
 2 files changed, 79 insertions(+), 1 deletion(-)
 create mode 100644 SOURCES/0005-Disable-geo-location.patch

diff --git a/SOURCES/0005-Disable-geo-location.patch b/SOURCES/0005-Disable-geo-location.patch
new file mode 100644
index 0000000..c5f20d4
--- /dev/null
+++ b/SOURCES/0005-Disable-geo-location.patch
@@ -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
+
diff --git a/SPECS/lorax-templates-rhel.spec b/SPECS/lorax-templates-rhel.spec
index 1bdf9a3..a907de3 100644
--- a/SPECS/lorax-templates-rhel.spec
+++ b/SPECS/lorax-templates-rhel.spec
@@ -1,6 +1,6 @@
 Name:           lorax-templates-msvsphere
 Version:        9.0
-Release:        37%{?dist}.4
+Release:        37%{?dist}.5
 Summary:        MSVSphere 9 build templates for lorax and livemedia-creator
 
 License:        GPLv2+
@@ -14,6 +14,7 @@ Patch1001:      0001-Remove-RHEL-specific-packages.patch
 Patch1002:      0002-Disable-oscap-anaconda-addon-install.patch
 Patch1003:      0003-Translate-installation-image-bootloader-to-Russian.patch
 Patch1004:      0004-Translate-live-image-bootloader-to-Russian.patch
+Patch1005:      0005-Disable-geo-location.patch
 
 # Required for the template branding support
 # Required for Russian localization
@@ -32,6 +33,7 @@ placed in %{templatedir}
 %patch1002 -p1
 %patch1003 -p1
 %patch1004 -p1
+%patch1005 -p1
 
 %build
 # nothing to build
@@ -48,6 +50,9 @@ install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/%{templatedir}/live/config_files/x86/
 %{templatedir}/*
 
 %changelog
+* Sat Jul 29 2023 Arkady L. Shane <ashejn@msvsphere.ru> - 9.0-37.5
+- Disable geo location
+
 * Fri Jul 28 2023 Arkady L. Shane <ashejn@msvsphere.ru> - 9.0-37.4
 - Update patch for live bootloader
 - Copy font to live