Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Try to warn possibly unbootable conditions: 

- no disklabel
 - no partition "a"
 - partition "a" exceeds 2GB boundary
This commit is contained in:
itohy 2008-02-02 16:46:15 +00:00
parent b1c9a380e4
commit 9ef5327a26
1 changed files with 41 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
usr.sbin/installboot/arch/hp700.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: hp700.c,v 1.2 2006/02/18 10:08:07 dsl Exp $ */
/* $NetBSD: hp700.c,v 1.3 2008/02/02 16:46:15 itohy Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@ -42,9 +42,16 @@
#include <sys/cdefs.h>
#if !defined(__lint)
__RCSID("$NetBSD: hp700.c,v 1.2 2006/02/18 10:08:07 dsl Exp $");
__RCSID("$NetBSD: hp700.c,v 1.3 2008/02/02 16:46:15 itohy Exp $");
#endif /* !__lint */
/* We need the target disklabel.h, not the hosts one..... */
#ifdef HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#include <nbinclude/sys/disklabel.h>
#else
#include <sys/disklabel.h>
#endif
#include <sys/param.h>
#include <sys/stat.h>
@ -124,7 +131,13 @@ hp700_setboot(ib_params *params)
{
struct stat bootstrapsb;
char bb[HP700_BOOT_BLOCK_SIZE];
char label[HP700_BOOT_BLOCK_SIZE];
struct {
char l_off[HP700_LABELOFFSET];
struct disklabel l;
char l_pad[HP700_BOOT_BLOCK_SIZE
- HP700_LABELOFFSET - sizeof(struct disklabel)];
} label;
unsigned int secsize, npart;
int retval;
ssize_t rv;
@ -137,11 +150,11 @@ hp700_setboot(ib_params *params)
retval = 0;
/* read disklabel on the target disk */
rv = pread(params->fsfd, label, sizeof label, 0);
rv = pread(params->fsfd, &label, HP700_BOOT_BLOCK_SIZE, 0);
if (rv == -1) {
warn("Reading `%s'", params->filesystem);
goto done;
} else if (rv != sizeof label) {
} else if (rv != HP700_BOOT_BLOCK_SIZE) {
warnx("Reading `%s': short read", params->filesystem);
goto done;
}
@ -155,6 +168,28 @@ hp700_setboot(ib_params *params)
goto done;
}
/* check if valid disklabel exists */
secsize = be32toh(label.l.d_secsize);
npart = be16toh(label.l.d_npartitions);
if (label.l.d_magic != htobe32(DISKMAGIC) ||
label.l.d_magic2 != htobe32(DISKMAGIC) ||
secsize == 0 || secsize & (secsize - 1) ||
npart > MAXMAXPARTITIONS) {
warnx("No disklabel in `%s'", params->filesystem);
/* then check if boot partition exists */
} else if (npart < 1 || label.l.d_partitions[0].p_size == 0) {
warnx("Partition `a' doesn't exist in %s", params->filesystem);
/* check if the boot partition is below 2GB */
} else if (be32toh(label.l.d_partitions[0].p_offset) +
be32toh(label.l.d_partitions[0].p_size) >
((unsigned)2*1024*1024*1024) / secsize) {
warnx("WARNING: Partition `a' of `%s' exceeds 2GB boundary.",
params->filesystem);
warnx("WARNING: It won't boot since hp700 PDC can handle only 2GB.");
}
/* read boot loader */
memset(&bb, 0, sizeof bb);
rv = read(params->s1fd, &bb, sizeof bb);
@ -163,8 +198,7 @@ hp700_setboot(ib_params *params)
goto done;
}
/* then, overwrite disklabel */
memcpy(&bb[HP700_LABELOFFSET], &label[HP700_LABELOFFSET],
HP700_LABELSIZE);
memcpy(&bb[HP700_LABELOFFSET], &label.l, HP700_LABELSIZE);
if (params->flags & IB_VERBOSE) {
printf("Bootstrap start sector: %#x\n", 0);