You have been requested to review the proposed merge of lp:~xnox/ubuntu/saucy/mountall/btrfs into lp:ubuntu/mountall.
For more details, see: https://code.launchpad.net/~xnox/ubuntu/saucy/mountall/btrfs/+merge/177822 Provide better butter 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) -- https://code.launchpad.net/~xnox/ubuntu/saucy/mountall/btrfs/+merge/177822 Your team Upstart Reviewers is requested to review the proposed merge of lp:~xnox/ubuntu/saucy/mountall/btrfs into lp:ubuntu/mountall.
=== 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 <[email protected]> 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 <[email protected]> -Uploaders: Scott James Remnant <[email protected]>, James Hunt <[email protected]> +Uploaders: Scott James Remnant <[email protected]>, James Hunt <[email protected]>, Dmitrijs Ledkovs <[email protected]> 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));
-- upstart-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/upstart-devel
