X-Git-Url: http://git.onelab.eu/?p=util-vserver.git;a=blobdiff_plain;f=upstart.patch;fp=upstart.patch;h=0000000000000000000000000000000000000000;hp=3e36a0239989680e519ea9e96dce688217491eca;hb=e5ab4cc4269d19ad6c083181a0d15d52df30d41e;hpb=4a358f34ef6372de7f75deed105788da683c8eb8

diff --git a/upstart.patch b/upstart.patch
deleted file mode 100644
index 3e36a02..0000000
--- a/upstart.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-commit 54edc50b584ade4f323c16bec6ef6320f129e531
-Author: Daniel Hokka Zakrisson <daniel@hozac.com>
-Date:   Sun Mar 6 21:53:57 2011 +0100
-
-    Work with newer upstart.
-
-diff --git a/distrib/redhat/initpost b/distrib/redhat/initpost
-index 92f79bb..9eece3c 100755
---- a/distrib/redhat/initpost
-+++ b/distrib/redhat/initpost
-@@ -95,9 +95,18 @@ EOF
-     if $_CHROOT_SH testfile /sbin/initctl; then
- 	cat "$__DISTRIBDIR"/redhat/initctl | $_CHROOT_SH truncate /sbin/initctl.vserver
- 	$_CHROOT_SH chmod 0755 /sbin/initctl.vserver
--	subst etc/rc.d/rc 's!^\(.*\)/proc/cmdline\(.*\)$!\1/proc/cmdline 2>/dev/null \2!;s!/sbin/initctl!/sbin/initctl.vserver!'
--	subst etc/event.d/rcS 's!/etc/rc.d/rc.sysinit!/etc/rc.d/rc.sysinit.vserver!'
--	$_CHROOT_SH rm /etc/event.d/tty{1,2,3,4,5,6}
-+	subst etc/rc.d/rc 's!^\(.*\)/proc/cmdline\(.*\)$!\1/proc/cmdline 2>/dev/null \2!;s!initctl!initctl.vserver!'
-+	if test -d etc/event.d; then
-+	    subst etc/event.d/rcS 's!/etc/rc.d/rc.sysinit!/etc/rc.d/rc.sysinit.vserver!'
-+	    $_CHROOT_SH rm /etc/event.d/tty{1,2,3,4,5,6}
-+	elif test -d etc/init; then
-+	    for i in etc/init/*; do
-+		subst $i 's!^console output!#\0!'
-+	    done
-+	    subst etc/init/control-alt-delete.conf 's!/sbin/shutdown -r!/sbin/shutdown -h!'
-+	    subst etc/init/rcS.conf 's!/etc/rc.d/rc.sysinit!/etc/rc.d/rc.sysinit.vserver!;s!cat /proc/cmdline!cat /proc/cmdline 2>/dev/null!'
-+	    subst etc/init/start-ttys.conf 's!^start on !\0never and !'
-+	fi
-     fi
- popd >/dev/null
-