From 21243bc5b91faf3ed5fa2e3994bb5b60ec41bfcf Mon Sep 17 00:00:00 2001 From: phk Date: Sat, 27 Nov 1999 14:33:07 +0000 Subject: Remove BAD144 support. --- usr.sbin/sysinstall/disks.c | 34 +--------------------------------- usr.sbin/sysinstall/misc.c | 1 - 2 files changed, 1 insertion(+), 34 deletions(-) (limited to 'usr.sbin/sysinstall') diff --git a/usr.sbin/sysinstall/disks.c b/usr.sbin/sysinstall/disks.c index fe4ee82..182bfac 100644 --- a/usr.sbin/sysinstall/disks.c +++ b/usr.sbin/sysinstall/disks.c @@ -125,7 +125,7 @@ static void print_command_summary() { mvprintw(14, 0, "The following commands are supported (in upper or lower case):"); - mvprintw(16, 0, "A = Use Entire Disk B = Bad Block Scan C = Create Slice"); + mvprintw(16, 0, "A = Use Entire Disk C = Create Slice"); mvprintw(17, 0, "D = Delete Slice G = Set Drive Geometry S = Set Bootable"); mvprintw(18, 0, "T = Change Type U = Undo All Changes Q = Finish"); if (!RunningAsInit) @@ -295,21 +295,6 @@ diskPartition(Device *dev) clear(); break; - case 'B': - if (chunk_info[current_chunk]->type != freebsd) - msg = "Can only scan for bad blocks in FreeBSD slice."; - else if (strncmp(d->name, "sd", 2) || - strncmp(d->name, "da", 2) || - !msgYesNo("This typically makes sense only for ESDI, IDE or MFM drives.\n" - "Are you sure you want to do this on a SCSI disk?")) { - if (chunk_info[current_chunk]->flags & CHUNK_BAD144) - chunk_info[current_chunk]->flags &= ~CHUNK_BAD144; - else - chunk_info[current_chunk]->flags |= CHUNK_BAD144; - } - clear(); - break; - case 'C': if (chunk_info[current_chunk]->type != unused) msg = "Slice in use, delete it first or move to an unused one."; @@ -694,23 +679,6 @@ diskPartitionWrite(dialogMenuItem *self) /* If we've been through here before, we don't need to do the rest */ if (cp && !strcmp(cp, "written")) return DITEM_SUCCESS; - - /* Now scan for bad blocks, if necessary */ - for (c1 = d->chunks->part; c1; c1 = c1->next) { - if (c1->flags & CHUNK_BAD144) { - int ret; - - msgNotify("Running bad block scan on slice %s", c1->name); - if (!Fake) { - ret = vsystem("bad144 -v /dev/r%s 1234", c1->name); - if (ret) - msgConfirm("Bad144 init on %s returned status of %d!", c1->name, ret); - ret = vsystem("bad144 -v -s /dev/r%s", c1->name); - if (ret) - msgConfirm("Bad144 scan on %s returned status of %d!", c1->name, ret); - } - } - } } /* Now it's not "yes", but "written" */ variable_set2(DISK_PARTITIONED, "written", 0); diff --git a/usr.sbin/sysinstall/misc.c b/usr.sbin/sysinstall/misc.c index d32af17..4bba7e5 100644 --- a/usr.sbin/sysinstall/misc.c +++ b/usr.sbin/sysinstall/misc.c @@ -44,7 +44,6 @@ #include #include #include -#include #include /* Quick check to see if a file is readable */ -- cgit v1.1