summaryrefslogtreecommitdiffstats
path: root/sbin/bsdlabel
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>2002-04-03 15:46:56 +0000
committerphk <phk@FreeBSD.org>2002-04-03 15:46:56 +0000
commitd25c54bf89ced582bf319dad639c3600337a5888 (patch)
tree92eef417f8958b0840fe6e621f9cb9937bfa4496 /sbin/bsdlabel
parent8b6606cbb7eaba40a6c0bedbc99bedf434f456d6 (diff)
downloadFreeBSD-src-d25c54bf89ced582bf319dad639c3600337a5888.zip
FreeBSD-src-d25c54bf89ced582bf319dad639c3600337a5888.tar.gz
Kill only usage of the undocumnted and unuse d_boot[01] fields of
struct disklabel. Sponsored by: DARPA & NAI Labs.
Diffstat (limited to 'sbin/bsdlabel')
-rw-r--r--sbin/bsdlabel/bsdlabel.c28
1 files changed, 0 insertions, 28 deletions
diff --git a/sbin/bsdlabel/bsdlabel.c b/sbin/bsdlabel/bsdlabel.c
index d5db978..c007a9a 100644
--- a/sbin/bsdlabel/bsdlabel.c
+++ b/sbin/bsdlabel/bsdlabel.c
@@ -373,34 +373,6 @@ makelabel(const char *type, const char *name, struct disklabel *lp)
if (dp == NULL)
errx(1, "%s: unknown disk type", type);
*lp = *dp;
-#if NUMBOOT > 0
- /*
- * Set bootstrap name(s).
- * 1. If set from command line, use those,
- * 2. otherwise, check if disktab specifies them (b0 or b1),
- * 3. otherwise, makebootarea() will choose ones based on the name
- * of the disk special file. E.g. /dev/ra0 -> raboot, bootra
- */
- if (!xxboot && lp->d_boot0) {
- if (*lp->d_boot0 != '/')
- (void)sprintf(boot0, "%s/%s",
- _PATH_BOOTDIR, lp->d_boot0);
- else
- (void)strcpy(boot0, lp->d_boot0);
- xxboot = boot0;
- }
-#if NUMBOOT > 1
- if (!bootxx && lp->d_boot1) {
- if (*lp->d_boot1 != '/')
- (void)sprintf(boot1, "%s/%s",
- _PATH_BOOTDIR, lp->d_boot1);
- else
- (void)strcpy(boot1, lp->d_boot1);
- bootxx = boot1;
- }
-#endif
-#endif
- /* d_packname is union d_boot[01], so zero */
bzero(lp->d_packname, sizeof(lp->d_packname));
if (name)
(void)strncpy(lp->d_packname, name, sizeof(lp->d_packname));
OpenPOWER on IntegriCloud