From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 24 Nov 2022 15:28:01 +0000 (+0100)
Subject: Merge pull request #25500 from DaanDeMeyer/mcopy-skip-symlinks
X-Git-Tag: v253-rc1~454
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=03288a3f286db73d913716e9506df452fd1b77cb;p=thirdparty%2Fsystemd.git

Merge pull request #25500 from DaanDeMeyer/mcopy-skip-symlinks

mkfs-util: Skip symlinks when calling mcopy
---

03288a3f286db73d913716e9506df452fd1b77cb
diff --cc src/shared/mkfs-util.c
index 2a995fed529,cd15e88ee01..e89b1b88459
--- a/src/shared/mkfs-util.c
+++ b/src/shared/mkfs-util.c
@@@ -128,9 -128,9 +128,10 @@@ static int setup_userns(uid_t uid, gid_
  }
  
  static int do_mcopy(const char *node, const char *root) {
 +        _cleanup_free_ char *mcopy = NULL;
          _cleanup_strv_free_ char **argv = NULL;
-         _cleanup_closedir_ DIR *rootdir = NULL;
+         _cleanup_close_ int rfd = -1;
+         _cleanup_free_ DirectoryEntries *de = NULL;
          struct stat st;
          int r;