Merge lp:~xnox/ubuntu/saucy/mountall/btrfs into lp:ubuntu/saucy/mountall

[Dimitri John Ledkov]

Provide better bitter fs support.

* Ignore missing fsck.btrfs
* Skip automatic checking of filesystems with major zero, such as btrfs. (similar is done by sysvinit & checkroot.sh / systemdish systems)

[Steve Langasek (vorlon)]

I don't think mountall should special case fsck.btrfs. fsck.$fs is a standard interface; btrfs-tools should be supporting this, even if it means making it a symlink to /bin/true - mountall should not be special-casing btrfs, btrfs should be complying with the interfaces.

I'm also not happy with the "major_zero" change. This is way too magic. I think we should get an explanation of why this is the correct check here before including such code.

review: Disapprove

[James Hunt (jamesodhunt)]

Drive-by review comment...

- major_zero() could do with an nih_assert call to check mnt (as could missing_fsck() and find_fsck()).

Unmerged revisions

445. By Dimitri John Ledkov on 2013-07-31

* Allow skipping fsck, when no fsck utility found for btrfs.
* Skip automatic checking of filesystems with major 0, such as btrfs.
* Add myself to uploaders.

=== modified file 'debian/changelog'
--- debian/changelog	2013-07-02 23:10:21 +0000
+++ debian/changelog	2013-07-31 12:28:30 +0000
@@ -1,3 +1,11 @@
+mountall (2.50) unstable; urgency=low
+
+  * Allow skipping fsck, when no fsck utility found for btrfs.
+  * Skip automatic checking of filesystems with major 0, such as btrfs.
+  * Add myself to uploaders.
+
+ -- Dmitrijs Ledkovs <[e-mail]>  Wed, 31 Jul 2013 11:32:23 +0100
+
 mountall (2.49) unstable; urgency=low
 
   [ James Hunt ]

=== modified file 'debian/control'
--- debian/control	2012-06-28 15:59:27 +0000
+++ debian/control	2013-07-31 12:28:30 +0000
@@ -2,7 +2,7 @@
 Section: admin
 Priority: required
 Maintainer: Steve Langasek <[e-mail]>
-Uploaders: Scott James Remnant <[e-mail]>, James Hunt <[e-mail]>
+Uploaders: Scott James Remnant <[e-mail]>, James Hunt <[e-mail]>, Dmitrijs Ledkovs <[e-mail]>
 Standards-Version: 3.9.3
 Build-Depends: debhelper (>= 9.20120410), pkg-config (>= 0.22), libnih-dev (>= 1.0.0), libnih-dbus-dev (>= 1.0.0), nih-dbus-tool (>= 1.0.0), libdbus-1-dev (>= 1.2.16), libexpat1-dev (>= 2.0.0), libudev-dev (>= 146), plymouth-dev (>= 0.8.5.1) | libplymouth-dev (>= 0.8.1-3)
 Vcs-Bzr: lp:ubuntu/mountall

=== modified file 'src/mountall.c'
--- src/mountall.c	2013-04-05 21:11:08 +0000
+++ src/mountall.c	2013-07-31 12:28:30 +0000
@@ -210,6 +210,7 @@
 void   run_swapon_finished   (Mount *mnt, pid_t pid, int status);
 
 int    missing_fsck          (Mount *mnt);
+int    major_zero            (Mount *mnt);
 void   run_fsck              (Mount *mnt);
 void   run_fsck_finished     (Mount *mnt, pid_t pid, int status);
 
@@ -2392,6 +2393,7 @@
 	"ext3",
 	"ext4",
 	"ext4dev",
+	"btrfs",
 	"jfs",
 	"reiserfs",
 	"xfs",
@@ -2425,6 +2427,31 @@
 	return TRUE;
 }
 
+/**
+ * major_zero:
+ *
+ * Returns TRUE if major device number of the filesystem is zero.
+ */
+int
+major_zero (Mount *mnt)
+{
+	struct stat    st;
+
+	if (lstat (mnt->mountpoint, &st) != 0) {
+		nih_debug ("%s: lstat failed.", MOUNT_NAME (mnt));
+		return FALSE;
+	}
+
+	if (!S_ISDIR(st.st_mode)) {
+		nih_debug ("%s: not a directory.", MOUNT_NAME (mnt));
+		return FALSE;
+	}
+
+	if (major (st.st_dev) == 0)
+		return TRUE;
+
+	return FALSE;
+}
 
 void
 run_fsck (Mount *mnt)
@@ -2446,6 +2473,11 @@
 		mnt->ready = TRUE;
 		try_mount (mnt, FALSE);
 		return;
+	} else if (major_zero (mnt)) {
+		nih_debug ("%s: no need to check", MOUNT_NAME (mnt));
+		mnt->ready = TRUE;
+		try_mount (mnt, FALSE);
+		return;
 	} else if (missing_fsck (mnt)) {
 		nih_debug ("%s: no appropriate fsck.* present",
 			   MOUNT_NAME (mnt));