53fcdb2d1a
-T (track size) or -H (number of heads) is given:
o scheme_metadata() always rounded to the block size. This is not
always valid (e.g. vtoc8 that must have partitions start at cylinder
boundaries).
o The bsd and vtoc8 schemes "resized" the image to make it match the
geometry, but since the geometry is an approximation and the size
of the image computed from cylinders * heads * sectors is always
smaller than the original image size, the partition information ran
out of bounds.
The fix is to have scheme_metadata() simply pass it's arguments to the
per-scheme metadata callback, so that schemes not only know where the
metadata is to go, but also what the current block address is. It's now
up to the per-scheme callback to reserve room for metadata and to make
sure alignment and rounding is applied.
The BSD scheme now has the most elaborate alignment and rounding. Just
to make the point: partitions are aligned on block boundaries, but the
image is rounded to the next cyclinder boundary.
vtoc8 now properly has all partitions aligned (and rounded) to the
cyclinder boundary.
Obtained from: Juniper Networks, Inc.
MFC after: 3 days
91 lines
2.7 KiB
C
91 lines
2.7 KiB
C
/*-
|
|
* Copyright (c) 2013,2014 Juniper Networks, Inc.
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*
|
|
* $FreeBSD$
|
|
*/
|
|
|
|
#ifndef _MKIMG_SCHEME_H_
|
|
#define _MKIMG_SCHEME_H_
|
|
|
|
#include <sys/linker_set.h>
|
|
|
|
enum alias {
|
|
ALIAS_NONE, /* Keep first! */
|
|
/* start */
|
|
ALIAS_EBR,
|
|
ALIAS_EFI,
|
|
ALIAS_FAT32,
|
|
ALIAS_FREEBSD,
|
|
ALIAS_FREEBSD_BOOT,
|
|
ALIAS_FREEBSD_NANDFS,
|
|
ALIAS_FREEBSD_SWAP,
|
|
ALIAS_FREEBSD_UFS,
|
|
ALIAS_FREEBSD_VINUM,
|
|
ALIAS_FREEBSD_ZFS,
|
|
ALIAS_MBR,
|
|
/* end */
|
|
ALIAS_COUNT /* Keep last! */
|
|
};
|
|
|
|
struct mkimg_alias {
|
|
u_int alias;
|
|
uintptr_t type;
|
|
#define ALIAS_PTR2TYPE(p) (uintptr_t)(p)
|
|
#define ALIAS_INT2TYPE(i) (i)
|
|
#define ALIAS_TYPE2PTR(p) (void *)(p)
|
|
#define ALIAS_TYPE2INT(i) (i)
|
|
};
|
|
|
|
struct mkimg_scheme {
|
|
const char *name;
|
|
const char *description;
|
|
struct mkimg_alias *aliases;
|
|
lba_t (*metadata)(u_int, lba_t);
|
|
#define SCHEME_META_IMG_START 1
|
|
#define SCHEME_META_IMG_END 2
|
|
#define SCHEME_META_PART_BEFORE 3
|
|
#define SCHEME_META_PART_AFTER 4
|
|
int (*write)(lba_t, void *);
|
|
u_int nparts;
|
|
u_int labellen;
|
|
u_int bootcode;
|
|
u_int maxsecsz;
|
|
};
|
|
|
|
SET_DECLARE(schemes, struct mkimg_scheme);
|
|
#define SCHEME_DEFINE(nm) DATA_SET(schemes, nm)
|
|
|
|
int scheme_select(const char *);
|
|
struct mkimg_scheme *scheme_selected(void);
|
|
|
|
int scheme_bootcode(int fd);
|
|
int scheme_check_part(struct part *);
|
|
u_int scheme_max_parts(void);
|
|
u_int scheme_max_secsz(void);
|
|
lba_t scheme_metadata(u_int, lba_t);
|
|
int scheme_write(lba_t);
|
|
|
|
#endif /* _MKIMG_SCHEME_H_ */
|