X-Git-Url: http://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=scripts%2Fbootgrub.mksh;h=57ed0f241da625a9042c2cfe9e4ad061b3d19555;hp=8aa234947017b78fb01039a38517f65a4069a303;hb=4cd65718be7890b8dec7939c0af769da9bc8e320;hpb=2099cea1d5499c33aa65d7144c0e89ce66a78651

diff --git a/scripts/bootgrub.mksh b/scripts/bootgrub.mksh
index 8aa2349..57ed0f2 100644
--- a/scripts/bootgrub.mksh
+++ b/scripts/bootgrub.mksh
@@ -1,8 +1,9 @@
 #!/usr/bin/env mksh
 # $Id$
-# $miros: src/sys/arch/i386/stand/bootxx/mkbxinst.sh,v 1.20 2009/06/07 18:00:43 tg Exp $
+# $miros: src/sys/arch/i386/stand/bootxx/mkbxinst.sh,v 1.28 2010/11/12 21:20:35 tg Exp $
+# $miros: src/sys/arch/i386/stand/bootxx/bootxx.S,v 1.26 2010/12/01 19:56:58 tg Exp $ +t:GRUB +s:MBR
 #-
-# Copyright (c) 2007, 2008, 2009
+# Copyright (c) 2007, 2008, 2009, 2010
 #	Thorsten Glaser <tg@mirbsd.org>
 #
 # Provided that these terms and disclaimer and all copyright notices
@@ -25,20 +26,20 @@
 # and writes bootxx to standard output, which can subsequentially be
 # stored as partition boot record (or floppy boot sector) on disc.
 
-set -A thecode 0x66 0x31 0xC9 0xBB 0x00 0x30 0x8E 0xD3 0xBC 0xFC 0xFF 0x66 0x51 0x66 0x9D 0x8E 0xC1 0xBF 0x00 0x7C 0x57 0xB1 0x10 0xF3 0xA4 0x5E 0x8E 0xD9 0xBB 0x00 0x08 0x53 0x53 0x8E 0xC3 0xBF 0x00 0xFE 0xB5 0x02 0xF3 0xA4 0x1F 0x68 0x7D 0xFE 0xCB 0x30 0x41 0x41 0x38 0x20 0x4C 0x6F 0x61 0x64 0x69 0x6E 0x67 0x20 0x00 0x62 0x61 0x64 0x20 0x6D 0x61 0x67 0x69 0x63 0x20 0x65 0x72 0x72 0x6F 0x72 0x0D 0x0A 0x00 0x84 0x02 0x00 0x12 0x00 0x00 0x80 0x77 0xFF 0xB4 0x0E 0xBB 0x07 0x00 0xCD 0x10 0xAC 0x08 0xC0 0x75 0xF4 0xC3 0xE8 0xF7 0xFF 0xB8 0x53 0xFF 0x87 0x06 0x56 0xFE 0x3D 0x53 0xFF 0x75 0x19 0x31 0xC0 0xCD 0x16 0xEA 0xF0 0xFF 0x00 0xF0 0xFB 0x88 0x16 0x55 0xFE 0xBE 0x2F 0xFE 0x80 0xFA 0x80 0x72 0xDB 0xE8 0xD2 0xFF 0x31 0xDB 0xBE 0x7A 0xFF 0x0F 0xB6 0x2E 0x4F 0xFE 0xAC 0x0F 0xB6 0xC8 0xC0 0xE9 0x05 0x83 0xE0 0x1F 0x40 0x41 0x50 0xBF 0x10 0xFE 0xB8 0x10 0x00 0xAB 0xB0 0x01 0xAB 0x89 0xD8 0xAB 0x8C 0xC8 0xAB 0xF3 0xA4 0x31 0xC0 0xAB 0xAB 0xAB 0xAB 0x5F 0x55 0x56 0xBE 0x10 0xFE 0xFF 0x16 0x56 0xFE 0xBD 0x04 0x00 0x8A 0x16 0x55 0xFE 0x60 0xF9 0xCD 0x13 0x9C 0xB8 0x2E 0x0E 0xBB 0x07 0x00 0xCD 0x10 0x9D 0xFB 0x61 0x73 0x1C 0x4D 0x60 0x9C 0x31 0xC0 0xCD 0x13 0x9D 0xBE 0x46 0xFE 0x0F 0x84 0x77 0xFF 0xB8 0x30 0x0E 0x01 0xE8 0xBB 0x07 0x00 0xCD 0x10 0x61 0xEB 0xD2 0xB4 0x02 0x00 0xE7 0x89 0x5C 0x04 0x00 0xFC 0x72 0x14 0x66 0x83 0x44 0x08 0x01 0x66 0x83 0x54 0x0C 0x00 0x4F 0x75 0xAC 0x5E 0x5D 0x4D 0x0F 0x85 0x7D 0xFF 0xBE 0x4C 0xFE 0xE8 0x3F 0xFF 0x66 0x31 0xD2 0x52 0x66 0x4A 0x8A 0x16 0x55 0xFE 0xB8 0x00 0x82 0x50 0xFA 0xCB 0x60 0x06 0xB4 0x08 0x8A 0x16 0x55 0xFE 0xF9 0xCD 0x13 0xFB 0x07 0xBE 0x46 0xFE 0x0F 0x82 0x21 0xFF 0x80 0xE1 0x3F 0x88 0x0E 0x52 0xFE 0x0F 0xB6 0xC6 0x40 0xA3 0x50 0xFE 0x61 0x8B 0x0E 0x52 0xFE 0xE3 0xD7 0x8B 0x44 0x08 0x8B 0x54 0x0A 0xF7 0xF1 0x42 0x31 0xC9 0x87 0xD1 0xF7 0x36 0x50 0xFE 0xC0 0xE4 0x06 0x86 0xC4 0x09 0xC1 0x88 0xD6 0xB8 0x01 0x02 0xC3 0xB4 0x42 0xC3
-typeset -i ofs_bkcnt=79
-typeset -i ofs_geomh=80
-typeset -i ofs_geoms=82
-typeset -i ofs_partp=84
-typeset -i ofs_secsz=252
-typeset -i begptr=378
+set -A thecode 0x66 0x31 0xC9 0x8E 0xD1 0xBC 0xFC 0x7B 0x66 0x51 0x66 0x9D 0x8E 0xC1 0xBE 0x00 0x7C 0x8E 0xD9 0xBB 0x00 0x08 0x53 0x53 0x8E 0xC3 0xBF 0x00 0xFE 0xB5 0x02 0xF3 0xA4 0x1F 0x68 0x6B 0xFE 0xCB 0x30 0x41 0x41 0x44 0x20 0x4C 0x6F 0x61 0x64 0x69 0x6E 0x67 0x20 0x00 0x20 0x65 0x72 0x72 0x6F 0x72 0x0D 0x0A 0x00 0x96 0x02 0x00 0x12 0x00 0x00 0x80 0x65 0xFF 0xB4 0x0E 0xBB 0x07 0x00 0xCD 0x10 0xAC 0x08 0xC0 0x75 0xF4 0xC3 0xE8 0xF7 0xFF 0xB8 0x41 0xFF 0x87 0x06 0x44 0xFE 0x3D 0x41 0xFF 0x75 0x19 0x31 0xC0 0xCD 0x16 0xEA 0xF0 0xFF 0x00 0xF0 0xFB 0x88 0x16 0x43 0xFE 0xBE 0x26 0xFE 0x80 0xFA 0x80 0x72 0xDB 0xE8 0xD2 0xFF 0x31 0xDB 0xBE 0x68 0xFF 0x0F 0xB6 0x2E 0x3D 0xFE 0xAC 0x0F 0xB6 0xC8 0xC0 0xE9 0x05 0x83 0xE0 0x1F 0x40 0x41 0x50 0xBF 0x10 0xFE 0xB8 0x10 0x00 0xAB 0xB0 0x01 0xAB 0x89 0xD8 0xAB 0x8C 0xC8 0xAB 0xF3 0xA4 0x31 0xC0 0xAB 0xAB 0xAB 0xAB 0x5F 0x55 0x56 0xBE 0x10 0xFE 0xFF 0x16 0x44 0xFE 0xBD 0x04 0x00 0x8A 0x16 0x43 0xFE 0x60 0xF9 0xCD 0x13 0x9C 0xB8 0x2E 0x0E 0xBB 0x07 0x00 0xCD 0x10 0x9D 0xFB 0x61 0x73 0x1C 0x4D 0x60 0x9C 0x31 0xC0 0xCD 0x13 0x9D 0xBE 0x34 0xFE 0x0F 0x84 0x77 0xFF 0xB8 0x30 0x0E 0x01 0xE8 0xBB 0x07 0x00 0xCD 0x10 0x61 0xEB 0xD2 0xB4 0x02 0x00 0xE7 0x89 0x5C 0x04 0x00 0xFC 0x72 0x14 0x66 0x83 0x44 0x08 0x01 0x66 0x83 0x54 0x0C 0x00 0x4F 0x75 0xAC 0x5E 0x5D 0x4D 0x0F 0x85 0x7D 0xFF 0xBE 0x3A 0xFE 0xE8 0x3F 0xFF 0x66 0x31 0xD2 0x52 0x66 0x4A 0x8A 0x16 0x43 0xFE 0xB8 0x00 0x82 0x50 0xFA 0xCB 0x60 0x06 0xB4 0x08 0x8A 0x16 0x43 0xFE 0xF9 0xCD 0x13 0xFB 0x07 0xBE 0x34 0xFE 0x0F 0x82 0x21 0xFF 0x80 0xE1 0x3F 0x88 0x0E 0x40 0xFE 0x0F 0xB6 0xC6 0x40 0xA3 0x3E 0xFE 0x61 0x8B 0x0E 0x40 0xFE 0xE3 0xD7 0x8B 0x44 0x08 0x8B 0x54 0x0A 0xF7 0xF1 0x42 0x31 0xC9 0x87 0xD1 0xF7 0x36 0x3E 0xFE 0xC0 0xE4 0x06 0x86 0xC4 0x09 0xC1 0x88 0xD6 0xB8 0x01 0x02 0xC3 0xB4 0x42 0xC3
+typeset -i ofs_bkcnt=61
+typeset -i ofs_geomh=62
+typeset -i ofs_geoms=64
+typeset -i ofs_partp=66
+typeset -i ofs_secsz=234
+typeset -i begptr=360
 typeset -Uui8 thecode
 
 typeset -Uui16 curptr=begptr
 typeset -i wnum=0 wofs=0 wrec=0 bkend=0x1FE
 
 function do_record {
-	typeset -i blk=$1 cnt=$2 n
+	typeset -Ui blk=$1 cnt=$2 n
 	typeset -Uui16 x=blk y
 
 	(( blk && cnt )) || return
@@ -65,7 +66,7 @@ function do_record {
 }
 
 function record_block {
-	typeset -i sv blk=$1
+	typeset -Ui blk=$1
 
 	if (( !blk || (wofs && blk != (wofs + wnum)) )); then
 		# flush the blocks from the cache
@@ -80,10 +81,10 @@ function record_block {
 	fi
 }
 
-typeset -i partp=0 numheads=0 numsecs=0 sscale=0 bsh=9 mbrpno=0
+typeset -i partp=0 numheads=0 numsecs=0 sscale=0 bsh=9 mbrpno=0 mbrptp=0 pofs=0
 set -A g_code 0 0 0
 
-while getopts ":0:1AB:g:h:M:p:S:s:" ch; do
+while getopts ":0:1AB:g:h:M:O:p:S:s:" ch; do
 	case $ch {
 	(0)	;;
 	(1)	;;
@@ -91,7 +92,7 @@ while getopts ":0:1AB:g:h:M:p:S:s:" ch; do
 		numsecs=99
 		;;
 	(B)	if (( (bsh = OPTARG) < 9 || OPTARG > 15 )); then
-			print -u2 error: invalid block size "2^'$OPTARG'"
+			print -u2 Error: invalid block size "2^'$OPTARG'"
 			exit 1
 		fi
 		;;
@@ -104,30 +105,53 @@ while getopts ":0:1AB:g:h:M:p:S:s:" ch; do
 		set -A g_code -- $OPTARG
 		IFS=$saveIFS ;;
 	(h)	if (( (numheads = OPTARG) < 1 || OPTARG > 256 )); then
-			print -u2 warning: invalid head count "'$OPTARG'"
+			print -u2 Warning: invalid head count "'$OPTARG'"
 			numheads=0
 		fi ;;
-	(M)	if (( (mbrpno = OPTARG) < 1 || OPTARG > 4 )); then
-			print -u2 warning: invalid partition number "'$OPTARG'"
+	(M)	if [[ $OPTARG != +([0-9])?(:?(0[Xx])+([0-9])) ]]; then
+			print -u2 Warning: invalid partition info "'$OPTARG'"
 			mbrpno=0
+			mbrptp=0
+		else
+			saveIFS=$IFS
+			IFS=:
+			set -A mbr_code -- $OPTARG
+			IFS=$saveIFS
+			(( mbrpno = mbr_code[0] ))
+			(( mbrptp = mbr_code[1] ))
+			if (( mbrpno < 1 || mbrpno > 4 )); then
+				print -u2 Warning: invalid partition \
+				    number "'$OPTARG'"
+				mbrpno=0
+			fi
+			if (( mbrptp < 1 || mbrptp > 255 )); then
+				print -u2 Warning: invalid partition \
+				    type "'$OPTARG'"
+				mbrptp=0
+			fi
+		fi ;;
+	(O)	if [[ $OPTARG != +([0-9]) ]]; then
+			print -u2 Warning: invalid partition offset "'$OPTARG'"
+		else
+			pofs=$OPTARG
 		fi ;;
 	(p)	if (( (partp = OPTARG) < 1 || OPTARG > 255 )); then
-			print -u2 warning: invalid partition type "'$OPTARG'"
+			print -u2 Warning: invalid partition type "'$OPTARG'"
 			partp=0
 		fi ;;
 	(S)	if (( (sscale = OPTARG) < 0 || OPTARG > 24 )); then
-			print -u2 error: invalid input scale "'$OPTARG'"
+			print -u2 Error: invalid input scale "'$OPTARG'"
 			exit 1
 		fi ;;
 	(s)	if (( (numsecs = OPTARG) < 1 || OPTARG > 63 )); then
-			print -u2 warning: invalid sector count "'$OPTARG'"
+			print -u2 Warning: invalid sector count "'$OPTARG'"
 			numsecs=0
 		fi ;;
 	(*)	print -u2 'Syntax:
-	bxinst [-1A] [-B blocksize] [-g C:H:S] [-h heads] [-M partno(1..4)]
-	    [-p partitiontype] [-S scale] [-s sectors] <sectorlist | \\
+	bxinst [-1A] [-B blocksize] [-g C:H:S] [-h heads] [-M pno(1..4)[:typ]]
+	    [-O partitionofs] [-p type] [-S scale] [-s secs] <sectorlist | \\
 	    dd of=image conv=notrunc
-Default values: blocksize=9 heads=16 sectors=63 partitiontype=0x27 scale=0
+Default values: blocksize=9 heads=16 sectors=63 part.ofs=0 type=0x27 scale=0
     partno=4 if -g (create MBR partition) is given; -A = auto boot geometry'
 		exit 1 ;;
 	}
@@ -153,7 +177,7 @@ if (( psz )); then
 	    "$psz * $((1 << bsh))" | bc) bytes\) in ${g_code[0]} cylinders, \
 	    ${g_code[1]} heads, ${g_code[2]} sectors per track
 	if (( numsecs == 0 || (numsecs != 99 && numheads == 0) )); then
-		print -u2 warning: using these values for C/H/S boot
+		print -u2 Warning: using these values for C/H/S boot
 		numheads=${g_code[1]}
 		numsecs=${g_code[2]}
 	fi
@@ -161,7 +185,7 @@ if (( psz )); then
 fi
 if (( mbrpno )); then
 	bkend=0x1BE
-	(( psz )) || print -u2 warning: no geometry given, will not \
+	(( psz )) || print -u2 Warning: no geometry given, will not \
 	    create an MBR partition table entry
 fi
 
@@ -170,12 +194,12 @@ if (( numsecs == 99 )); then
 	numsecs=0
 else
 	if (( !numheads )); then
-		print -u2 warning: using default value of 16 heads
+		print -u2 Warning: using default value of 16 heads
 		numheads=16
 	fi
 
 	if (( !numsecs )); then
-		print -u2 warning: using default value of 63 sectors
+		print -u2 Warning: using default value of 63 sectors
 		numsecs=63
 	fi
 fi
@@ -191,7 +215,7 @@ print -u2 "using $wrec blocks, $((curptr-begptr)) bytes ($((bkend-curptr)) free)
 
 # fill the block table
 if (( curptr-- > bkend )); then
-	print -u2 error: too many blocks
+	print -u2 Error: too many blocks
 	exit 1
 fi
 while (( ++curptr < bkend )); do
@@ -216,23 +240,33 @@ print -u2 "using sectors of 2^$bsh = $((1 << bsh)) bytes"
 # create an MBR partition if desired
 if (( psz )); then
 	(( mbrpno = 0x1BE + ((mbrpno - 1) * 16) ))
+	set -A o_code	# g_code equivalent for partition offset
+	(( o_code[2] = pofs % g_code[2] + 1 ))
+	(( o_code[1] = pofs / g_code[2] ))
+	(( o_code[0] = o_code[1] / g_code[1] + 1 ))
+	(( o_code[1] = o_code[1] % g_code[1] + 1 ))
+	# boot flag; C/H/S offset
 	thecode[mbrpno++]=0x80
-	thecode[mbrpno++]=0
-	thecode[mbrpno++]=1
-	thecode[mbrpno++]=0
-	(( thecode[mbrpno++] = (partp ? partp : 0x27) ))
+	(( thecode[mbrpno++] = o_code[1] - 1 ))
+	(( cylno = o_code[0] > 1024 ? 1023 : o_code[0] - 1 ))
+	(( thecode[mbrpno++] = o_code[2] | ((cylno & 0x0300) >> 2) ))
+	(( thecode[mbrpno++] = cylno & 0x00FF ))
+	# partition type; C/H/S end
+	(( thecode[mbrpno++] = (mbrptp ? mbrptp : partp ? partp : 0x27) ))
 	(( thecode[mbrpno++] = g_code[1] - 1 ))
 	(( cylno = g_code[0] > 1024 ? 1023 : g_code[0] - 1 ))
 	(( thecode[mbrpno++] = g_code[2] | ((cylno & 0x0300) >> 2) ))
 	(( thecode[mbrpno++] = cylno & 0x00FF ))
-	thecode[mbrpno++]=0
-	thecode[mbrpno++]=0
-	thecode[mbrpno++]=0
-	thecode[mbrpno++]=0
-	(( thecode[mbrpno++] = psz & 0xFF ))
-	(( thecode[mbrpno++] = (psz >> 8) & 0xFF ))
-	(( thecode[mbrpno++] = (psz >> 16) & 0xFF ))
-	(( thecode[mbrpno++] = (psz >> 24) & 0xFF ))
+	# partition offset, size (LBA)
+	(( thecode[mbrpno++] = pofs & 0xFF ))
+	(( thecode[mbrpno++] = (pofs >> 8) & 0xFF ))
+	(( thecode[mbrpno++] = (pofs >> 16) & 0xFF ))
+	(( thecode[mbrpno++] = (pofs >> 24) & 0xFF ))
+	(( pssz = psz - pofs ))
+	(( thecode[mbrpno++] = pssz & 0xFF ))
+	(( thecode[mbrpno++] = (pssz >> 8) & 0xFF ))
+	(( thecode[mbrpno++] = (pssz >> 16) & 0xFF ))
+	(( thecode[mbrpno++] = (pssz >> 24) & 0xFF ))
 fi
 
 # create the output string