From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 14 Jan 2021 18:33:42 +0000 (+0100)
Subject: mkosi: Only reset file permissions when $SRCDIR is not a mountpoint
X-Git-Tag: v248-rc1~345
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e2ebc406ac78cb57612ce5c5d590018572d71df1;p=thirdparty%2Fsystemd.git

mkosi: Only reset file permissions when $SRCDIR is not a mountpoint

If $SRCDIR is mounted into the build image (via mkosi overrides),
let's not reset the permissions fo the source tree so as to not
modify the original files on the host.
---

diff --git a/mkosi.build b/mkosi.build
index d7fbff78b80..b60a61f8fe6 100755
--- a/mkosi.build
+++ b/mkosi.build
@@ -9,8 +9,10 @@ set -e
 # so the files keep those permissions, otherwise details of what umask
 # was set at the time the git tree was cloned will leak all the way
 # through. Also set umask explicitly during the build.
-chmod -R u+w,go-w,a+rX .
-umask 022
+if ! mountpoint -q "$SRCDIR"; then
+        chmod -R u+w,go-w,a+rX .
+        umask 022
+fi
 
 # If mkosi.builddir/ exists mkosi will set $BUILDDIR to it, let's then use it
 # as out-of-tree build dir. Otherwise, let's make up our own builddir.