28c28
< __FBSDID("$FreeBSD: head/usr.bin/mkimg/gpt.c 268236 2014-07-03 20:31:43Z marcel $");
---
> __FBSDID("$FreeBSD: head/usr.bin/mkimg/gpt.c 271881 2014-09-19 23:16:02Z marcel $");
156,157c156,157
< static u_int
< gpt_metadata(u_int where)
---
> static lba_t
> gpt_metadata(u_int where, lba_t blk)
159d158
< u_int secs;
161,166c160,164
< if (where != SCHEME_META_IMG_START && where != SCHEME_META_IMG_END)
< return (0);
<
< secs = gpt_tblsz();
< secs += (where == SCHEME_META_IMG_START) ? 2 : 1;
< return (secs);
---
> if (where == SCHEME_META_IMG_START || where == SCHEME_META_IMG_END) {
> blk += gpt_tblsz();
> blk += (where == SCHEME_META_IMG_START) ? 2 : 1;
> }
> return (round_block(blk));