commit: 665695e425dd29010b5e1dc944bd2765254ec7f8
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 13 15:02:47 2021 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Feb 13 15:02:47 2021 +0000
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=665695e4
Bump util-linux to v2.36.2
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
....1-switch_root-check-if-mountpoint-exists.patch | 31 ----------------------
1 file changed, 31 deletions(-)
diff --git
a/patches/util-linux/2.36.1/util-linux-2.36.1-switch_root-check-if-mountpoint-exists.patch
b/patches/util-linux/2.36.1/util-linux-2.36.1-switch_root-check-if-mountpoint-exists.patch
deleted file mode 100644
index 17bcd91..0000000
---
a/patches/util-linux/2.36.1/util-linux-2.36.1-switch_root-check-if-mountpoint-exists.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-switch_root: check if mount point to move even exists
-
---- a/sys-utils/switch_root.c
-+++ b/sys-utils/switch_root.c
-@@ -131,7 +131,12 @@ static int switchroot(const char *newroot)
- int i;
- int cfd;
- pid_t pid;
-- struct stat newroot_stat, sb;
-+ struct stat newroot_stat, oldroot_stat, sb;
-+
-+ if (stat("/", &oldroot_stat) != 0) {
-+ warn(_("stat of %s failed"), "/");
-+ return -1;
-+ }
-
- if (stat(newroot, &newroot_stat) != 0) {
- warn(_("stat of %s failed"), newroot);
-@@ -143,6 +148,11 @@ static int switchroot(const char *newroot)
-
- snprintf(newmount, sizeof(newmount), "%s%s", newroot,
umounts[i]);
-
-+ if ((stat(umounts[i], &sb) == 0) && sb.st_dev ==
oldroot_stat.st_dev) {
-+ /* mount point to move seems to be a normal directory
or stat failed */
-+ continue;
-+ }
-+
- if ((stat(newmount, &sb) != 0) || (sb.st_dev !=
newroot_stat.st_dev)) {
- /* mount point seems to be mounted already or stat
failed */
- umount2(umounts[i], MNT_DETACH);
-
