diff options
| author | Simon Rettberg | 2026-04-22 15:30:37 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2026-04-22 15:30:37 +0200 |
| commit | fb812b471237220a8a75204062ea7d2c5f2e5686 (patch) | |
| tree | bb72a69bc52be86caf3b2885e25d9868b4bc13cb | |
| parent | dracut: Fix: Add missing 60s delay before actual reboot/poweroff (diff) | |
| download | systemd-init-fb812b471237220a8a75204062ea7d2c5f2e5686.tar.gz systemd-init-fb812b471237220a8a75204062ea7d2c5f2e5686.tar.xz systemd-init-fb812b471237220a8a75204062ea7d2c5f2e5686.zip | |
dracut: Update ash install patch to dracut-ng 110
| -rw-r--r-- | patches/dracut/dracut-install-ash.patch | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/patches/dracut/dracut-install-ash.patch b/patches/dracut/dracut-install-ash.patch index 5cae3d9b..d52711d1 100644 --- a/patches/dracut/dracut-install-ash.patch +++ b/patches/dracut/dracut-install-ash.patch @@ -1,17 +1,20 @@ diff --git a/src/install/dracut-install.c b/src/install/dracut-install.c -index b1b2391b..6cee3f8e 100644 +index efa64306..17e2d08e 100644 --- a/src/install/dracut-install.c +++ b/src/install/dracut-install.c -@@ -440,7 +440,7 @@ normal_copy: - const char *preservation = (geteuid() == 0 - && no_xattr == false) ? "--preserve=mode,xattr,timestamps,ownership" : "--preserve=mode,timestamps,ownership"; +@@ -441,9 +441,9 @@ normal_copy: + if (pid == 0) { -- execlp("cp", "cp", "--reflink=auto", "--sparse=auto", preservation, "-fL", src, dst, NULL); -+ execlp("cp", "cp", "--remove-destination", "--reflink=auto", "--sparse=auto", preservation, "-fL", src, dst, NULL); + if (preservation) +- execlp("cp", "cp", "--reflink=auto", "--preserve=xattr", "-fLp", src, dst, NULL); ++ execlp("cp", "cp", "--remove-destination", "--reflink=auto", "--preserve=xattr", "-fLp", src, dst, NULL); + else +- execlp("cp", "cp", "--reflink=auto", "-fLp", src, dst, NULL); ++ execlp("cp", "cp", "--remove-destination", "--reflink=auto", "-fLp", src, dst, NULL); _exit(errno == ENOENT ? 127 : 126); } -@@ -1203,6 +1203,8 @@ static int resolve_deps(const char *src, Hashmap *pdeps) +@@ -1211,6 +1211,8 @@ static int resolve_deps(const char *src, Hashmap *pdeps) char *p, *q; for (p = &shebang[2]; *p && isspace(*p); p++) ; for (q = p; *q && (!isspace(*q)); q++) ; |