Remove TUNE2FS_SKIP_MOUNT_CHECK environment variable support; it is

not needed in the initrd script, and wasn't completely supported
anyway.

diff --git a/misc/ChangeLog b/misc/ChangeLog
index 6b43bce..f10d991 100644 (file)
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -7,11 +7,8 @@
 
 2004-04-07  Theodore Ts'o  <tytso@mit.edu>
 
-       * tune2fs.c (main): If the environment variable
-               TUNE2FS_SKIP_MOUNT_CHECK is set, do not try to check if
-               the filesystem is mounted.
-               (update_feature_set): If the compatibility bitmasks were
-               not modified, don't set the superblock dirty bit.
+       * tune2fs.c (update_feature_set): If the compatibility bitmasks
+               were not modified, don't set the superblock dirty bit.
 
 2004-04-03  Theodore Ts'o  <tytso@mit.edu>
 

diff --git a/misc/tune2fs.8.in b/misc/tune2fs.8.in
index 6c5bf78..a1a034a 100644 (file)
--- a/misc/tune2fs.8.in
+++ b/misc/tune2fs.8.in
@@ -459,20 +459,6 @@ Time-dependent checking was added by Uwe Ohse <uwe@tirka.gun.de>.
 .B tune2fs
 is part of the e2fsprogs package and is available from 
 http://e2fsprogs.sourceforge.net.
-.SH ENVIRONMENT VARIABLES
-The
-.B tune2fs
-program's behavior is affected by the following environment variables:
-.TP
-.B TUNE2FS_SKIP_MOUNT_CHECK
-If this environment variable is set, 
-.B tune2fs
-will not try to check to see if the filesystem is mounted.  This may be 
-necessary in limited initrd environments when 
-.I /etc/mtab
-or
-.I /proc
-may not be available.
 .SH SEE ALSO
 .BR dumpe2fs (8),
 .BR e2fsck (8),

diff --git a/misc/tune2fs.c b/misc/tune2fs.c
index 6f51561..e7c3baf 100644 (file)
--- a/misc/tune2fs.c
+++ b/misc/tune2fs.c
@@ -777,18 +777,13 @@ int main (int argc, char ** argv)
                       sb->s_volume_name);
                exit(0);
        }
-       if (getenv("TUNE2FS_SKIP_MOUNT_CHECK")) {
-               mount_flags = 0;
-       } else {
-               retval = ext2fs_check_if_mounted(device_name, &mount_flags);
-               if (retval) {
-                       com_err("ext2fs_check_if_mount", retval,
-                               _("while determining whether %s is mounted."),
-                               device_name);
-                       exit(1);
-               }
+       retval = ext2fs_check_if_mounted(device_name, &mount_flags);
+       if (retval) {
+               com_err("ext2fs_check_if_mount", retval,
+                       _("while determining whether %s is mounted."),
+                       device_name);
+               exit(1);
        }
-
        /* Normally we only need to write out the superblock */
        fs->flags |= EXT2_FLAG_SUPER_ONLY;