aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonstantin Belousov <kib@FreeBSD.org>2017-11-05 22:00:54 +0000
committerKonstantin Belousov <kib@FreeBSD.org>2017-11-05 22:00:54 +0000
commit93b09f581a60c198819b854e767524e30deeed53 (patch)
treebc6708de6a5cc5861b080c370d6655ebfab9bae9
parentba324b594655a4ad8bb11566d7de91cd6e89b9cc (diff)
downloadsrc-93b09f581a60c198819b854e767524e30deeed53.tar.gz
src-93b09f581a60c198819b854e767524e30deeed53.zip
Remove badsect(8).
Failure modes of the modern (that is, produced in the last 25 years) hard drives and SSDs made the utility outdated. Since the kernel interface to support it was removed in r324853, cut the userspace remnants as well. Discussed with: bde (who does not like the removal) Sponsored by: The FreeBSD Foundation MFC after: 2 weeks
Notes
Notes: svn path=/head/; revision=325452
-rw-r--r--ObsoleteFiles.inc4
-rw-r--r--rescue/rescue/Makefile2
-rw-r--r--sbin/Makefile1
-rw-r--r--sbin/badsect/Makefile9
-rw-r--r--sbin/badsect/Makefile.depend18
-rw-r--r--sbin/badsect/badsect.8133
-rw-r--r--sbin/badsect/badsect.c182
-rw-r--r--sys/mips/rmi/rootfs_list.txt1
-rw-r--r--usr.sbin/crunch/examples/fixit.conf3
-rw-r--r--usr.sbin/crunch/examples/really-big.conf2
10 files changed, 8 insertions, 347 deletions
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 93bf476cea2a..9377f936873d 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -38,6 +38,10 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20171108: badsect(8) removal
+OLD_FILES+=sbin/badsect
+OLD_FILES+=rescue/badsect
+OLD_FILES+=usr/share/man/man8/badsect.8.gz
# 20171105: fixing lib/libclang_rt CRTARCH for arm:armv[67].
.if ${MACHINE} == "arm"
.if ${MACHINE_ARCH:Marmv[67]*} != "" && ${CPUTYPE:M*soft*} == ""
diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile
index b0e03640e2da..06b5f3ff65fd 100644
--- a/rescue/rescue/Makefile
+++ b/rescue/rescue/Makefile
@@ -85,7 +85,7 @@ CRUNCH_SUPPRESS_LINK_-tcsh= 1
# headers in addition to the standard 'paths.h' header.
#
CRUNCH_SRCDIRS+= sbin
-CRUNCH_PROGS_sbin= badsect \
+CRUNCH_PROGS_sbin= \
camcontrol clri devfs dmesg dump \
dumpfs dumpon fsck fsck_ffs fsck_msdosfs fsdb \
fsirand gbde geom ifconfig init \
diff --git a/sbin/Makefile b/sbin/Makefile
index 43f3cec7e03c..ca9f42ec0d6b 100644
--- a/sbin/Makefile
+++ b/sbin/Makefile
@@ -6,7 +6,6 @@
# XXX MISSING: icheck ncheck
SUBDIR=adjkerntz \
- badsect \
camcontrol \
clri \
comcontrol \
diff --git a/sbin/badsect/Makefile b/sbin/badsect/Makefile
deleted file mode 100644
index c344e6c63552..000000000000
--- a/sbin/badsect/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# @(#)Makefile 8.1 (Berkeley) 6/5/93
-# $FreeBSD$
-
-PACKAGE=runtime
-PROG= badsect
-LIBADD= ufs
-MAN= badsect.8
-
-.include <bsd.prog.mk>
diff --git a/sbin/badsect/Makefile.depend b/sbin/badsect/Makefile.depend
deleted file mode 100644
index 735bf03b75b6..000000000000
--- a/sbin/badsect/Makefile.depend
+++ /dev/null
@@ -1,18 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
- gnu/lib/csu \
- include \
- include/xlocale \
- lib/${CSU_DIR} \
- lib/libc \
- lib/libcompiler_rt \
- lib/libufs \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/sbin/badsect/badsect.8 b/sbin/badsect/badsect.8
deleted file mode 100644
index 498febab1d96..000000000000
--- a/sbin/badsect/badsect.8
+++ /dev/null
@@ -1,133 +0,0 @@
-.\" Copyright (c) 1985, 1991, 1993
-.\" The Regents of the University of California. All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in the
-.\" documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the University nor the names of its contributors
-.\" may be used to endorse or promote products derived from this software
-.\" without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" @(#)badsect.8 8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
-.\"
-.Dd June 5, 1993
-.Dt BADSECT 8
-.Os
-.Sh NAME
-.Nm badsect
-.Nd create files to contain bad sectors
-.Sh SYNOPSIS
-.Nm
-.Ar bbdir sector ...
-.Sh DESCRIPTION
-The
-.Nm
-utility makes a file to contain a bad sector.
-Normally, bad sectors
-are made inaccessible by the standard formatter, which provides
-a forwarding table for bad sectors to the driver.
-If a driver supports the bad blocking standard it is much preferable to
-use that method to isolate bad blocks, since the bad block forwarding
-makes the pack appear perfect, and such packs can then be copied with
-.Xr dd 1 .
-The technique used by this program is also less general than
-bad block forwarding, as
-.Nm
-cannot make amends for
-bad blocks in the i-list of file systems or in swap areas.
-.Pp
-On some disks,
-adding a sector which is suddenly bad to the bad sector table
-currently requires the running of the standard
-.Tn DEC
-formatter.
-Thus to deal with a newly bad block
-or on disks where the drivers
-do not support the bad-blocking standard
-.Nm
-may be used to good effect.
-.Pp
-The
-.Nm
-utility is used on a quiet file system in the following way:
-First mount the file system, and change to its root directory.
-Make a directory
-.Li BAD
-there.
-Run
-.Nm
-giving as argument the
-.Ar BAD
-directory followed by
-all the bad sectors you wish to add.
-(The sector numbers must be relative to the beginning of
-the file system, but this is not hard as the system reports
-relative sector numbers in its console error messages.)
-Then change back to the root directory, unmount the file system
-and run
-.Xr fsck 8
-on the file system.
-The bad sectors should show up in two files
-or in the bad sector files and the free list.
-Have
-.Xr fsck 8
-remove files containing the offending bad sectors, but
-.Em do not
-have it remove the
-.Pa BAD/ Ns Em nnnnn
-files.
-This will leave the bad sectors in only the
-.Li BAD
-files.
-.Pp
-The
-.Nm
-utility works by giving the specified sector numbers in a
-.Xr mknod 2
-system call,
-creating an illegal file whose first block address is the block containing
-bad sector and whose name is the bad sector number.
-When it is discovered by
-.Xr fsck 8
-it will ask
-.Dq Li "HOLD BAD BLOCK \&?" .
-A positive response will cause
-.Xr fsck 8
-to convert the inode to a regular file containing the bad block.
-.Sh DIAGNOSTICS
-The
-.Nm
-utility refuses to attach a block that
-resides in a critical area or is out of range of the file system.
-A warning is issued if the block is already in use.
-.Sh SEE ALSO
-.Xr fsck 8
-.Sh HISTORY
-The
-.Nm
-utility appeared in
-.Bx 4.1 .
-.Sh BUGS
-If more than one sector which comprise a file system fragment are bad,
-you should specify only one of them to
-.Nm ,
-as the blocks in the bad sector files actually cover all the sectors in a
-file system fragment.
diff --git a/sbin/badsect/badsect.c b/sbin/badsect/badsect.c
deleted file mode 100644
index 097e3b112f67..000000000000
--- a/sbin/badsect/badsect.c
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * Copyright (c) 1981, 1983, 1993
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if 0
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1981, 1983, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-static const char sccsid[] = "@(#)badsect.c 8.1 (Berkeley) 6/5/93";
-#endif
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-/*
- * badsect
- *
- * Badsect takes a list of file-system relative sector numbers
- * and makes files containing the blocks of which these sectors are a part.
- * It can be used to contain sectors which have problems if these sectors
- * are not part of the bad file for the pack (see bad144). For instance,
- * this program can be used if the driver for the file system in question
- * does not support bad block forwarding.
- */
-#include <sys/param.h>
-#include <sys/stat.h>
-#include <sys/disklabel.h>
-
-#include <ufs/ufs/dinode.h>
-#include <ufs/ffs/fs.h>
-
-#include <err.h>
-#include <errno.h>
-#include <dirent.h>
-#include <fcntl.h>
-#include <libufs.h>
-#include <paths.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#define sblock disk.d_fs
-#define acg disk.d_cg
-static struct uufsd disk;
-static struct fs *fs = &sblock;
-static int errs;
-
-int chkuse(daddr_t, int);
-
-static void
-usage(void)
-{
- fprintf(stderr, "usage: badsect bbdir blkno ...\n");
- exit(1);
-}
-
-int
-main(int argc, char *argv[])
-{
- daddr_t diskbn;
- daddr_t number;
- struct stat stbuf, devstat;
- struct dirent *dp;
- DIR *dirp;
- char name[2 * MAXPATHLEN];
- char *name_dir_end;
-
- if (argc < 3)
- usage();
- if (chdir(argv[1]) < 0 || stat(".", &stbuf) < 0)
- err(2, "%s", argv[1]);
- strcpy(name, _PATH_DEV);
- if ((dirp = opendir(name)) == NULL)
- err(3, "%s", name);
- name_dir_end = name + strlen(name);
- while ((dp = readdir(dirp)) != NULL) {
- strcpy(name_dir_end, dp->d_name);
- if (lstat(name, &devstat) < 0)
- err(4, "%s", name);
- if (stbuf.st_dev == devstat.st_rdev &&
- (devstat.st_mode & IFMT) == IFCHR)
- break;
- }
- closedir(dirp);
- if (dp == NULL) {
- printf("Cannot find dev 0%lo corresponding to %s\n",
- (u_long)stbuf.st_rdev, argv[1]);
- exit(5);
- }
- if (ufs_disk_fillout(&disk, name) == -1) {
- if (disk.d_error != NULL)
- errx(6, "%s: %s", name, disk.d_error);
- else
- err(7, "%s", name);
- }
- for (argc -= 2, argv += 2; argc > 0; argc--, argv++) {
- number = strtol(*argv, NULL, 0);
- if (errno == EINVAL || errno == ERANGE)
- err(8, "%s", *argv);
- if (chkuse(number, 1))
- continue;
- diskbn = dbtofsb(fs, number);
- if (mknod(*argv, IFMT|0600, (dev_t)diskbn) < 0) {
- warn("%s", *argv);
- errs++;
- }
- }
- ufs_disk_close(&disk);
- printf("Don't forget to run ``fsck %s''\n", name);
- exit(errs);
-}
-
-int
-chkuse(daddr_t blkno, int cnt)
-{
- int cg;
- daddr_t fsbn, bn;
-
- fsbn = dbtofsb(fs, blkno);
- if ((unsigned)(fsbn+cnt) > fs->fs_size) {
- printf("block %ld out of range of file system\n", (long)blkno);
- return (1);
- }
- cg = dtog(fs, fsbn);
- if (fsbn < cgdmin(fs, cg)) {
- if (cg == 0 || (fsbn+cnt) > cgsblock(fs, cg)) {
- printf("block %ld in non-data area: cannot attach\n",
- (long)blkno);
- return (1);
- }
- } else {
- if ((fsbn+cnt) > cgbase(fs, cg+1)) {
- printf("block %ld in non-data area: cannot attach\n",
- (long)blkno);
- return (1);
- }
- }
- if (cgread1(&disk, cg) != 1) {
- fprintf(stderr, "cg %d: could not be read\n", cg);
- errs++;
- return (1);
- }
- if (!cg_chkmagic(&acg)) {
- fprintf(stderr, "cg %d: bad magic number\n", cg);
- errs++;
- return (1);
- }
- bn = dtogd(fs, fsbn);
- if (isclr(cg_blksfree(&acg), bn))
- printf("Warning: sector %ld is in use\n", (long)blkno);
- return (0);
-}
diff --git a/sys/mips/rmi/rootfs_list.txt b/sys/mips/rmi/rootfs_list.txt
index e68b2d865d75..abf81a7a60de 100644
--- a/sys/mips/rmi/rootfs_list.txt
+++ b/sys/mips/rmi/rootfs_list.txt
@@ -448,7 +448,6 @@
./sbin
./sbin/adjkerntz
./sbin/atacontrol
-./sbin/badsect
./sbin/bsdlabel
./sbin/camcontrol
./sbin/ccdconfig
diff --git a/usr.sbin/crunch/examples/fixit.conf b/usr.sbin/crunch/examples/fixit.conf
index 80a2346e34f2..4a373241d46f 100644
--- a/usr.sbin/crunch/examples/fixit.conf
+++ b/usr.sbin/crunch/examples/fixit.conf
@@ -1,4 +1,5 @@
# fixit.conf - put in anything we think we might want on a fixit floppy
+# $FreeBSD$
# first, we list the source dirs that our programs reside in. These are
# searched in order listed to find the dir containing each program.
@@ -21,7 +22,7 @@ ln sh -sh # init invokes the shell this way
# /sbin stuff
-progs badsect chown clri disklabel dump dmesg fdisk fsck ifconfig init
+progs chown clri disklabel dump dmesg fdisk fsck ifconfig init
progs mknod mount newfs ping reboot restore swapon umount
ln dump rdump
ln restore rrestore
diff --git a/usr.sbin/crunch/examples/really-big.conf b/usr.sbin/crunch/examples/really-big.conf
index cf95ee04c8b8..696fc7b811a1 100644
--- a/usr.sbin/crunch/examples/really-big.conf
+++ b/usr.sbin/crunch/examples/really-big.conf
@@ -23,7 +23,7 @@ ln sh -sh
srcdirs /usr/src/sbin
-progs badsect bim clri disklabel dmesg dump dumpfs fdisk fsck halt
+progs bim clri disklabel dmesg dump dumpfs fdisk fsck halt
progs ifconfig init mknod modload modunload mount mount_isofs
progs mount_lofs mount_msdosfs mountd
progs newfs nfsd nfsiod ping quotacheck reboot restore route routed savecore