fix rpi3 64bit

4 files changed, 2 insertions, 48 deletions

diff --git a/Fedora-rpi64-fedora.sh b/Fedora-rpi64-fedora.sh
deleted file mode 100755
index c5632ad..0000000
--- a/Fedora-rpi64-fedora.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-vers="${1-25}"
-name="fedora-${vers}-rpi3-fedora"
-repo="repos/fedora-${vers}-$(sh basearch.sh).repo"
-rpms="bcm283x-firmware uboot-images-armv8 extlinux-bootloader dracut-config-generic"
-krnl="kernel kernel-modules"
-
-arch="$(uname -m)"
-tar="${IMAGEFISH_DESTDIR-.}/${name}-${arch}.tar.gz"
-img="${IMAGEFISH_DESTDIR-.}/${name}-${arch}.raw"
-
-echo ""
-echo "###"
-echo "### $name"
-echo "###"
-
-set -ex
-rm -f "$tar" "$img"
-scripts/install-redhat.sh --config "$repo" --tar "$tar" --packages "$rpms" --kernel "$krnl" --dnf 
-scripts/tar-to-image.sh --tar "$tar" --image "$img" --rpi64
-scripts/config-systemd-network.sh "$img"
-scripts/config-kraxel-repo.sh "$img"
diff --git a/Fedora-rpi64-kraxel.sh b/Fedora-rpi64-kraxel.sh
deleted file mode 100755
index fe24986..0000000
--- a/Fedora-rpi64-kraxel.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-vers="${1-25}"
-name="fedora-${vers}-rpi3-kraxel"
-repo="repos/fedora-${vers}-$(sh basearch.sh).repo"
-rpms="bcm283x-firmware uboot-images-armv8 extlinux-bootloader dracut-config-generic"
-krnl="kernel-main"
-
-arch="$(uname -m)"
-tar="${IMAGEFISH_DESTDIR-.}/${name}-${arch}.tar.gz"
-img="${IMAGEFISH_DESTDIR-.}/${name}-${arch}.raw"
-
-echo ""
-echo "###"
-echo "### $name"
-echo "###"
-
-set -ex
-rm -f "$tar" "$img"
-scripts/install-redhat.sh --config "$repo" --tar "$tar" --packages "$rpms" --kernel "$krnl" --dnf 
-scripts/tar-to-image.sh --tar "$tar" --image "$img" --rpi64
-scripts/config-systemd-network.sh "$img"
-scripts/config-kraxel-repo.sh "$img"
diff --git a/Fedora-rpi64-efi.sh b/Fedora-rpi64.sh
index 068936c..04aff82 100755
--- a/Fedora-rpi64-efi.sh
+++ b/Fedora-rpi64.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 vers="${1-25}"
-name="fedora-${vers}-rpi3-efi"
+name="fedora-${vers}-rpi3"
 repo="repos/fedora-${vers}-$(sh basearch.sh).repo"
 rpms="bcm283x-firmware uboot-images-armv8 grub2-efi dracut-config-generic"
 krnl="kernel kernel-modules"
diff --git a/scripts/config-blacklist-module.sh b/scripts/config-blacklist-module.sh
index 4af599d..6e3e812 100755
--- a/scripts/config-blacklist-module.sh
+++ b/scripts/config-blacklist-module.sh
@@ -9,7 +9,7 @@ if test "$image" = ""; then
 fi
 
 if virt-cat -a "$image" /etc/grub2-efi.cfg >/dev/null; then
-	bootedit="/etc/grub2-efi.cfg:s/linuxefi/linuxefi rd.driver.blacklist=${module}/"
+	bootedit="/etc/grub2-efi.cfg:s/^([ \t]*linux[ ]+[^ ]+)/\1 rd.driver.blacklist=${module}/"
 else
 	bootedit="/boot/extlinux/extlinux.conf:s/append/append rd.driver.blacklist=${module}/"
 fi