Attachment 583531 Details for Bug 815318 – patch to use mkfs

[patch] patch to use mkfs

grub2-install-hfs.patch (text/plain), 1.65 KB, created by Karsten Hopp on 2012-05-10 12:24:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Karsten Hopp

Created: 2012-05-10 12:24:28 UTC

Size: 1.65 KB

patch

obsolete

>--- grub2-install_orig	2012-05-10 13:46:54.414980457 +0200
>+++ grub2-install	2012-05-10 14:10:34.933574047 +0200
>@@ -780,20 +780,20 @@
>                 exit 1
>             }
>         else
>-            hmount ${install_device} >/dev/null 2>&1
>+            hfsmountdir=$(mktemp -d /tmp/hfsmount-XXXXXX)
>+            mount -t hfs ${install_device} ${hfsmountdir}
>             if [ $? -eq 0 ]; then
>-                humount "${install_device}"
>                 # Change boot device to the harddisk root
>                 boot_device="$ofpath"
>-                hmount "${install_device}"
>-                hcopy "${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/core.${imgext}" ":" || {
>+                cp -f "${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/core.${imgext}" ${hfsmountdir}/ || {
>                     gettext "Failed to copy Grub to the HFS partition." 1>&2
>-                    gettext "Maybe the HFS partition is not empty. If you are sure you want to use it, run hformat to clear it:" 1>&2
>+                    gettext "Maybe the HFS partition is not empty. If you are sure you want to use it, run mkfs to clear it:" 1>&2
>                     echo 1>&2
>-                    echo "  hformat ${install_device}"
>+                    echo "  mkfs -t hfs -- -h ${install_device}"
>                     exit 1
>                 }
>-                humount "${install_device}"
>+                umount "${install_device}"
>+                rmdir ${hfsmountdir}
>                 # We're on PowerMac, it's either /dev/sdaX or /dev/hdaX:
>                 dev="`echo "${install_device}" | sed -e 's/\/dev\/.da//'`"
>                 boot_device="hd:${dev},core.${imgext}"

Actions: View | Diff

Attachments on bug 815318: 579631 | 580140 | 583531