[Merge] ~bryce/ubuntu/+source/coreutils:project-c2439-ignore-snaps-groovy into ubuntu/+source/coreutils:ubuntu/devel

[Sergio Durigan Junior]

Review: Approve

Thanks for the patch, Bryce!

After following the discussions on ubuntu-devel and the developments of the upstream bug, I decided I'd review it.

I ran some tests on a lxd VM (I had install snapd, and then "snap install" something inside the VM so that I could see the /snap/* mountpoints), and everything works as expected :-).

The patch itself is pretty simple; I just had two nits that I thought I'd point out.  Otherwise, it looks OK to me!  I'm marking the MP as "Approved" because I don't think it's worth doing another round just for the sake of these two nits.

Thanks again.

Diff comments:

> diff --git a/debian/patches/treat-devtmpfs-and-squashfs-as-dummy-filesystems.patch b/debian/patches/treat-devtmpfs-and-squashfs-as-dummy-filesystems.patch
> new file mode 100644
> index 0000000..f17c5eb
> --- /dev/null
> +++ b/debian/patches/treat-devtmpfs-and-squashfs-as-dummy-filesystems.patch
> @@ -0,0 +1,27 @@
> +From ee5ce3f0637d5533e6e1f68e6a7e7f846ff742c4 Mon Sep 17 00:00:00 2001
> +From: Bryce Harrington <bryce at canonical.com>
> +Date: Thu, 2 Jul 2020 01:50:48 +0000
> +Subject: [PATCH] Treat devtmpfs and squashfs as dummy filesystems
> +
> +Fixes: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=37702
> +Signed-off-by: Bryce Harrington <bryce at canonical.com>

I think we need DEP-3-compatible headers here.  At least this is what I've been trying to do on all the patches I backport :).

> +---
> + lib/mountlist.c | 2 ++
> + 1 file changed, 2 insertions(+)
> +
> +diff --git a/lib/mountlist.c b/lib/mountlist.c
> +index b691f380..496672e5 100644
> +--- a/lib/mountlist.c
> ++++ b/lib/mountlist.c
> +@@ -167,6 +167,8 @@
> + 
> + #define ME_DUMMY_0(Fs_name, Fs_type)            \
> +   (strcmp (Fs_type, "autofs") == 0              \
> ++   || strcmp (Fs_type, "devtmpfs") == 0         \
> ++   || strcmp (Fs_type, "squashfs") == 0         \

A very, very tiny nit, but it seems like the list was alphabetically sorted before, so if it were me I'd keep that.  Not that I envision this list to grow a lot, but it helps when things are sorted.  But as I said, this is a very small nit.

> +    || strcmp (Fs_type, "proc") == 0             \
> +    || strcmp (Fs_type, "subfs") == 0            \
> +    /* for Linux 2.6/3.x */                      \
> +-- 
> +2.25.1
> +


-- 
https://code.launchpad.net/~bryce/ubuntu/+source/coreutils/+git/coreutils/+merge/386911
Your team Ubuntu Core Development Team is requested to review the proposed merge of ~bryce/ubuntu/+source/coreutils:project-c2439-ignore-snaps-groovy into ubuntu/+source/coreutils:ubuntu/devel.