rpms/util-linux
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

2.20.1-2.2: #747250, #769636, #771607, #747038

Browse source
This commit is contained in:
Michal Luscon 2012-01-20 11:39:36 +01:00
commit 85a6551255
5 changed files with 284 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

25
util-linux-2.20-switch_root.patch Normal file
View file

@ -0,0 +1,25 @@
--- a/sys-utils/switch_root.c
+++ b/sys-utils/switch_root.c
@@ -40,6 +40,10 @@
#define MS_MOVE 8192
#endif
+#ifndef MNT_DETACH
+#define MNT_DETACH 0x00000002 /* Just detach from the tree */
+#endif
+
/* remove all files/directories below dirName -- don't cross mountpoints */
static int recursiveRemove(int fd)
{
@@ -131,7 +135,7 @@ static int switchroot(const char *newroot)
if ((stat(newmount, &sb) != 0) || (sb.st_dev != newroot_stat.st_dev)) {
/* mount point seems to be mounted already or stat failed */
- umount(umounts[i]);
+ umount2(umounts[i], MNT_DETACH);
continue;
}
--
1.7.7.5