From 734ddc42b648f75a72d4dd490700ee1edce04549 Mon Sep 17 00:00:00 2001 From: tigro Date: Sat, 29 Jul 2023 21:12:05 +0200 Subject: [PATCH 4/8] 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 d36aefa..43d2f11 100644 --- a/80-rhel/efi.tmpl +++ b/80-rhel/efi.tmpl @@ -49,9 +49,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 50f95e6..08ba750 100644 --- a/80-rhel/live/efi.tmpl +++ b/80-rhel/live/efi.tmpl @@ -49,9 +49,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 c88d657..3221d72 100644 --- a/80-rhel/live/x86.tmpl +++ b/80-rhel/live/x86.tmpl @@ -79,7 +79,7 @@ replace @PRODUCT@ '${product.name}' ${GRUB2DIR}/grub.conf replace @KERNELPATH@ /${KERNELDIR}/vmlinuz ${GRUB2DIR}/grub.cfg replace @INITRDPATH@ /${KERNELDIR}/initrd.img ${GRUB2DIR}/grub.cfg replace @ISOLABEL@ '${isolabel}' ${GRUB2DIR}/grub.cfg -replace @ROOT@ 'root=live:CDLABEL=${isolabel|udev}' ${GRUB2DIR}/grub.cfg +replace @ROOT@ 'root=live:CDLABEL=${isolabel|udev} inst.geoloc=0' ${GRUB2DIR}/grub.cfg replace @EXTRA@ '${extra_boot_args}' ${GRUB2DIR}/grub.cfg ## convert BIOS bootloader configs to cp866 encoding diff --git a/80-rhel/x86.tmpl b/80-rhel/x86.tmpl index 608d8ed..e5d9027 100644 --- a/80-rhel/x86.tmpl +++ b/80-rhel/x86.tmpl @@ -67,7 +67,7 @@ replace @FLAVOR@ '${FLAVOR}' ${GRUB2DIR}/isolinux.cfg ${GRUB2DIR}/*.msg replace @KERNELPATH@ /${KERNELDIR}/vmlinuz ${GRUB2DIR}/grub.cfg replace @INITRDPATH@ /${KERNELDIR}/initrd.img ${GRUB2DIR}/grub.cfg replace @ISOLABEL@ '${isolabel}' ${GRUB2DIR}/grub.cfg -replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev}' ${GRUB2DIR}/grub.cfg +replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev} inst.geoloc=0' ${GRUB2DIR}/grub.cfg ## convert BIOS bootloader configs to cp866 encoding iconv 'cp866' ${GRUB2DIR}/isolinux.cfg ${GRUB2DIR}/*.msg -- 2.43.5