Attachment 289873 Details for Bug 214877 – util-linux-ng-2.13.1-rc1-consistent-mtab-update-failure.patch

[patch] util-linux-ng-2.13.1-rc1-consistent-mtab-update-failure.patch

util-linux-ng-2.13.1-rc1-consistent-mtab-update-failure.patch (text/plain), 2.13 KB, created by Mark McLoughlin on 2007-12-18 09:54:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark McLoughlin

Created: 2007-12-18 09:54:38 UTC

Size: 2.13 KB

patch

obsolete

>diff -up util-linux-ng-2.13.1-rc1/mount/fstab.c.consistent-mtab-update-failure util-linux-ng-2.13.1-rc1/mount/fstab.c
>--- util-linux-ng-2.13.1-rc1/mount/fstab.c.consistent-mtab-update-failure	2007-12-18 09:43:47.000000000 +0000
>+++ util-linux-ng-2.13.1-rc1/mount/fstab.c	2007-12-18 09:50:12.000000000 +0000
>@@ -42,6 +42,11 @@ get_mtab_info(void) {
> 	}
> }
> 
>+void
>+reset_mtab_info(void) {
>+        have_mtab_info = 0;
>+}
>+
> int
> mtab_does_not_exist(void) {
> 	get_mtab_info();
>diff -up util-linux-ng-2.13.1-rc1/mount/fstab.h.consistent-mtab-update-failure util-linux-ng-2.13.1-rc1/mount/fstab.h
>--- util-linux-ng-2.13.1-rc1/mount/fstab.h.consistent-mtab-update-failure	2007-12-18 09:43:47.000000000 +0000
>+++ util-linux-ng-2.13.1-rc1/mount/fstab.h	2007-12-18 09:50:12.000000000 +0000
>@@ -4,6 +4,7 @@
> #include "mount_mntent.h"
> int mtab_is_writable(void);
> int mtab_does_not_exist(void);
>+void reset_mtab_info(void);
> int is_mounted_once(const char *name);
> int is_mounted_same_loopfile(const char *loopfile, const char *dir);
> 
>diff -up util-linux-ng-2.13.1-rc1/mount/mount.c.consistent-mtab-update-failure util-linux-ng-2.13.1-rc1/mount/mount.c
>--- util-linux-ng-2.13.1-rc1/mount/mount.c.consistent-mtab-update-failure	2007-12-18 09:43:47.000000000 +0000
>+++ util-linux-ng-2.13.1-rc1/mount/mount.c	2007-12-18 09:53:23.000000000 +0000
>@@ -568,6 +568,8 @@ create_mtab (void) {
> 	my_endmntent (mfp);
> 
> 	unlock_mtab();
>+
>+	reset_mtab_info();
> }
> 
> /* count successful mount system calls */
>@@ -965,6 +967,13 @@ update_mtab_entry(const char *spec, cons
> 	if (verbose)
> 		print_one (&mnt);
> 
>+	if (!nomtab && mtab_does_not_exist()) {
>+		if (verbose > 1)
>+			printf(_("mount: no %s found - creating it..\n"),
>+			       MOUNTED);
>+		create_mtab ();
>+	}
>+
> 	if (!nomtab && mtab_is_writable()) {
> 		if (flags & MS_REMOUNT)
> 			update_mtab (mnt.mnt_dir, &mnt);
>@@ -2001,13 +2010,6 @@ main(int argc, char *argv[]) {
> 			die (EX_USAGE, _("mount: only root can do that"));
> 	}
> 
>-	if (!nomtab && mtab_does_not_exist()) {
>-		if (verbose > 1)
>-			printf(_("mount: no %s found - creating it..\n"),
>-			       MOUNTED);
>-		create_mtab ();
>-	}
>-
> 	switch (argc+specseen) {
> 	case 0:
> 		/* mount -a */

Actions: View | Diff

Attachments on bug 214877: 140824 | 289873