Skip to content

M
mkimage-profiles
Commit a2c43788 authored by Anton Midyukov's avatar Anton Midyukov
Browse files
Options

tar2fs: Disable os-probe at the time of grub installation

os-probe finds loopback devices.
parent d568b114
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
bin/tar2fs
View file @ a2c43788
...@@ -397,6 +397,7 @@ image=/boot/vmlinuz ...@@ -397,6 +397,7 @@ image=/boot/vmlinuz
EOF EOF
;; ;;
grub-efi) grub-efi)
echo 'GRUB_DISABLE_OS_PROBER=true' >> "$ROOTFS"/etc/sysconfig/grub2
chroot "$ROOTFS" grub-mkconfig -o /boot/grub/grub.cfg chroot "$ROOTFS" grub-mkconfig -o /boot/grub/grub.cfg
case "$ARCH" in case "$ARCH" in
*86) *86)
...@@ -422,21 +423,24 @@ grub-efi) ...@@ -422,21 +423,24 @@ grub-efi)
--removable --no-uefi-secure-boot --removable --no-uefi-secure-boot
;; ;;
esac esac
sed -i '/GRUB_DISABLE_OS_PROBER=true/d' "$ROOTFS/etc/sysconfig/grub2"
;; ;;
grub) grub)
echo 'GRUB_DISABLE_OS_PROBER=true' >> "$ROOTFS"/etc/sysconfig/grub2
chroot "$ROOTFS" grub-mkconfig -o /boot/grub/grub.cfg chroot "$ROOTFS" grub-mkconfig -o /boot/grub/grub.cfg
case "$ARCH" in case "$ARCH" in
*86*) *86*)
chroot "$ROOTFS" grub-install --target=i386-pc "$LOOPDEV" chroot "$ROOTFS" grub-install --target=i386-pc "$LOOPDEV"
sed -i 's/initrdefi/initrd16/g' "$ROOTFS/boot/grub/grub.cfg" sed -i 's/initrdefi/initrd16/g' "$ROOTFS/boot/grub/grub.cfg"
sed -i 's/linuxefi/linux16/g' "$ROOTFS/boot/grub/grub.cfg" sed -i 's/linuxefi/linux16/g' "$ROOTFS/boot/grub/grub.cfg"
;; ;;
ppc*) ppc*)
[ -z "$LOOPBOOTLOADER" ] || [ -z "$LOOPBOOTLOADER" ] ||
chroot "$ROOTFS" grub-install --target=powerpc-ieee1275 \ chroot "$ROOTFS" grub-install --target=powerpc-ieee1275 \
--no-nvram "$LOOPBOOTLOADER" --no-nvram "$LOOPBOOTLOADER"
;; ;;
esac esac
sed -i '/GRUB_DISABLE_OS_PROBER=true/d' "$ROOTFS/etc/sysconfig/grub2"
;; ;;
esac esac
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment