diff options
author | phk <phk@FreeBSD.org> | 2003-06-07 09:09:39 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 2003-06-07 09:09:39 +0000 |
commit | 10afeb827154cef535bf9fb2c0fc4a2d5af0849d (patch) | |
tree | 50b7d9b28d01f9f59eea8754205c2dc8e88e263d /sbin/bsdlabel/bsdlabel.c | |
parent | 0ad1aba3fb23644c368423acbc8cb2ee6f0bc807 (diff) | |
download | FreeBSD-src-10afeb827154cef535bf9fb2c0fc4a2d5af0849d.zip FreeBSD-src-10afeb827154cef535bf9fb2c0fc4a2d5af0849d.tar.gz |
Sanitize setting of labeloffset and labelsector.
Diffstat (limited to 'sbin/bsdlabel/bsdlabel.c')
-rw-r--r-- | sbin/bsdlabel/bsdlabel.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/sbin/bsdlabel/bsdlabel.c b/sbin/bsdlabel/bsdlabel.c index 34ccc88..2ac39eb 100644 --- a/sbin/bsdlabel/bsdlabel.c +++ b/sbin/bsdlabel/bsdlabel.c @@ -161,12 +161,10 @@ main(int argc, char *argv[]) xxboot = optarg; break; case 'm': - if (!strcmp(optarg, "i386")) { - labelsoffset = 1; - labeloffset = 0; - bbsize = 8192; - alphacksum = 0; - } else if (!strcmp(optarg, "pc98")) { + if (!strcmp(optarg, "i386") || + !strcmp(optarg, "amd64") || + !strcmp(optarg, "ia64") || + !strcmp(optarg, "pc98")) { labelsoffset = 1; labeloffset = 0; bbsize = 8192; @@ -176,11 +174,6 @@ main(int argc, char *argv[]) labeloffset = 64; bbsize = 8192; alphacksum = 1; - } else if (!strcmp(optarg, "ia64")) { - labelsoffset = 1; - labeloffset = 0; - bbsize = 8192; - alphacksum = 0; } else { errx(1, "Unsupported architecture"); } |