summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Baldwin <jhb@FreeBSD.org>2002-11-03 21:18:17 +0000
committerJohn Baldwin <jhb@FreeBSD.org>2002-11-03 21:18:17 +0000
commitda58ad34ef33f1cf6f204ab8bbaf5a04bfc6f216 (patch)
treea1a2f595641cd17b09e331b739f33e717dd3d5b7
parent727f6793ddf14c12c8c5bf2681a18a1bfd2b68bc (diff)
Notes
-rw-r--r--lib/libdisk/write_alpha_disk.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/lib/libdisk/write_alpha_disk.c b/lib/libdisk/write_alpha_disk.c
index 5c22f87b46153..5cbdecf491f75 100644
--- a/lib/libdisk/write_alpha_disk.c
+++ b/lib/libdisk/write_alpha_disk.c
@@ -20,7 +20,6 @@ __FBSDID("$FreeBSD$");
#include <sys/ioctl.h>
#include <sys/disklabel.h>
#include <sys/diskslice.h>
-#include <sys/diskmbr.h>
#include <paths.h>
#include "libdisk.h"
@@ -74,13 +73,10 @@ int
Write_Disk(const struct disk *d1)
{
int fd;
- struct disk *old = 0;
+ struct disk *old = NULL;
struct chunk *c1;
int ret = 0;
char device[64];
- u_char *mbr;
- struct dos_partition *dp,work[NDOSPART];
- int s[4];
strcpy(device,_PATH_DEV);
strcat(device,d1->name);
@@ -90,12 +86,6 @@ Write_Disk(const struct disk *d1)
if (fd < 0)
return 1;
- memset(s,0,sizeof s);
- mbr = read_block(fd, 0, d1->sector_size);
- dp = (struct dos_partition*)(mbr + DOSPARTOFF);
- memcpy(work, dp, sizeof work);
- dp = work;
- free(mbr);
for (c1 = d1->chunks->part->part; c1; c1 = c1->next) {
if (c1->type == unused) continue;
if (!strcmp(c1->name, "X")) continue;