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

mkfs-util: Skip symlinks when calling mcopy

diff --cc src/shared/mkfs-util.c
index 2a995fed529d73d2857a3aed1da4dd99a93a3470,cd15e88ee012cd1dab08fafdc5d3515ed7997966..e89b1b88459d3bec6e764b6a951a6d7e4bd58caa
--- 1/src/shared/mkfs-util.c
--- 2/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;