Updates to handle Linux 2.4.0 kernels (kludged around the "none" entries in

/proc/mounts, added a hack to make sysinfo work with both old and new kernels).
 -Erik

1 files changed, 8 insertions, 0 deletions

diff --git a/util-linux/mount.c b/util-linux/mount.c
index 76f048b1c..292be0c43 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -358,6 +358,10 @@ extern int mount_main(int argc, char **argv)
                         fatalError( "\nDEVMTAB_GET_MOUNTS: %s\n", strerror (errno));
 
                 for( i = 0 ; i < numfilesystems ; i++) {
+                        /* klude around Linux 2.4.x stupidity */
+                        if (strcmp(mntentlist[i].mnt_fsname, "none") == 0) {
+                                continue;
+                        }
                         fprintf( stdout, "%s %s %s %s %d %d\n", mntentlist[i].mnt_fsname,
                                         mntentlist[i].mnt_dir, mntentlist[i].mnt_type, 
                                         mntentlist[i].mnt_opts, mntentlist[i].mnt_freq, 
@@ -380,6 +384,10 @@ extern int mount_main(int argc, char **argv)
 
                         while ((m = getmntent(mountTable)) != 0) {
                                 char *blockDevice = m->mnt_fsname;
+                                /* klude around Linux 2.4.x stupidity */
+                                if (strcmp(blockDevice, "none") == 0) {
+                                        continue;
+                                }
                                 if (strcmp(blockDevice, "/dev/root") == 0) {
                                         find_real_root_device_name( blockDevice);
                                 }