2012/10/10 Philip Guenther <guent...@gmail.com>:
> On Tue, Oct 9, 2012 at 5:01 PM, Theo de Raadt <dera...@cvs.openbsd.org> wrote:
>> Yes, it is a relic. You may take action against it, Ted.
>
> Don't forget to also remove the shutdown(8) bits that use it.
>
> Philip Guenther
>
was bored, does this miss anything?
Index: rc.8
===================================================================
RCS file: /cvs/src/share/man/man8/rc.8,v
retrieving revision 1.38
diff -u -p -r1.38 rc.8
--- rc.8 31 Jul 2011 12:46:17 -0000 1.38
+++ rc.8 10 Oct 2012 01:18:43 -0000
@@ -94,11 +94,6 @@ caused by hardware or software failure.
If this auto-check and repair succeeds, then the second part of
.Nm rc
is run.
-However, if the file
-.Pa /fastboot
-exists,
-fsck will not be invoked.
-The file is then removed so that fsck will be run on subsequent boots.
.Pp
The second part of
.Nm rc
Index: pathnames.h
===================================================================
RCS file: /cvs/src/sbin/shutdown/pathnames.h,v
retrieving revision 1.5
diff -u -p -r1.5 pathnames.h
--- pathnames.h 2 Jun 2003 20:06:17 -0000 1.5
+++ pathnames.h 10 Oct 2012 01:18:24 -0000
@@ -34,7 +34,6 @@
#include <paths.h>
-#define _PATH_FASTBOOT "/fastboot"
#define _PATH_HALT "/sbin/halt"
#define _PATH_REBOOT "/sbin/reboot"
#define _PATH_WALL "/usr/bin/wall"
Index: shutdown.8
===================================================================
RCS file: /cvs/src/sbin/shutdown/shutdown.8,v
retrieving revision 1.39
diff -u -p -r1.39 shutdown.8
--- shutdown.8 19 Nov 2007 08:51:49 -0000 1.39
+++ shutdown.8 10 Oct 2012 01:18:24 -0000
@@ -67,16 +67,6 @@ state of a corrupted or misbehaving syst
See
.Xr savecore 8
for information on how to recover this dump.
-.It Fl f
-Create the file
-.Pa /fastboot
-so that the file systems will
-.Em not
-be checked by
-.Xr fsck 8
-during the next boot.
-(See
-.Xr rc 8 ) .
.It Fl h
The system is halted at the specified
.Ar time
Index: shutdown.c
===================================================================
RCS file: /cvs/src/sbin/shutdown/shutdown.c,v
retrieving revision 1.36
diff -u -p -r1.36 shutdown.c
--- shutdown.c 24 Dec 2009 10:06:35 -0000 1.36
+++ shutdown.c 10 Oct 2012 01:18:24 -0000
@@ -56,8 +56,6 @@
#ifdef DEBUG
#undef _PATH_NOLOGIN
#define _PATH_NOLOGIN "./nologin"
-#undef _PATH_FASTBOOT
-#define _PATH_FASTBOOT "./fastboot"
#endif
#define H *60*60
@@ -85,13 +83,12 @@ struct interval {
#undef S
static time_t offset, shuttime;
-static int dofast, dohalt, doreboot, dopower, dodump, mbuflen, nosync;
+static int dohalt, doreboot, dopower, dodump, mbuflen, nosync;
static sig_atomic_t killflg;
static char *whom, mbuf[BUFSIZ];
void badtime(void);
void __dead die_you_gravy_sucking_pig_dog(void);
-void doitfast(void);
void __dead finish(int);
void getoffset(char *);
void __dead loop(void);
@@ -112,7 +109,7 @@ main(int argc, char *argv[])
if (geteuid())
errx(1, "NOT super-user");
#endif
- while ((ch = getopt(argc, argv, "dfhknpr-")) != -1)
+ while ((ch = getopt(argc, argv, "dhknpr-")) != -1)
switch (ch) {
case '-':
readstdin = 1;
@@ -120,9 +117,6 @@ main(int argc, char *argv[])
case 'd':
dodump = 1;
break;
- case 'f':
- dofast = 1;
- break;
case 'h':
dohalt = 1;
break;
@@ -147,11 +141,6 @@ main(int argc, char *argv[])
if (argc < 1)
usage();
- if (dofast && nosync) {
- (void)fprintf(stderr,
- "shutdown: incompatible switches -f and -n.\n");
- usage();
- }
if (doreboot && dohalt) {
(void)fprintf(stderr,
"shutdown: incompatible switches -h and -r.\n");
@@ -340,8 +329,6 @@ die_you_gravy_sucking_pig_dog(void)
(void)printf("\rbut you'll have to do it yourself\r\n");
finish(0);
}
- if (dofast)
- doitfast();
#ifdef DEBUG
if (doreboot)
(void)printf("reboot");
@@ -349,8 +336,6 @@ die_you_gravy_sucking_pig_dog(void)
(void)printf("halt");
if (nosync)
(void)printf(" no sync");
- if (dofast)
- (void)printf(" no fsck");
if (dodump)
(void)printf(" with dump");
(void)printf("\nkill -HUP 1\n");
@@ -489,19 +474,6 @@ getoffset(char *timearg)
}
}
-#define FSMSG "fastboot file for fsck\n"
-void
-doitfast(void)
-{
- int fastfd;
-
- if ((fastfd = open(_PATH_FASTBOOT, O_WRONLY|O_CREAT|O_TRUNC,
- 0664)) >= 0) {
- (void)write(fastfd, FSMSG, sizeof(FSMSG) - 1);
- (void)close(fastfd);
- }
-}
-
#define NOMSG "\n\nNO LOGINS: System going down at "
void
nolog(void)
@@ -545,6 +517,6 @@ badtime(void)
void
usage(void)
{
- fprintf(stderr, "usage: shutdown [-] [-dfhknpr] time
[warning-message ...]\n");
+ fprintf(stderr, "usage: shutdown [-] [-dhknpr] time [warning-message
...]\n");
exit(1);
}
Index: rc
===================================================================
RCS file: /cvs/src/etc/rc,v
retrieving revision 1.403
diff -u -p -r1.403 rc
--- rc 20 Sep 2012 12:51:43 -0000 1.403
+++ rc 10 Oct 2012 01:19:31 -0000
@@ -266,9 +266,7 @@ fi
swapctl -A -t blk
-if [ -e /fastboot ]; then
- echo "Fast boot: skipping disk checks."
-elif [ X"$1" = X"autoboot" ]; then
+if [ X"$1" = X"autoboot" ]; then
echo "Automatic boot in progress: starting file system checks."
fsck -p
case $? in
@@ -307,7 +305,6 @@ trap "echo 'Boot interrupted.'; exit 1"
umount -a >/dev/null 2>&1
mount -a -t nonfs,vnd
mount -uw / # root on nfs requires this, others aren't hurt
-rm -f /fastboot # XXX (root now writeable)
# set flags on ttys. (do early, in case they use tty for SLIP in netstart)
echo 'setting tty flags'
