d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
master
freebsd-skq/usr.bin/mkimg/bsd.c

136 lines
4.0 KiB
C
Raw Permalink Normal View History

Use linker sets to provide build-time selection of the schemes that need to be supported. Each scheme provides data and callbacks for handling the scheme-specifics. To this end, put each scheme in its own source file.
2014-03-20 00:38:17 +00:00
/*-
* Copyright (c) 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.
*/
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
Add a scheme-specific write callback to write the metadata. While here: 1. Move FreeBSD-specific headers to a more centralized place, so that it's easier to port mkimg. 2. Remove inclusion of <uuid.h> where we don't need it (copy-pasted). 3. Check the partition data given on the command line before we do any I/O. 4. Add scheme_round() for rounding the partition size. 5. Have scheme_write call the scheme-specific write callback and have it propagate errors back to the caller.
2014-03-20 20:14:26 +00:00
#include <sys/errno.h>
Prefer <stdint.h> over <sys/types.h>. While here remove redundant inclusion of <sys/queue.h>. Move the inclusion of the disk partitioning headers out of order and inbetween standard headers and local header. They will change in a subsequent commit.
2016-10-03 02:37:28 +00:00
#include <stdint.h>
Use linker sets to provide build-time selection of the schemes that need to be supported. Each scheme provides data and callbacks for handling the scheme-specifics. To this end, put each scheme in its own source file.
2014-03-20 00:38:17 +00:00
#include <stdlib.h>
Implement the BSD scheme. This doesn't quite work as geom_part_bsd finds an invalid label. I'm not going to worry about that right now, because there's more to worry about: the BSD disk label has the 'c' partition for the entire disk and we don't handle this at all. Note also that the BSD disk label wants a geometry, so this will have to be revisited anyway once a good solution is in place.
2014-03-23 19:22:13 +00:00
#include <string.h>
Use linker sets to provide build-time selection of the schemes that need to be supported. Each scheme provides data and callbacks for handling the scheme-specifics. To this end, put each scheme in its own source file.
2014-03-20 00:38:17 +00:00
o Provide a private definition for UUIDs (mkimg_uuid_t) because UUIDs are not portable. o Move mkimg_uuid() to a new file and merge both gpt_uuid_enc() and vhd_uuid_enc() into a single mkimg_uuid_enc() that lives in the same file. o Move the OS-specific implementation of generating a UUID to osdep_uuidgen() and provide the implementations for FreeBSD, macOS and Linux. o Expect the partitioning scheme headers to be found by having a search to the directory in which the headers live. This avoids conflicts on non-FreeBSD machines.
2016-10-18 01:55:07 +00:00
#include <bsd.h>
Prefer <stdint.h> over <sys/types.h>. While here remove redundant inclusion of <sys/queue.h>. Move the inclusion of the disk partitioning headers out of order and inbetween standard headers and local header. They will change in a subsequent commit.
2016-10-03 02:37:28 +00:00
Avoid depending on the <sys/endian.h> header for le*enc and be*enc. Not only is the header unportable, the encoding/decoding functions are as well. Instead, duplicate the handful of small inlines we need into a private header called endian.h. Aside: an alternative approach is to move the encoding/decoding functions to a separate system header. While the header is still nonportable, such an approach would make it possible to re-use the definitions by playing games with include paths. This may be the preferred approach if more (build) utilities need this. This change does not preclude that. In fact, it makes it easier.
2016-09-26 01:06:32 +00:00
#include "endian.h"
Switch to the image API: 1. Replace calls to mkimg_set_size() with calls to image_set_size() 2. Remove the mkimg_set_size() function 3. As above but for mkimg_write() and image_write() Note that this breaks mkimg(1). The image API has no implementation. Hence doing it on my branch :-)
2014-05-07 17:33:31 +00:00
#include "image.h"
Use linker sets to provide build-time selection of the schemes that need to be supported. Each scheme provides data and callbacks for handling the scheme-specifics. To this end, put each scheme in its own source file.
2014-03-20 00:38:17 +00:00
#include "mkimg.h"
#include "scheme.h"
static struct mkimg_alias bsd_aliases[] = {
Implement the BSD scheme. This doesn't quite work as geom_part_bsd finds an invalid label. I'm not going to worry about that right now, because there's more to worry about: the BSD disk label has the 'c' partition for the entire disk and we don't handle this at all. Note also that the BSD disk label wants a geometry, so this will have to be revisited anyway once a good solution is in place.
2014-03-23 19:22:13 +00:00
{ ALIAS_FREEBSD_NANDFS, ALIAS_INT2TYPE(FS_NANDFS) },
{ ALIAS_FREEBSD_SWAP, ALIAS_INT2TYPE(FS_SWAP) },
{ ALIAS_FREEBSD_UFS, ALIAS_INT2TYPE(FS_BSDFFS) },
{ ALIAS_FREEBSD_VINUM, ALIAS_INT2TYPE(FS_VINUM) },
{ ALIAS_FREEBSD_ZFS, ALIAS_INT2TYPE(FS_ZFS) },
Add more partition types (mostly just the FreeBSD ones) to GPT. Avoid having schemes use literal strings by introducing an enum as the intermediate representation (see geom_part).
2014-03-21 16:11:49 +00:00
{ ALIAS_NONE, 0 }
Use linker sets to provide build-time selection of the schemes that need to be supported. Each scheme provides data and callbacks for handling the scheme-specifics. To this end, put each scheme in its own source file.
2014-03-20 00:38:17 +00:00
};
Fix partition alignment and image rounding when any of -P (block size), -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
2014-09-19 23:16:02 +00:00
static lba_t
bsd_metadata(u_int where, lba_t blk)
Use linker sets to provide build-time selection of the schemes that need to be supported. Each scheme provides data and callbacks for handling the scheme-specifics. To this end, put each scheme in its own source file.
2014-03-20 00:38:17 +00:00
{
Fix partition alignment and image rounding when any of -P (block size), -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
2014-09-19 23:16:02 +00:00
if (where == SCHEME_META_IMG_START)
Switch to using the portable partition scheme headers.
2016-10-16 02:55:52 +00:00
blk += BSD_BOOTBLOCK_SIZE / secsz;
Fix partition alignment and image rounding when any of -P (block size), -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
2014-09-19 23:16:02 +00:00
else if (where == SCHEME_META_IMG_END)
blk = round_cylinder(blk);
else
blk = round_block(blk);
return (blk);
Use linker sets to provide build-time selection of the schemes that need to be supported. Each scheme provides data and callbacks for handling the scheme-specifics. To this end, put each scheme in its own source file.
2014-03-20 00:38:17 +00:00
}
Add a scheme-specific write callback to write the metadata. While here: 1. Move FreeBSD-specific headers to a more centralized place, so that it's easier to port mkimg. 2. Remove inclusion of <uuid.h> where we don't need it (copy-pasted). 3. Check the partition data given on the command line before we do any I/O. 4. Add scheme_round() for rounding the partition size. 5. Have scheme_write call the scheme-specific write callback and have it propagate errors back to the caller.
2014-03-20 20:14:26 +00:00
static int
Switch to the image API: 1. Replace calls to mkimg_set_size() with calls to image_set_size() 2. Remove the mkimg_set_size() function 3. As above but for mkimg_write() and image_write() Note that this breaks mkimg(1). The image API has no implementation. Hence doing it on my branch :-)
2014-05-07 17:33:31 +00:00
bsd_write(lba_t imgsz, void *bootcode)
Add a scheme-specific write callback to write the metadata. While here: 1. Move FreeBSD-specific headers to a more centralized place, so that it's easier to port mkimg. 2. Remove inclusion of <uuid.h> where we don't need it (copy-pasted). 3. Check the partition data given on the command line before we do any I/O. 4. Add scheme_round() for rounding the partition size. 5. Have scheme_write call the scheme-specific write callback and have it propagate errors back to the caller.
2014-03-20 20:14:26 +00:00
{
Implement the BSD scheme. This doesn't quite work as geom_part_bsd finds an invalid label. I'm not going to worry about that right now, because there's more to worry about: the BSD disk label has the 'c' partition for the entire disk and we don't handle this at all. Note also that the BSD disk label wants a geometry, so this will have to be revisited anyway once a good solution is in place.
2014-03-23 19:22:13 +00:00
u_char *buf, *p;
struct disklabel *d;
struct partition *dp;
struct part *part;
Fix checksum calculation: 1. Iterate over all partitions counted in the label, which can be more than the number of partitions given to mkimg(1). 2. Start the checksum from the beginning of the label; not the beginning of the bootarea. Tested with bsdlabel(8). MFC after: 3 days
2014-09-12 03:54:16 +00:00
int bsdparts, error, n;
Implement the BSD scheme. This doesn't quite work as geom_part_bsd finds an invalid label. I'm not going to worry about that right now, because there's more to worry about: the BSD disk label has the 'c' partition for the entire disk and we don't handle this at all. Note also that the BSD disk label wants a geometry, so this will have to be revisited anyway once a good solution is in place.
2014-03-23 19:22:13 +00:00
uint16_t checksum;
Switch to using the portable partition scheme headers.
2016-10-16 02:55:52 +00:00
buf = malloc(BSD_BOOTBLOCK_SIZE);
Implement the BSD scheme. This doesn't quite work as geom_part_bsd finds an invalid label. I'm not going to worry about that right now, because there's more to worry about: the BSD disk label has the 'c' partition for the entire disk and we don't handle this at all. Note also that the BSD disk label wants a geometry, so this will have to be revisited anyway once a good solution is in place.
2014-03-23 19:22:13 +00:00
if (buf == NULL)
return (ENOMEM);
if (bootcode != NULL) {
Switch to using the portable partition scheme headers.
2016-10-16 02:55:52 +00:00
memcpy(buf, bootcode, BSD_BOOTBLOCK_SIZE);
Be compatible with boot code that starts right after the disk label in the second sector by only clearing the amount of bytes needed for the disklabel in the second sector. Previously we were clearing exactly 1 sector worth of bytes and as such writing over boot code that may have been there. Since we do support more than 8 partitions, make sure to set all fields in d_partitions. For the first 8 partitions this is unneeded, but for partitioons 9 and up this compensates for the fact that we don't clear an entire sector anymore. Obviously, one cannot use more than 8 partitions when using boot code that starts right after the disk label. Relevant GRNs: 107879 - Employ unused bytes after the disklabel in the second sector. 189500 - Revert the part of change 107879 that employs the unused bytes after the disklabel in the 2nd sector for boot code. Obtained from: Juniper Networks, Inc. MFC after: 3 days
2014-09-12 04:15:35 +00:00
memset(buf + secsz, 0, sizeof(struct disklabel));
Implement the BSD scheme. This doesn't quite work as geom_part_bsd finds an invalid label. I'm not going to worry about that right now, because there's more to worry about: the BSD disk label has the 'c' partition for the entire disk and we don't handle this at all. Note also that the BSD disk label wants a geometry, so this will have to be revisited anyway once a good solution is in place.
2014-03-23 19:22:13 +00:00
} else
Switch to using the portable partition scheme headers.
2016-10-16 02:55:52 +00:00
memset(buf, 0, BSD_BOOTBLOCK_SIZE);
Implement the BSD scheme. This doesn't quite work as geom_part_bsd finds an invalid label. I'm not going to worry about that right now, because there's more to worry about: the BSD disk label has the 'c' partition for the entire disk and we don't handle this at all. Note also that the BSD disk label wants a geometry, so this will have to be revisited anyway once a good solution is in place.
2014-03-23 19:22:13 +00:00
Fix checksum calculation: 1. Iterate over all partitions counted in the label, which can be more than the number of partitions given to mkimg(1). 2. Start the checksum from the beginning of the label; not the beginning of the bootarea. Tested with bsdlabel(8). MFC after: 3 days
2014-09-12 03:54:16 +00:00
bsdparts = nparts + 1; /* Account for c partition */
Switch to using the portable partition scheme headers.
2016-10-16 02:55:52 +00:00
if (bsdparts < BSD_NPARTS_MIN)
bsdparts = BSD_NPARTS_MIN;
Properly fill in d_nsectors, d_ntracks, d_ncylinders & d_secpercyl. Round the image size to a multiple of the cyclinder size.
2014-03-27 23:16:18 +00:00
Build this on sparc64, where we don't have LABELSECTOR nor LABELOFFSET defined. Improve portability by eliminating their use.
2014-03-29 04:05:57 +00:00
d = (void *)(buf + secsz);
Switch to using the portable partition scheme headers.
2016-10-16 02:55:52 +00:00
le32enc(&d->d_magic, BSD_MAGIC);
Implement the BSD scheme. This doesn't quite work as geom_part_bsd finds an invalid label. I'm not going to worry about that right now, because there's more to worry about: the BSD disk label has the 'c' partition for the entire disk and we don't handle this at all. Note also that the BSD disk label wants a geometry, so this will have to be revisited anyway once a good solution is in place.
2014-03-23 19:22:13 +00:00
le32enc(&d->d_secsize, secsz);
Properly fill in d_nsectors, d_ntracks, d_ncylinders & d_secpercyl. Round the image size to a multiple of the cyclinder size.
2014-03-27 23:16:18 +00:00
le32enc(&d->d_nsectors, nsecs);
le32enc(&d->d_ntracks, nheads);
le32enc(&d->d_ncylinders, ncyls);
le32enc(&d->d_secpercyl, nsecs * nheads);
Implement the BSD scheme. This doesn't quite work as geom_part_bsd finds an invalid label. I'm not going to worry about that right now, because there's more to worry about: the BSD disk label has the 'c' partition for the entire disk and we don't handle this at all. Note also that the BSD disk label wants a geometry, so this will have to be revisited anyway once a good solution is in place.
2014-03-23 19:22:13 +00:00
le32enc(&d->d_secperunit, imgsz);
le16enc(&d->d_rpm, 3600);
Switch to using the portable partition scheme headers.
2016-10-16 02:55:52 +00:00
le32enc(&d->d_magic2, BSD_MAGIC);
Fix checksum calculation: 1. Iterate over all partitions counted in the label, which can be more than the number of partitions given to mkimg(1). 2. Start the checksum from the beginning of the label; not the beginning of the bootarea. Tested with bsdlabel(8). MFC after: 3 days
2014-09-12 03:54:16 +00:00
le16enc(&d->d_npartitions, bsdparts);
Switch to using the portable partition scheme headers.
2016-10-16 02:55:52 +00:00
le32enc(&d->d_bbsize, BSD_BOOTBLOCK_SIZE);
Implement the BSD scheme. This doesn't quite work as geom_part_bsd finds an invalid label. I'm not going to worry about that right now, because there's more to worry about: the BSD disk label has the 'c' partition for the entire disk and we don't handle this at all. Note also that the BSD disk label wants a geometry, so this will have to be revisited anyway once a good solution is in place.
2014-03-23 19:22:13 +00:00
Switch to using the portable partition scheme headers.
2016-10-16 02:55:52 +00:00
dp = &d->d_partitions[BSD_PART_RAW];
Handle the raw partition of the BSD and VTOC schemes.
2014-03-29 03:14:00 +00:00
le32enc(&dp->p_size, imgsz);
Replace STAILQ with TAILQ. TAILQs are portable enough that they can be used on both macOS and Linux. STAILQs are not. In particular, STAILQ_LAST does not next on Linux. Since neither STAILQ_FOREACH_SAFE nor TAILQ_FOREACH_SAFE exist on Linux, replace its use with a regular TAILQ_FOREACH. The _SAFE variant was only used for having the next pointer in a local variable.
2016-10-03 01:46:47 +00:00
TAILQ_FOREACH(part, &partlist, link) {
Switch to using the portable partition scheme headers.
2016-10-16 02:55:52 +00:00
n = part->index + ((part->index >= BSD_PART_RAW) ? 1 : 0);
Handle the raw partition of the BSD and VTOC schemes.
2014-03-29 03:14:00 +00:00
dp = &d->d_partitions[n];
Implement the BSD scheme. This doesn't quite work as geom_part_bsd finds an invalid label. I'm not going to worry about that right now, because there's more to worry about: the BSD disk label has the 'c' partition for the entire disk and we don't handle this at all. Note also that the BSD disk label wants a geometry, so this will have to be revisited anyway once a good solution is in place.
2014-03-23 19:22:13 +00:00
le32enc(&dp->p_size, part->size);
le32enc(&dp->p_offset, part->block);
Be compatible with boot code that starts right after the disk label in the second sector by only clearing the amount of bytes needed for the disklabel in the second sector. Previously we were clearing exactly 1 sector worth of bytes and as such writing over boot code that may have been there. Since we do support more than 8 partitions, make sure to set all fields in d_partitions. For the first 8 partitions this is unneeded, but for partitioons 9 and up this compensates for the fact that we don't clear an entire sector anymore. Obviously, one cannot use more than 8 partitions when using boot code that starts right after the disk label. Relevant GRNs: 107879 - Employ unused bytes after the disklabel in the second sector. 189500 - Revert the part of change 107879 that employs the unused bytes after the disklabel in the 2nd sector for boot code. Obtained from: Juniper Networks, Inc. MFC after: 3 days
2014-09-12 04:15:35 +00:00
le32enc(&dp->p_fsize, 0);
Implement the BSD scheme. This doesn't quite work as geom_part_bsd finds an invalid label. I'm not going to worry about that right now, because there's more to worry about: the BSD disk label has the 'c' partition for the entire disk and we don't handle this at all. Note also that the BSD disk label wants a geometry, so this will have to be revisited anyway once a good solution is in place.
2014-03-23 19:22:13 +00:00
dp->p_fstype = ALIAS_TYPE2INT(part->type);
Be compatible with boot code that starts right after the disk label in the second sector by only clearing the amount of bytes needed for the disklabel in the second sector. Previously we were clearing exactly 1 sector worth of bytes and as such writing over boot code that may have been there. Since we do support more than 8 partitions, make sure to set all fields in d_partitions. For the first 8 partitions this is unneeded, but for partitioons 9 and up this compensates for the fact that we don't clear an entire sector anymore. Obviously, one cannot use more than 8 partitions when using boot code that starts right after the disk label. Relevant GRNs: 107879 - Employ unused bytes after the disklabel in the second sector. 189500 - Revert the part of change 107879 that employs the unused bytes after the disklabel in the 2nd sector for boot code. Obtained from: Juniper Networks, Inc. MFC after: 3 days
2014-09-12 04:15:35 +00:00
dp->p_frag = 0;
le16enc(&dp->p_cpg, 0);
Implement the BSD scheme. This doesn't quite work as geom_part_bsd finds an invalid label. I'm not going to worry about that right now, because there's more to worry about: the BSD disk label has the 'c' partition for the entire disk and we don't handle this at all. Note also that the BSD disk label wants a geometry, so this will have to be revisited anyway once a good solution is in place.
2014-03-23 19:22:13 +00:00
}
Fix checksum calculation: 1. Iterate over all partitions counted in the label, which can be more than the number of partitions given to mkimg(1). 2. Start the checksum from the beginning of the label; not the beginning of the bootarea. Tested with bsdlabel(8). MFC after: 3 days
2014-09-12 03:54:16 +00:00
dp = &d->d_partitions[bsdparts];
Implement the BSD scheme. This doesn't quite work as geom_part_bsd finds an invalid label. I'm not going to worry about that right now, because there's more to worry about: the BSD disk label has the 'c' partition for the entire disk and we don't handle this at all. Note also that the BSD disk label wants a geometry, so this will have to be revisited anyway once a good solution is in place.
2014-03-23 19:22:13 +00:00
checksum = 0;
Fix checksum calculation: 1. Iterate over all partitions counted in the label, which can be more than the number of partitions given to mkimg(1). 2. Start the checksum from the beginning of the label; not the beginning of the bootarea. Tested with bsdlabel(8). MFC after: 3 days
2014-09-12 03:54:16 +00:00
for (p = (void *)d; p < (u_char *)dp; p += 2)
Implement the BSD scheme. This doesn't quite work as geom_part_bsd finds an invalid label. I'm not going to worry about that right now, because there's more to worry about: the BSD disk label has the 'c' partition for the entire disk and we don't handle this at all. Note also that the BSD disk label wants a geometry, so this will have to be revisited anyway once a good solution is in place.
2014-03-23 19:22:13 +00:00
checksum ^= le16dec(p);
le16enc(&d->d_checksum, checksum);
Switch to using the portable partition scheme headers.
2016-10-16 02:55:52 +00:00
error = image_write(0, buf, BSD_BOOTBLOCK_SIZE / secsz);
Implement the BSD scheme. This doesn't quite work as geom_part_bsd finds an invalid label. I'm not going to worry about that right now, because there's more to worry about: the BSD disk label has the 'c' partition for the entire disk and we don't handle this at all. Note also that the BSD disk label wants a geometry, so this will have to be revisited anyway once a good solution is in place.
2014-03-23 19:22:13 +00:00
free(buf);
return (error);
Add a scheme-specific write callback to write the metadata. While here: 1. Move FreeBSD-specific headers to a more centralized place, so that it's easier to port mkimg. 2. Remove inclusion of <uuid.h> where we don't need it (copy-pasted). 3. Check the partition data given on the command line before we do any I/O. 4. Add scheme_round() for rounding the partition size. 5. Have scheme_write call the scheme-specific write callback and have it propagate errors back to the caller.
2014-03-20 20:14:26 +00:00
}
Use linker sets to provide build-time selection of the schemes that need to be supported. Each scheme provides data and callbacks for handling the scheme-specifics. To this end, put each scheme in its own source file.
2014-03-20 00:38:17 +00:00
static struct mkimg_scheme bsd_scheme = {
.name = "bsd",
Replace *_get_leader() and *_get_trailer() with a single *_metadata(). This single function takes a where argument to indicate the kind of metadata to "size". This way we can also get rid of the "padding" field in the scheme structure. This should make it a little more understandable what's going on.
2014-03-20 19:37:30 +00:00
.description = "BSD disk label",
Use linker sets to provide build-time selection of the schemes that need to be supported. Each scheme provides data and callbacks for handling the scheme-specifics. To this end, put each scheme in its own source file.
2014-03-20 00:38:17 +00:00
.aliases = bsd_aliases,
Replace *_get_leader() and *_get_trailer() with a single *_metadata(). This single function takes a where argument to indicate the kind of metadata to "size". This way we can also get rid of the "padding" field in the scheme structure. This should make it a little more understandable what's going on.
2014-03-20 19:37:30 +00:00
.metadata = bsd_metadata,
Add a scheme-specific write callback to write the metadata. While here: 1. Move FreeBSD-specific headers to a more centralized place, so that it's easier to port mkimg. 2. Remove inclusion of <uuid.h> where we don't need it (copy-pasted). 3. Check the partition data given on the command line before we do any I/O. 4. Add scheme_round() for rounding the partition size. 5. Have scheme_write call the scheme-specific write callback and have it propagate errors back to the caller.
2014-03-20 20:14:26 +00:00
.write = bsd_write,
Switch to using the portable partition scheme headers.
2016-10-16 02:55:52 +00:00
.nparts = BSD_NPARTS_MAX - 1,
.bootcode = BSD_BOOTBLOCK_SIZE,
Allow schemes to specify a maximum sector size. The minimum is fixed at 512. This allows checking of the sector size up-front when given on the command line.
2014-03-25 02:32:04 +00:00
.maxsecsz = 512
Use linker sets to provide build-time selection of the schemes that need to be supported. Each scheme provides data and callbacks for handling the scheme-specifics. To this end, put each scheme in its own source file.
2014-03-20 00:38:17 +00:00
};
SCHEME_DEFINE(bsd_scheme);
Reference in New Issue Copy Permalink