ChangeLog, Makefile.in, fsck.c:
Really fix the bug where "fsck -As" will actually allow interactive
fsck's. (For those people who like to do interactive fsck's in the
/etc/rc scripts!?!)
diff --git a/misc/ChangeLog b/misc/ChangeLog
index 2fe5c45..11c22c9 100644
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,3 +1,9 @@
+2000-01-07 Theodore Ts'o <tytso@valinux.com>
+
+ * Really fix the bug where "fsck -As" will actually allow
+ interactive fsck's. (For those people who like to do
+ interactive fsck's in the /etc/rc scripts!?!)
+
1999-11-23 <tytso@valinux.com>
* tune2fs.8.in: Fix man page so that the sparse_super filesystem
diff --git a/misc/Makefile.in b/misc/Makefile.in
index 0460106..7e9e1d5 100644
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -51,7 +51,7 @@
findsuper: findsuper.o
$(CC) $(ALL_LDFLAGS) -o findsuper findsuper.o
-tune2fs: $(TUNE2FS_OBJS) $(DEPLIBS_E2P) $(LIBUUID)
+tune2fs: $(TUNE2FS_OBJS) $(DEPLIBS_E2P) $(DEPLIBUUID)
$(CC) $(ALL_LDFLAGS) -o tune2fs $(TUNE2FS_OBJS) $(LIBS_E2P) $(LIBUUID)
e2label: $(E2LABEL_OBJS)
@@ -60,10 +60,10 @@
mklost+found: $(MKLPF_OBJS)
$(CC) $(ALL_LDFLAGS) -o mklost+found $(MKLPF_OBJS)
-mke2fs: $(MKE2FS_OBJS) $(DEPLIBS) $(LIBE2P) $(LIBUUID)
+mke2fs: $(MKE2FS_OBJS) $(DEPLIBS) $(LIBE2P) $(DEPLIBUUID)
$(CC) $(ALL_LDFLAGS) -o mke2fs $(MKE2FS_OBJS) $(LIBS) $(LIBE2P) $(LIBUUID)
-mke2fs.static: $(MKE2FS_OBJS) $(STATIC_DEPLIBS) $(STATIC_LIBE2P) $(STATIC_LIBUUID)
+mke2fs.static: $(MKE2FS_OBJS) $(STATIC_DEPLIBS) $(STATIC_LIBE2P) $(DEPSTATIC_LIBUUID)
$(CC) $(ALL_LDFLAGS) -static -o mke2fs.static $(MKE2FS_OBJS) \
$(STATIC_LIBS) $(STATIC_LIBE2P) $(STATIC_LIBUUID)
@@ -76,7 +76,7 @@
lsattr: $(LSATTR_OBJS) $(DEPLIBS_E2P)
$(CC) $(ALL_LDFLAGS) -o lsattr $(LSATTR_OBJS) $(LIBS_E2P)
-uuidgen: $(UUIDGEN_OBJS) $(LIBUUID)
+uuidgen: $(UUIDGEN_OBJS) $(DEPLIBUUID)
$(CC) $(ALL_LDFLAGS) -o uuidgen $(UUIDGEN_OBJS) $(LIBUUID)
dumpe2fs: $(DUMPE2FS_OBJS) $(DEPLIBS_E2P)
diff --git a/misc/fsck.c b/misc/fsck.c
index 0a616a5..349a74c 100644
--- a/misc/fsck.c
+++ b/misc/fsck.c
@@ -732,7 +732,7 @@
break;
}
if (fs && !skip_root && !ignore(fs)) {
- fsck_device(fs->device, 0);
+ fsck_device(fs->device, 1);
fs->flags |= FLAG_DONE;
status |= wait_all();
if (status > EXIT_NONDESTRUCT)
@@ -777,13 +777,12 @@
/*
* Spawn off the fsck process
*/
- fsck_device(fs->device, 0);
+ fsck_device(fs->device, serialize);
fs->flags |= FLAG_DONE;
if (serialize) {
pass_done = 0;
break; /* Only do one filesystem at a time */
-
}
}
if (verbose > 1)