osbuild: update chattr stage with final version

The PR finally merged but didn't make it into the v106
release so we still need to carry the patch for now.
osbuild/osbuild#1535

Author: dustymabe

src/0001-mounts-ostree.deployment-rework-unmounting.patch

@@ -1,4 +1,4 @@
-From a16da49474762d09ebf909651ec68633b799b6fe Mon Sep 17 00:00:00 2001
+From 0da68e9af5a7b148e9841ff2a48bffd96be79b72 Mon Sep 17 00:00:00 2001
 From: Dusty Mabe <dusty@dustymabe.com>
 Date: Tue, 9 Jan 2024 23:23:25 -0500
 Subject: [PATCH 1/5] mounts/ostree.deployment: rework unmounting

src/0002-mounts-ostree.deployment-rename-var-root-deploy_root.patch

@@ -1,4 +1,4 @@
-From 34f74cfb33d7fd6994ec2a7b53aa45c262b69b78 Mon Sep 17 00:00:00 2001
+From e43abe1a9cbff3508eebc31d33efdc2fa44306aa Mon Sep 17 00:00:00 2001
 From: Dusty Mabe <dusty@dustymabe.com>
 Date: Wed, 10 Jan 2024 00:02:38 -0500
 Subject: [PATCH 2/5] mounts/ostree.deployment: rename var root -> deploy_root

src/0003-mounts-ostree.deployment-use-target-instead-of-tree.patch

@@ -1,4 +1,4 @@
-From b60e4d8cb4827d3f7cf2aa2158ba94ec00092520 Mon Sep 17 00:00:00 2001
+From be90d8c36c0f0a6846a475f394843e898ad35a24 Mon Sep 17 00:00:00 2001
 From: Dusty Mabe <dusty@dustymabe.com>
 Date: Wed, 10 Jan 2024 00:12:01 -0500
 Subject: [PATCH 3/5] mounts/ostree.deployment: use target instead of tree

src/0004-mounts-ostree.deployment-support-deployments-on-moun.patch

@@ -1,4 +1,4 @@
-From 32835637fe28ddbbf4ff1b1da6321a4e1a45884f Mon Sep 17 00:00:00 2001
+From bd6b8ffb83384e7f9e78dc42a9cee626830b990f Mon Sep 17 00:00:00 2001
 From: Dusty Mabe <dusty@dustymabe.com>
 Date: Wed, 10 Jan 2024 11:07:14 -0500
 Subject: [PATCH 4/5] mounts/ostree.deployment: support deployments on mount
@@ -57,11 +57,11 @@ on the disk. The second mount (of type org.osbuild.ostree.deployment)
 then reconfigures things similar to how an OSTree system is set up.
 ---
  mounts/org.osbuild.ostree.deployment | 18 +++++++++++++++---
- osbuild/mounts.py                    | 13 +++++++++++--
- 2 files changed, 26 insertions(+), 5 deletions(-)
+ osbuild/mounts.py                    | 13 ++++++++++---
+ 2 files changed, 25 insertions(+), 6 deletions(-)
 
 diff --git a/mounts/org.osbuild.ostree.deployment b/mounts/org.osbuild.ostree.deployment
-index b200eca3..e19ac525 100755
+index b200eca3..24df7731 100755
 --- a/mounts/org.osbuild.ostree.deployment
 +++ b/mounts/org.osbuild.ostree.deployment
 @@ -32,6 +32,12 @@ SCHEMA_2 = """
@@ -72,7 +72,7 @@ index b200eca3..e19ac525 100755
 +        "type": "string",
 +        "pattern": "^(mount|tree)$",
 +        "default": "tree",
-+        "description": "The source of the OSTree filesystem tree"
++        "description": "The source of the OSTree filesystem tree. If 'mount', there should be a preceding mount defined that's mounted at /."
 +      },
        "deployment": {
          "type": "object",
@@ -111,10 +111,10 @@ index b200eca3..e19ac525 100755
          var = os.path.join(target, "ostree", "deploy", osname, "var")
          boot = os.path.join(target, "boot")
 diff --git a/osbuild/mounts.py b/osbuild/mounts.py
-index 86576ad0..3e63c873 100644
+index b938d21d..42b556ba 100644
 --- a/osbuild/mounts.py
 +++ b/osbuild/mounts.py
-@@ -180,6 +180,8 @@ class FileSystemMountService(MountService):
+@@ -181,6 +181,8 @@ class FileSystemMountService(MountService):
          os.makedirs(mountpoint, exist_ok=True)
          self.mountpoint = mountpoint
 
@@ -123,21 +123,20 @@ index 86576ad0..3e63c873 100644
          try:
              subprocess.run(
                  ["mount"] +
-@@ -202,12 +204,19 @@ class FileSystemMountService(MountService):
+@@ -203,12 +205,17 @@ class FileSystemMountService(MountService):
          if not self.mountpoint:
              return
 
+-        self.sync()
 +        # It's possible this mountpoint has already been unmounted
 +        # if a umount -R was run by another process, as is done in
 +        # mounts/org.osbuild.ostree.deployment.
 +        if not os.path.ismount(self.mountpoint):
 +            print(f"already unmounted: {self.mountpoint}")
 +            return
-+
-         self.sync()
 
 -        print("umounting")
-+        print(f"unmounting {self.mountpoint}")
++        self.sync()
 
          # We ignore errors here on purpose
 -        subprocess.run(["umount", self.mountpoint],

src/0005-Create-stages-org.osbuild.chattr-stage.patch

@@ -1,4 +1,4 @@
-From 98f472f05d02d6364d390d345ba133fa63e70284 Mon Sep 17 00:00:00 2001
+From 477a21043eeb55468b1f75a9574e46e77cb5fdef Mon Sep 17 00:00:00 2001
 From: Luke Yang <luyang@redhat.com>
 Date: Mon, 22 Jan 2024 10:28:01 -0500
 Subject: [PATCH 5/5] Create stages/org.osbuild.chattr stage