upstart.patch

   1 commit 54edc50b584ade4f323c16bec6ef6320f129e531
   2 Author: Daniel Hokka Zakrisson <daniel@hozac.com>
   3 Date:   Sun Mar 6 21:53:57 2011 +0100
   4
   5     Work with newer upstart.
   6
   7 diff --git a/distrib/redhat/initpost b/distrib/redhat/initpost
   8 index 92f79bb..9eece3c 100755
   9 --- a/distrib/redhat/initpost
  10 +++ b/distrib/redhat/initpost
  11 @@ -95,9 +95,18 @@ EOF
  12      if $_CHROOT_SH testfile /sbin/initctl; then
  13         cat "$__DISTRIBDIR"/redhat/initctl | $_CHROOT_SH truncate /sbin/initctl.vserver
  14         $_CHROOT_SH chmod 0755 /sbin/initctl.vserver
  15 -       subst etc/rc.d/rc 's!^\(.*\)/proc/cmdline\(.*\)$!\1/proc/cmdline 2>/dev/null \2!;s!/sbin/initctl!/sbin/initctl.vserver!'
  16 -       subst etc/event.d/rcS 's!/etc/rc.d/rc.sysinit!/etc/rc.d/rc.sysinit.vserver!'
  17 -       $_CHROOT_SH rm /etc/event.d/tty{1,2,3,4,5,6}
  18 +       subst etc/rc.d/rc 's!^\(.*\)/proc/cmdline\(.*\)$!\1/proc/cmdline 2>/dev/null \2!;s!initctl!initctl.vserver!'
  19 +       if test -d etc/event.d; then
  20 +           subst etc/event.d/rcS 's!/etc/rc.d/rc.sysinit!/etc/rc.d/rc.sysinit.vserver!'
  21 +           $_CHROOT_SH rm /etc/event.d/tty{1,2,3,4,5,6}
  22 +       elif test -d etc/init; then
  23 +           for i in etc/init/*; do
  24 +               subst $i 's!^console output!#\0!'
  25 +           done
  26 +           subst etc/init/control-alt-delete.conf 's!/sbin/shutdown -r!/sbin/shutdown -h!'
  27 +           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!'
  28 +           subst etc/init/start-ttys.conf 's!^start on !\0never and !'
  29 +       fi
  30      fi
  31  popd >/dev/null
  32