diff --git a/README.md b/README.md index 69c528c..78446d9 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Drivers: - Apple SMC - - Touchbar - -> Tested on: Macbook Pro 15,2 13" 2019 i5 TouchBar Z0WQ000AR MV972ZE/A/R1 +> Tested on: Macbook Pro 15,2 13" 2019 i5 TouchBar Z0WQ000AR MV972ZE/A/R1 && Macbook Pro 16,2 13" 2020 i5 ``` Boot ROM Version: 220.270.99.0.0 (iBridge: 16.16.6571.0.0,0) diff --git a/fedora-mbp.ks b/fedora-mbp.ks index 323d3c0..0174b22 100644 --- a/fedora-mbp.ks +++ b/fedora-mbp.ks @@ -18,17 +18,6 @@ iwd wpa_supplicant -shim-ia32-15.4-*.x86_64 -shim-x64-15.4-*.x86_64 --grub2-efi-ia32-2.06*.fc34.x86_64 --grub2-efi-ia32-cdboot-2.06*.fc34.x86_64 --grub2-efi-x64-2.06*.fc34.x86_64 --grub2-efi-x64-cdboot-2.06*.fc34.x86_64 --grub2-pc-2.06*.fc34.x86_64 --grub2-tools-2.06*.fc34.x86_64 --grub2-tools-efi-2.06*.fc34.x86_64 --grub2-tools-extra-2.06*.fc34.x86_64 --grub2-tools-minimal-2.06*.fc34.x86_64 --grub2-common-2.06*.fc34.x86_64 --grub2-pc-modules-2.06*.fc34.x86_64 -kernel-5.*.fc34.x86_64 -kernel-core-5.*.fc34.x86_64 -kernel-devel-5.*.fc34.x86_64 @@ -88,7 +77,7 @@ dnf remove -y kernel-headers rm -rf /opt/drivers rm -rf /etc/resolv.conf -sed -i '/^type=rpm.*/a exclude=kernel,kernel-core,kernel-devel,kernel-modules,kernel-modules-extra,kernel-modules-internal,grub2-*,shim-*' /etc/yum.repos.d/fedora*.repo +sed -i '/^type=rpm.*/a exclude=kernel,kernel-core,kernel-devel,kernel-modules,kernel-modules-extra,kernel-modules-internal,shim-*' /etc/yum.repos.d/fedora*.repo # echo -e '[mbp-fedora-kernel]\nname=mbp-fedora-kernel\nbaseurl=http://fedora-mbp-repo.herokuapp.com/\nenabled=1\ngpgcheck=0' > /etc/yum.repos.d/mbp-fedora-kernel.repo %end diff --git a/files/anaconda/efi.py b/files/anaconda/efi.py deleted file mode 100644 index 3e55a20..0000000 --- a/files/anaconda/efi.py +++ /dev/null @@ -1,211 +0,0 @@ -# https://raw.githubusercontent.com/rhinstaller/anaconda/master/pyanaconda/bootloader/efi.py -# -# Copyright (C) 2019 Red Hat, Inc. -# -# This copyrighted material is made available to anyone wishing to use, -# modify, copy, or redistribute it subject to the terms and conditions of -# the GNU General Public License v.2, or (at your option) any later version. -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY expressed or implied, including the implied warranties of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -# Public License for more details. You should have received a copy of the -# GNU General Public License along with this program; if not, write to the -# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. Any Red Hat trademarks that are incorporated in the -# source code or documentation are not subject to the GNU General Public -# License and may only be used or replicated with the express permission of -# Red Hat, Inc. -# -import os -import re - -from pyanaconda.bootloader.base import BootLoaderError -from pyanaconda.bootloader.grub2 import GRUB2 -from pyanaconda.core import util -from pyanaconda.core.kernel import kernel_arguments -from pyanaconda.core.configuration.anaconda import conf -from pyanaconda.product import productName - -from pyanaconda.anaconda_loggers import get_module_logger -log = get_module_logger(__name__) - -__all__ = ["EFIBase", "EFIGRUB", "Aarch64EFIGRUB", "ArmEFIGRUB", "MacEFIGRUB"] - - -class EFIBase(object): - """A base class for EFI-based boot loaders.""" - - @property - def _config_dir(self): - return "efi/EFI/{}".format(conf.bootloader.efi_dir) - - def efibootmgr(self, *args, **kwargs): - if not conf.target.is_hardware: - log.info("Skipping efibootmgr for image/directory install.") - return "" - - if "noefi" in kernel_arguments: - log.info("Skipping efibootmgr for noefi") - return "" - - if kwargs.pop("capture", False): - exec_func = util.execWithCapture - else: - exec_func = util.execWithRedirect - if "root" not in kwargs: - kwargs["root"] = conf.target.system_root - - return exec_func("efibootmgr", list(args), **kwargs) - - @property - def efi_dir_as_efifs_dir(self): - ret = self._config_dir.replace('efi/', '') - return "\\" + ret.replace('/', '\\') - - def _add_single_efi_boot_target(self, partition): - boot_disk = partition.disk - boot_part_num = str(partition.parted_partition.number) - - # rc = self.efibootmgr( - # "-c", "-w", "-L", productName.split("-")[0], # pylint: disable=no-member - # "-d", boot_disk.path, "-p", boot_part_num, - # "-l", self.efi_dir_as_efifs_dir + self._efi_binary, # pylint: disable=no-member - # root=conf.target.system_root - # ) - rc = self.efibootmgr() - if rc: - raise BootLoaderError("Failed to set new efi boot target. This is most " - "likely a kernel or firmware bug.") - - def add_efi_boot_target(self): - if self.stage1_device.type == "partition": # pylint: disable=no-member - self._add_single_efi_boot_target(self.stage1_device) # pylint: disable=no-member - elif self.stage1_device.type == "mdarray": # pylint: disable=no-member - for parent in self.stage1_device.parents: # pylint: disable=no-member - self._add_single_efi_boot_target(parent) - - def remove_efi_boot_target(self): - buf = self.efibootmgr(capture=True) - for line in buf.splitlines(): - try: - (slot, _product) = line.split(None, 1) - except ValueError: - continue - - if _product == productName.split("-")[0]: # pylint: disable=no-member - slot_id = slot[4:8] - # slot_id is hex, we can't use .isint and use this regex: - if not re.match("^[0-9a-fA-F]+$", slot_id): - log.warning("failed to parse efi boot slot (%s)", slot) - continue - # Disable writing to efi nvram - # rc = self.efibootmgr("-b", slot_id, "-B") - rc = self.efibootmgr() - if rc: - raise BootLoaderError("Failed to remove old efi boot entry. This is most " - "likely a kernel or firmware bug.") - - def write(self): - """ Write the bootloader configuration and install the bootloader. """ - if self.skip_bootloader: # pylint: disable=no-member - return - - try: - os.sync() - self.stage2_device.format.sync(root=conf.target.physical_root) # pylint: disable=no-member - self.install() - finally: - self.write_config() # pylint: disable=no-member - - def check(self): - return True - - def install(self, args=None): - if not self.keep_boot_order: # pylint: disable=no-member - self.remove_efi_boot_target() - self.add_efi_boot_target() - - -class EFIGRUB(EFIBase, GRUB2): - """EFI GRUBv2""" - _packages32 = [ "grub2-efi-ia32", "shim-ia32" ] - _packages_common = [ "efibootmgr", "grub2-tools" ] - can_dual_boot = False - stage2_is_valid_stage1 = False - stage2_bootable = False - - _is_32bit_firmware = False - - def __init__(self): - super().__init__() - self._packages64 = [ "grub2-efi-x64", "shim-x64" ] - - try: - f = open("/sys/firmware/efi/fw_platform_size", "r") - value = f.readline().strip() - except IOError: - log.info("Reading /sys/firmware/efi/fw_platform_size failed, " - "defaulting to 64-bit install.") - value = '64' - if value == '32': - self._is_32bit_firmware = True - - @property - def _efi_binary(self): - if self._is_32bit_firmware: - return "\\shimia32.efi" - return "\\shimx64.efi" - - @property - def packages(self): - if self._is_32bit_firmware: - return self._packages32 + self._packages_common - return self._packages64 + self._packages_common - - -class Aarch64EFIGRUB(EFIGRUB): - _serial_consoles = ["ttyAMA", "ttyS"] - _efi_binary = "\\shimaa64.efi" - - def __init__(self): - super().__init__() - self._packages64 = ["grub2-efi-aa64", "shim-aa64"] - - -class ArmEFIGRUB(EFIGRUB): - _serial_consoles = ["ttyAMA", "ttyS"] - _efi_binary = "\\grubarm.efi" - - def __init__(self): - super().__init__() - self._packages32 = ["grub2-efi-arm"] - self._is_32bit_firmware = True - - -class MacEFIGRUB(EFIGRUB): - def __init__(self): - super().__init__() - self._packages64.extend(["grub2-tools-efi", "mactel-boot"]) - - def mactel_config(self): - if os.path.exists(conf.target.system_root + "/usr/libexec/mactel-boot-setup"): - rc = util.execInSysroot("/usr/libexec/mactel-boot-setup", []) - if rc: - log.error("failed to configure Mac boot loader") - - def install(self, args=None): - super().install() - self.mactel_config() - - def is_valid_stage1_device(self, device, early=False): - valid = super().is_valid_stage1_device(device, early) - - # Make sure we don't pick the OSX root partition - if valid and getattr(device.format, "name", "") != "Linux HFS+ ESP": - valid = False - - if hasattr(device.format, "name"): - log.debug("device.format.name is '%s'", device.format.name) - - log.debug("MacEFIGRUB.is_valid_stage1_device(%s) returning %s", device.name, valid) - return valid diff --git a/files/grub/30_os-prober b/files/grub/30_os-prober index 1ec418d..bcf5d57 100644 --- a/files/grub/30_os-prober +++ b/files/grub/30_os-prober @@ -30,7 +30,7 @@ if [ "x${GRUB_DISABLE_OS_PROBER}" = "xtrue" ]; then exit 0 fi -if [ -z "`which os-prober 2> /dev/null`" ] || [ -z "`which linux-boot-prober 2> /dev/null`" ] ; then +if ! command -v os-prober > /dev/null || ! command -v linux-boot-prober > /dev/null ; then # missing os-prober and/or linux-boot-prober exit 0 fi @@ -52,16 +52,16 @@ osx_entry() { cat << EOF menuentry '$(echo "${LONGNAME} $onstr" | grub_quote)' --class osx --class darwin --class os \$menuentry_id_option 'osprober-xnu-$2-$(grub_get_device_id "${DEVICE}")' { EOF - save_default_entry | grub_add_tab - prepare_grub_to_access_device ${DEVICE} | grub_add_tab - cat << EOF - set gfxpayload=keep + save_default_entry | grub_add_tab + prepare_grub_to_access_device ${DEVICE} | grub_add_tab + cat << EOF + set gfxpayload=keep load_video - insmod part_gpt - insmod hfsplus - search --no-floppy --fs-uuid --set=root ${hints} $(grub_get_device_id "${DEVICE}") - chainloader (\$root)/System/Library/CoreServices/boot.efi - boot + insmod part_gpt + insmod hfsplus + search --no-floppy --fs-uuid --set=root ${hints} $(grub_get_device_id "${DEVICE}") + chainloader (\$root)/System/Library/CoreServices/boot.efi + boot } EOF } @@ -88,8 +88,8 @@ for OS in ${OSPROBED} ; do BTRFS="`echo ${OS} | cut -d ':' -f 5`" if [ "x$BTRFS" = "xbtrfs" ]; then - BTRFSuuid="`echo ${OS} | cut -d ':' -f 6`" - BTRFSsubvol="`echo ${OS} | cut -d ':' -f 7`" + BTRFSuuid="`echo ${OS} | cut -d ':' -f 6`" + BTRFSsubvol="`echo ${OS} | cut -d ':' -f 7`" fi if [ -z "${LONGNAME}" ] ; then @@ -105,7 +105,7 @@ for OS in ${OSPROBED} ; do chain) found_other_os=1 - onstr="$(gettext_printf "(on %s)" "${DEVICE}")" + onstr="$(gettext_printf "(on %s)" "${DEVICE}")" cat << EOF menuentry '$(echo "${LONGNAME} $onstr" | grub_quote)' $CLASS --class os \$menuentry_id_option 'osprober-chain-$(grub_get_device_id "${DEVICE}")' { EOF @@ -113,32 +113,32 @@ EOF prepare_grub_to_access_device ${DEVICE} | grub_add_tab if [ x"`${grub_probe} --device ${DEVICE} --target=partmap`" = xmsdos ]; then - cat << EOF - parttool \${root} hidden- + cat << EOF + parttool \${root} hidden- EOF fi case ${LONGNAME} in - Windows\ Vista*|Windows\ 7*|Windows\ Server\ 2008*) - ;; - *) - cat << EOF - drivemap -s (hd0) \${root} + Windows\ Vista*|Windows\ 7*|Windows\ Server\ 2008*) + ;; + *) + cat << EOF + drivemap -s (hd0) \${root} EOF - ;; + ;; esac cat < /dev/null; do - counter=$((counter+1)); - done - if [ -z "$boot_device_id" ]; then - boot_device_id="$(grub_get_device_id "${DEVICE}")" - fi - used_osprober_linux_ids="$used_osprober_linux_ids 'osprober-gnulinux-$LKERNEL-${recovery_params}-$counter-$boot_device_id'" + onstr="$(gettext_printf "(on %s)" "${DEVICE}")" + recovery_params="$(echo "${LPARAMS}" | grep single)" || true + counter=1 + while echo "$used_osprober_linux_ids" | grep 'osprober-gnulinux-$LKERNEL-${recovery_params}-$counter-$boot_device_id' > /dev/null; do + counter=$((counter+1)); + done + if [ -z "$boot_device_id" ]; then + boot_device_id="$(grub_get_device_id "${DEVICE}")" + fi + used_osprober_linux_ids="$used_osprober_linux_ids 'osprober-gnulinux-$LKERNEL-${recovery_params}-$counter-$boot_device_id'" - if [ -z "${prepare_boot_cache}" ]; then - prepare_boot_cache="$(prepare_grub_to_access_device ${LBOOT} | grub_add_tab)" - fi + if [ -z "${prepare_boot_cache}" ]; then + prepare_boot_cache="$(prepare_grub_to_access_device ${LBOOT} | grub_add_tab)" + fi + + # The GRUB_DISABLE_SUBMENU option used to be different than others since it was + # mentioned in the documentation that has to be set to 'y' instead of 'true' to + # enable it. This caused a lot of confusion to users that set the option to 'y', + # 'yes' or 'true'. This was fixed but all of these values must be supported now. + if [ "x${GRUB_DISABLE_SUBMENU}" = xyes ] || [ "x${GRUB_DISABLE_SUBMENU}" = xy ]; then + GRUB_DISABLE_SUBMENU="true" + fi - if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then + if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xtrue ]; then cat << EOF menuentry '$(echo "$OS $onstr" | grub_quote)' $CLASS --class gnu-linux --class gnu --class os \$menuentry_id_option 'osprober-gnulinux-simple-$boot_device_id' { EOF - save_default_entry | grub_add_tab - printf '%s\n' "${prepare_boot_cache}" - cat << EOF - linux ${LKERNEL} ${LPARAMS} + save_default_entry | grub_add_tab + printf '%s\n' "${prepare_boot_cache}" + cat << EOF + linux ${LKERNEL} ${LPARAMS} EOF if [ -n "${LINITRD}" ] ; then cat << EOF - initrd ${LINITRD} + initrd ${LINITRD} EOF fi cat << EOF } EOF - echo "submenu '$(gettext_printf "Advanced options for %s" "${OS} $onstr" | grub_quote)' \$menuentry_id_option 'osprober-gnulinux-advanced-$boot_device_id' {" - is_top_level=false - fi - title="${LLABEL} $onstr" + echo "submenu '$(gettext_printf "Advanced options for %s" "${OS} $onstr" | grub_quote)' \$menuentry_id_option 'osprober-gnulinux-advanced-$boot_device_id' {" + is_top_level=false + fi + title="${LLABEL} $onstr" cat << EOF - menuentry '$(echo "$title" | grub_quote)' --class gnu-linux --class gnu --class os \$menuentry_id_option 'osprober-gnulinux-$LKERNEL-${recovery_params}-$boot_device_id' { + menuentry '$(echo "$title" | grub_quote)' --class gnu-linux --class gnu --class os \$menuentry_id_option 'osprober-gnulinux-$LKERNEL-${recovery_params}-$boot_device_id' { EOF - save_default_entry | sed -e "s/^/$grub_tab$grub_tab/" - printf '%s\n' "${prepare_boot_cache}" | grub_add_tab - cat << EOF - linux ${LKERNEL} ${LPARAMS} + save_default_entry | sed -e "s/^/$grub_tab$grub_tab/" + printf '%s\n' "${prepare_boot_cache}" | grub_add_tab + cat << EOF + linux ${LKERNEL} ${LPARAMS} EOF if [ -n "${LINITRD}" ] ; then cat << EOF - initrd ${LINITRD} + initrd ${LINITRD} EOF fi cat << EOF - } + } EOF - if [ x"$title" = x"$GRUB_ACTUAL_DEFAULT" ] || [ x"Previous Linux versions>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then - replacement_title="$(echo "Advanced options for ${OS} $onstr" | sed 's,>,>>,g')>$(echo "$title" | sed 's,>,>>,g')" - quoted="$(echo "$GRUB_ACTUAL_DEFAULT" | grub_quote)" - title_correction_code="${title_correction_code}if [ \"x\$default\" = '$quoted' ]; then default='$(echo "$replacement_title" | grub_quote)'; fi;" - grub_warn "$(gettext_printf "Please don't use old title \`%s' for GRUB_DEFAULT, use \`%s' (for versions before 2.00) or \`%s' (for 2.00 or later)" "$GRUB_ACTUAL_DEFAULT" "$replacement_title" "gnulinux-advanced-$boot_device_id>gnulinux-$version-$type-$boot_device_id")" - fi + if [ x"$title" = x"$GRUB_ACTUAL_DEFAULT" ] || [ x"Previous Linux versions>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then + replacement_title="$(echo "Advanced options for ${OS} $onstr" | sed 's,>,>>,g')>$(echo "$title" | sed 's,>,>>,g')" + quoted="$(echo "$GRUB_ACTUAL_DEFAULT" | grub_quote)" + title_correction_code="${title_correction_code}if [ \"x\$default\" = '$quoted' ]; then default='$(echo "$replacement_title" | grub_quote)'; fi;" + grub_warn "$(gettext_printf "Please don't use old title \`%s' for GRUB_DEFAULT, use \`%s' (for versions before 2.00) or \`%s' (for 2.00 or later)" "$GRUB_ACTUAL_DEFAULT" "$replacement_title" "gnulinux-advanced-$boot_device_id>gnulinux-$version-$type-$boot_device_id")" + fi done if [ x"$is_top_level" != xtrue ]; then - echo '}' + echo '}' fi echo "$title_correction_code" ;; macosx) - # for subdevice in ${DEVICE%[[:digit:]]*}* ; do - # parttype="`"${grub_probe}" --device ${device} --target=gpt_parttype "${subdevice}" 2> /dev/null`" - # if [[ "$parttype" = "426f6f74-0000-11aa-aa11-00306543ecac" ]]; then - # DEVICE="${subdevice}" osx_entry - # fi - # done + # for subdevice in ${DEVICE%[[:digit:]]*}* ; do + # parttype="`"${grub_probe}" --device ${device} --target=gpt_parttype "${subdevice}" 2> /dev/null`" + # if [[ "$parttype" = "426f6f74-0000-11aa-aa11-00306543ecac" ]]; then + # DEVICE="${subdevice}" osx_entry + # fi + # done ;; hurd) found_other_os=1 @@ -264,52 +272,37 @@ EOF mach_device="`echo "${grub_device}" | sed -e 's/(\(hd.*\),msdos\(.*\))/\1s\2/'`" grub_fs="`${grub_probe} --device ${DEVICE} --target=fs`" case "${grub_fs}" in - *fs) hurd_fs="${grub_fs}" ;; - *) hurd_fs="${grub_fs}fs" ;; + *fs) hurd_fs="${grub_fs}" ;; + *) hurd_fs="${grub_fs}fs" ;; esac cat << EOF - multiboot /boot/gnumach.gz root=device:${mach_device} - module /hurd/${hurd_fs}.static ${hurd_fs} --readonly \\ - --multiboot-command-line='\${kernel-command-line}' \\ - --host-priv-port='\${host-port}' \\ - --device-master-port='\${device-port}' \\ - --exec-server-task='\${exec-task}' -T typed '\${root}' \\ - '\$(task-create)' '\$(task-resume)' - module /lib/ld.so.1 exec /hurd/exec '\$(exec-task=task-create)' + multiboot /boot/gnumach.gz root=device:${mach_device} + module /hurd/${hurd_fs}.static ${hurd_fs} --readonly \\ + --multiboot-command-line='\${kernel-command-line}' \\ + --host-priv-port='\${host-port}' \\ + --device-master-port='\${device-port}' \\ + --exec-server-task='\${exec-task}' -T typed '\${root}' \\ + '\$(task-create)' '\$(task-resume)' + module /lib/ld.so.1 exec /hurd/exec '\$(exec-task=task-create)' } EOF ;; minix) found_other_os=1 - cat << EOF + cat << EOF menuentry "${LONGNAME} (on ${DEVICE}, Multiboot)" { EOF save_default_entry | sed -e "s/^/\t/" prepare_grub_to_access_device ${DEVICE} | sed -e "s/^/\t/" - cat << EOF - multiboot /boot/image_latest + cat << EOF + multiboot /boot/image_latest } EOF ;; *) - case ${DEVICE} in - *.efi) - cat << EOF -menuentry '$(echo "${LONGNAME}" | grub_quote)' { -EOF - save_default_entry | grub_add_tab - cat << EOF - chainloader /EFI/${DEVICE} - boot -} -EOF - ;; - *) - echo -n " " - # TRANSLATORS: %s is replaced by OS name. - gettext_printf "%s is not yet supported by grub-mkconfig.\n" "${LONGNAME}" >&2 - ;; - esac + # TRANSLATORS: %s is replaced by OS name. + gettext_printf "%s is not yet supported by grub-mkconfig.\n" " ${LONGNAME}" >&2 + ;; esac done diff --git a/files/patches/bce_5_3.patch b/files/patches/bce_5_3.patch deleted file mode 100644 index b42cdec..0000000 --- a/files/patches/bce_5_3.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/vhci/vhci.c b/vhci/vhci.c -index 2acc514..618ddc3 100644 ---- a/vhci/vhci.c -+++ b/vhci/vhci.c -@@ -4,6 +4,7 @@ - #include - #include - #include -+#include - - static dev_t bce_vhci_chrdev; - static struct class *bce_vhci_class; -@@ -46,6 +47,9 @@ int bce_vhci_create(struct bce_device *dev, struct bce_vhci *vhci) - goto fail_hcd; - } - vhci->hcd->self.sysdev = &dev->pci->dev; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,4,0) -+ vhci->hcd->self.uses_dma = 1; -+#endif - *((struct bce_vhci **) vhci->hcd->hcd_priv) = vhci; - vhci->hcd->speed = HCD_USB2; - -@@ -695,7 +699,11 @@ static const struct hc_driver bce_vhci_driver = { - .product_desc = "BCE VHCI Host Controller", - .hcd_priv_size = sizeof(struct bce_vhci *), - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,4,0) -+ .flags = HCD_USB2, -+#else - .flags = HCD_USB2 | HCD_DMA, -+#endif - - .start = bce_vhci_start, - .stop = bce_vhci_stop, -@@ -743,4 +751,4 @@ void __exit bce_vhci_module_exit(void) - } - - module_param_named(vhci_port_mask, bce_vhci_port_mask, ushort, 0444); --MODULE_PARM_DESC(vhci_port_mask, "Specifies which VHCI ports are enabled"); -\ No newline at end of file -+MODULE_PARM_DESC(vhci_port_mask, "Specifies which VHCI ports are enabled"); diff --git a/files/post-install-kickstart/97-mbp-post-install.ks b/files/post-install-kickstart/97-mbp-post-install.ks index f57d25d..0f32f2b 100644 --- a/files/post-install-kickstart/97-mbp-post-install.ks +++ b/files/post-install-kickstart/97-mbp-post-install.ks @@ -26,7 +26,7 @@ if cat ${ANA_INSTALL_PATH}/etc/fstab | grep hfsplus ; then # rm -rf /etc/grub.d/30_os-prober # grub2-mkconfig -o /boot/efi/EFI/fedora/grub.cfg else - echo "OS installed on non-Apple device..." + echo "OS installed on non-Apple device..." fi %end diff --git a/files/post-install-kickstart/98-mbp-regenerate-grub-cfg.ks b/files/post-install-kickstart/98-mbp-regenerate-grub-cfg.ks index 10ac0c2..1d108d2 100644 --- a/files/post-install-kickstart/98-mbp-regenerate-grub-cfg.ks +++ b/files/post-install-kickstart/98-mbp-regenerate-grub-cfg.ks @@ -1,6 +1,6 @@ %post -grub2-mkconfig -o /boot/efi/EFI/fedora/grub.cfg +grub2-mkconfig -o /boot/grub2/grub.cfg grub2-editenv - set "$(grub2-editenv - list | grep kernelopts) efi=noruntime pcie_ports=compat modprobe.blacklist=thunderbolt" %end