The installation of the hfsutils package is located in debian/postinst
similar to d-i/yaboot-installer, from which the code was adapted. But
d-i/grub-installer does all in-target installations from the
`grub-installer` script itself. If this is important this can still be
moved to `grub-installer`.
---
debian/changelog | 5 ++++-
debian/grub-installer.templates | 12 ++++++++++++
debian/postinst | 21 +++++++++++++++++++++
3 files changed, 37 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 0470484..0f1dc54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,11 @@ grub-installer (1.147) UNRELEASED; urgency=medium
[ Frank Scheiner ]
* Execute EFI related code only for installations of grub-efi* packages.
+ * Make d-i/grub-installer work for NewWorld Power Macs:
+ * Install hfsutils in-target for NewWorld Power Macs (adapted from
+ d-i/yaboot-installer).
- -- Frank Scheiner <frank.schei...@web.de> Thu, 31 Oct 2017 20:08:00 +0200
+ -- Frank Scheiner <frank.schei...@web.de> Thu, 06 Nov 2017 08:42:00 +0200
grub-installer (1.146) unstable; urgency=medium
diff --git a/debian/grub-installer.templates b/debian/grub-installer.templates
index e294afb..5f82c04 100644
--- a/debian/grub-installer.templates
+++ b/debian/grub-installer.templates
@@ -1,3 +1,15 @@
+Template: grub-installer/apt_install_hfsutils
+Type: text
+# :sl2:
+_Description: Installing hfsutils
+
+Template: grub-installer/apt_install_hfsutils_failed
+Type: error
+# :sl2:
+_Description: hfsutils installation failed
+ The hfsutils package failed to install into /target. Without it the NewWorld
+ boot partition cannot be formatted.
+
Template: grub-installer/with_other_os
Type: boolean
Default: true
diff --git a/debian/postinst b/debian/postinst
index 4b12027..cb18277 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -31,6 +31,27 @@ mountvirtfs () {
fi
}
+ARCH="$(archdetect)"
+
+case $ARCH in
+ powerpc/powermac_newworld|ppc64/powermac_newworld)
+ if ! apt-install hfsutils; then
+ info "Calling 'apt-install hfsutils' failed"
+ # Hm, unable to install hfsutils into /target/, what should we
do?
+ db_input critical grub-installer/apt_install_hfsutils_failed ||
[ $? -eq 30 ]
+ if ! db_go; then
+ db_progress STOP
+ exit 10 # back up to menu
+ fi
+ db_get grub-installer/apt_install_hfsutils_failed
+ if [ "$RET" != true ]; then
+ db_progress STOP
+ exit 1
+ fi
+ fi
+ ;;
+esac
+
# If we're installing grub-efi, it wants /sys mounted in the
# target. Maybe /proc too?
mountvirtfs proc /target/proc
--
1.9.1
