From ed59a2e1225f79fd27dcae05c2fc948088e65854 Mon Sep 17 00:00:00 2001 From: Eric Edgar Date: Thu, 9 Feb 2006 12:16:03 +0000 Subject: [PATCH] Add hfs-hide options to mkisofs so macs boot git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1080 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 5 ++++- targets/support/create-iso.sh | 26 +++++++++++++++----------- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3cf25ba1..92014e1e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.565 2006/02/09 00:46:11 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.566 2006/02/09 12:16:03 rocket Exp $ + + 09 Feb 2006; Eric Edgar targets/support/create-iso.sh: + Add hfs-hide options to mkisofs so macs boot 09 Feb 2006; Eric Edgar modules/generic_stage_target.py: diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh index eaf0f333..7c2f3119 100755 --- a/targets/support/create-iso.sh +++ b/targets/support/create-iso.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/create-iso.sh,v 1.28 2006/02/03 22:39:47 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/create-iso.sh,v 1.29 2006/02/09 12:16:03 rocket Exp $ . ${clst_sharedir}/targets/support/functions.sh . ${clst_sharedir}/targets/support/filesystem-functions.sh @@ -237,15 +237,13 @@ case ${clst_mainarch} in case ${clst_fstype} in zisofs) echo "Running mkisofs to create iso image...." - echo "mkisofs -J -r -U -z -chrp-boot -netatalk -hfs -probe \ - -map ${clst_target_path}boot/map.hfs -part -no-desktop \ - -hfs-volid \"${clst_iso_volume_id}\" -hfs-bless \ - ${clst_target_path}boot -V \"${clst_iso_volume_id}\" -o \ - ${1} ${clst_target_path}" + echo "mkisofs -J -r -U -z -chrp-boot -netatalk -hfs -probe -map ${clst_target_path}boot/map.hfs -part -no-desktop -hfs-volid \"${clst_iso_volume_id}\" -hfs-bless ${clst_target_path}boot -hide-hfs \"zisofs\" -hide-hfs \"stages\" -hide-hfs \"distfiles\" -hide-hfs \"snapshots\" -V \"${clst_iso_volume_id}\" -o ${1} ${clst_target_path}" mkisofs -J -r -U -z -chrp-boot -netatalk -hfs -probe -map \ ${clst_target_path}boot/map.hfs -part -no-desktop \ -hfs-volid "${clst_iso_volume_id}" -hfs-bless \ - ${clst_target_path}boot -V "${clst_iso_volume_id}" -o \ + ${clst_target_path}boot -hide-hfs "zisofs" -hide-hfs "stages" \ + -hide-hfs "distfiles" -hide-hfs "snapshots" \ + -V "${clst_iso_volume_id}" -o \ ${1} ${clst_target_path} || die "Cannot make ISO image" ;; *) @@ -253,13 +251,19 @@ case ${clst_mainarch} in echo "mkisofs -J -r -U -chrp-boot -netatalk -hfs -probe -map \ ${clst_target_path}boot/map.hfs -part -no-desktop \ -hfs-volid \"${clst_iso_volume_id}\" -hfs-bless \ - ${clst_target_path}boot -V \"${clst_iso_volume_id}\" -o \ - ${1} ${clst_target_path}" + ${clst_target_path}boot -V \"${clst_iso_volume_id}\" \ + -hide-hfs \"stages\" -hide-hfs \"distfiles\" -hide-hfs \"snapshots\" \ + -hide-hfs \"image.loop\" -hide-hfs \"image.squashfs\" -hide-hfs \"image.jffs\" \ + -hide-hfs \"image.cramfs\" \ + -o ${1} ${clst_target_path}" mkisofs -J -r -U -chrp-boot -netatalk -hfs -probe -map \ ${clst_target_path}boot/map.hfs -part -no-desktop \ -hfs-volid "${clst_iso_volume_id}" -hfs-bless \ - ${clst_target_path}boot -V "${clst_iso_volume_id}" -o \ - ${1} ${clst_target_path} || die "Cannot make ISO image" + ${clst_target_path}boot -V "${clst_iso_volume_id}" \ + -hide-hfs "stages" -hide-hfs "distfiles" -hide-hfs "snapshots" \ + -hide-hfs "image.loop" -hide-hfs "image.squashfs" -hide-hfs "image.jffs" \ + -hide-hfs "image.cramfs" \ + -o ${1} ${clst_target_path} || die "Cannot make ISO image" ;; esac ;; -- 2.26.2