[Devel] [PATCH] prestart.sh: remove fixup_udev() completely

Kir Kolyshkin kir at openvz.org
Wed Jan 22 15:06:38 PST 2014


The whole point of fixup_udev() was to wait for container to be started
and then umount those mounts done from the inside of container, in order
to uncover the mounts previously done by vzctl.

Now, previous commit removes those mounts from vzctl code, as well
as umounts from this script. What is left in fixup_udev() is code
to wait for container to start. Remove that as well.

Cc: Andrey Vagin <avagin at openvz.org>
Signed-off-by: Kir Kolyshkin <kir at openvz.org>
---
 etc/dists/scripts/prestart.sh | 23 -----------------------
 1 file changed, 23 deletions(-)

diff --git a/etc/dists/scripts/prestart.sh b/etc/dists/scripts/prestart.sh
index 897a586..1f28b13 100755
--- a/etc/dists/scripts/prestart.sh
+++ b/etc/dists/scripts/prestart.sh
@@ -21,28 +21,6 @@
 # is, so far, meaningless inside a container. This script will apply various
 # fixups if needed.
 
-# Legacy udev will try to mount its own /dev in tmpfs, which will in turn
-# destroy all our hand crafted setup. We need to undo it here.
-fixup_udev()
-{
-	[ -f /etc/fedora-release ] && return
-	[ -f /etc/redhat-release ] || return
-
-	# rc.sysinit will touch this file after it finishes.
-	timestamp=$(stat -c %x /.autofsck 2>/dev/null)
-	i=0
-	while true; do
-		newstamp=$(stat -c %x /.autofsck 2>/dev/null)
-		if [ "x$newstamp" = "x$timestamp" ]; then
-			sleep 0.5
-			i=$((i+1))
-			[ $i -gt 10 ] && return
-			continue
-		fi
-		break
-	done
-}
-
 fixup_loginuid()
 {
 	local pam_permit="security/pam_permit.so"
@@ -58,7 +36,6 @@ fixup_loginuid()
 [ "x$VZ_KERNEL" = "xyes" ] && exit 0
 [ "x$USERNS" = "xno" ] && exit 0
 
-fixup_udev &
 fixup_loginuid
 
 exit 0
-- 
1.8.1.4




More information about the Devel mailing list