2009-06-16 Vladimir Serbinenko <phcoder@gmail.com>
xnu_uuid command * commands/xnu_uuid.c: new file * conf/common.rmk (pkglib_MODULES): add xnu_uuid.mod (xnu_uuid_mod_SOURCES): new variable (xnu_uuid_mod_CFLAGS): likewise (xnu_uuid_mod_LDFLAGS): likewise * conf/i386-coreboot.rmk (grub_emu_SOURCES): add commands/probe.c * conf/i386-ieee1275.rmk: likewise * conf/i386-pc.rmk: likewise * conf/powerpc-ieee1275.rmk: likewise * conf/sparc64-ieee1275.rmk: likewise * util/grub.d/30_os-prober.in: use UUID for Mac OS X/Darwin
This commit is contained in:
parent
c9da87d0f3
commit
693fe63766
10 changed files with 441 additions and 9 deletions
|
@ -93,9 +93,7 @@ EOF
|
|||
done
|
||||
;;
|
||||
macosx)
|
||||
OSXROOT="`grub-probe --target=drive --device ${DEVICE} 2> /dev/null`"
|
||||
# FIXME: use UUID
|
||||
OSXDISK=disk"`echo ${OSXROOT} | awk -F , '{ print $1 ; }' | sed 's/(hd//;'`"s"`echo ${OSXROOT} | awk -F , '{ print $2 ; }' | sed 's/)//;'`"
|
||||
OSXUUID="`grub-probe --target=fs_uuid --device ${DEVICE} 2> /dev/null`"
|
||||
cat << EOF
|
||||
menuentry "${LONGNAME} (on ${DEVICE})" {
|
||||
EOF
|
||||
|
@ -109,10 +107,11 @@ EOF
|
|||
fi
|
||||
fi
|
||||
if [ \$do_resume == 0 ]; then
|
||||
xnu_uuid ${OSXUUID} uuid
|
||||
if [ -f /Extra/DSDT.aml ]; then
|
||||
acpi -e /Extra/DSDT.aml
|
||||
fi
|
||||
xnu_kernel /mach_kernel rd=$OSXDISK
|
||||
xnu_kernel /mach_kernel boot-uuid=\${uuid} rd=*uuid
|
||||
if [ /System/Library/Extensions.mkext -nt /System/Library/Extensions ]; then
|
||||
xnu_mkext /System/Library/Extensions.mkext
|
||||
else
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue