Move to new upstart job location and file extension.

25 files changed, 14 insertions, 14 deletions

diff --git a/Makefile b/Makefile
index 4de8e59a..c92ef2db 100644
--- a/Makefile
+++ b/Makefile
@@ -46,7 +46,7 @@ install:
 	cp -af rc.d/init.d $(ROOT)/etc/rc.d/
 	install -m644 sysconfig/debug sysconfig/init sysconfig/netconsole sysconfig/readonly-root $(ROOT)/etc/sysconfig/
 	cp -af sysconfig/network-scripts $(ROOT)/etc/sysconfig/
-	cp -af ppp NetworkManager event.d $(ROOT)/etc
+	cp -af ppp NetworkManager init $(ROOT)/etc
 	mkdir -p $(ROOT)/etc/ppp/peers
 	mkdir -p $(ROOT)/lib
 	cp -af udev $(ROOT)/lib
@@ -59,7 +59,7 @@ install:
 	chmod 755 $(ROOT)/etc/sysconfig/network-scripts/init*
 	chmod 755 $(ROOT)/etc/sysconfig/network-scripts/net.hotplug
 	chmod 755 $(ROOT)/etc/NetworkManager/dispatcher.d/00-netreport
-	chmod 644 $(ROOT)/etc/event.d/*
+	chmod 644 $(ROOT)/etc/init/*
 	mkdir -p $(ROOT)/etc/sysconfig/modules
 	mkdir -p $(ROOT)/etc/sysconfig/networking/devices
 	mkdir -p $(ROOT)/etc/sysconfig/networking/profiles/default
diff --git a/README-event.d b/README-init
index ea60fbce..9a9b4cfa 100644
--- a/README-event.d
+++ b/README-init
@@ -1,4 +1,4 @@
-The upstart scripts in /etc/event.d originate from event-compat-sysv-0.3.9,
+The upstart scripts in /etc/init originate from event-compat-sysv-0.3.9,
 and have since been heavily modified.
 
 The original copyright is:
diff --git a/event.d/console b/init/console.conf
index 732a3fa9..732a3fa9 100644
--- a/event.d/console
+++ b/init/console.conf
diff --git a/event.d/control-alt-delete b/init/control-alt-delete.conf
index 35cb1305..35cb1305 100644
--- a/event.d/control-alt-delete
+++ b/init/control-alt-delete.conf
diff --git a/event.d/plymouth-shutdown b/init/plymouth-shutdown.conf
index d76dbd3f..d76dbd3f 100644
--- a/event.d/plymouth-shutdown
+++ b/init/plymouth-shutdown.conf
diff --git a/event.d/prefdm b/init/prefdm.conf
index 7098bd76..7098bd76 100644
--- a/event.d/prefdm
+++ b/init/prefdm.conf
diff --git a/event.d/quit-plymouth b/init/quit-plymouth.conf
index 13ac3880..13ac3880 100644
--- a/event.d/quit-plymouth
+++ b/init/quit-plymouth.conf
diff --git a/event.d/rc0 b/init/rc0.conf
index 11ce5a51..11ce5a51 100644
--- a/event.d/rc0
+++ b/init/rc0.conf
diff --git a/event.d/rc1 b/init/rc1.conf
index 38397b31..38397b31 100644
--- a/event.d/rc1
+++ b/init/rc1.conf
diff --git a/event.d/rc2 b/init/rc2.conf
index 6cc4d884..6cc4d884 100644
--- a/event.d/rc2
+++ b/init/rc2.conf
diff --git a/event.d/rc3 b/init/rc3.conf
index 47a4a639..47a4a639 100644
--- a/event.d/rc3
+++ b/init/rc3.conf
diff --git a/event.d/rc4 b/init/rc4.conf
index 8e079f0e..8e079f0e 100644
--- a/event.d/rc4
+++ b/init/rc4.conf
diff --git a/event.d/rc5 b/init/rc5.conf
index 0ef6a400..0ef6a400 100644
--- a/event.d/rc5
+++ b/init/rc5.conf
diff --git a/event.d/rc6 b/init/rc6.conf
index f9df8b4a..f9df8b4a 100644
--- a/event.d/rc6
+++ b/init/rc6.conf
diff --git a/event.d/rcS-sulogin b/init/rcS-sulogin.conf
index d3aa20d1..d3aa20d1 100644
--- a/event.d/rcS-sulogin
+++ b/init/rcS-sulogin.conf
diff --git a/event.d/rcS b/init/rcS.conf
index 1c0a54be..1c0a54be 100644
--- a/event.d/rcS
+++ b/init/rcS.conf
diff --git a/event.d/serial b/init/serial.conf
index 660e93bd..660e93bd 100644
--- a/event.d/serial
+++ b/init/serial.conf
diff --git a/event.d/tty1 b/init/tty1.conf
index 7747d660..7747d660 100644
--- a/event.d/tty1
+++ b/init/tty1.conf
diff --git a/event.d/tty2 b/init/tty2.conf
index ec5f94cd..ec5f94cd 100644
--- a/event.d/tty2
+++ b/init/tty2.conf
diff --git a/event.d/tty3 b/init/tty3.conf
index ed95fdcf..ed95fdcf 100644
--- a/event.d/tty3
+++ b/init/tty3.conf
diff --git a/event.d/tty4 b/init/tty4.conf
index 76b6d717..76b6d717 100644
--- a/event.d/tty4
+++ b/init/tty4.conf
diff --git a/event.d/tty5 b/init/tty5.conf
index 9e9d8137..9e9d8137 100644
--- a/event.d/tty5
+++ b/init/tty5.conf
diff --git a/event.d/tty6 b/init/tty6.conf
index 7eb42c01..7eb42c01 100644
--- a/event.d/tty6
+++ b/init/tty6.conf
diff --git a/initscripts.spec b/initscripts.spec
index 60fa8a95..93772dc3 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -19,7 +19,7 @@ Requires: util-linux-ng >= 2.16, mount >= 2.11l
 Requires: bash >= 3.0
 Requires: sysvinit-tools >= 2.87
 %if with_upstart
-Requires: upstart
+Requires: upstart >= 0.6.0
 %else
 Requires: SysVinit >= 2.85-38
 %endif
@@ -79,7 +79,7 @@ make ROOT=$RPM_BUILD_ROOT SUPERUSER=`id -un` SUPERGROUP=`id -gn` mandir=%{_mandi
  rm -f $RPM_BUILD_ROOT/etc/rc.d/init.d/single
 %else
  mv -f $RPM_BUILD_ROOT/etc/inittab.sysv $RPM_BUILD_ROOT/etc/inittab
- rm -rf $RPM_BUILD_ROOT/etc/event.d
+ rm -rf $RPM_BUILD_ROOT/etc/init
 %endif
 rm -f $RPM_BUILD_ROOT/etc/inittab.*
 
@@ -88,12 +88,12 @@ rm -f \
  $RPM_BUILD_ROOT/etc/sysconfig/network-scripts/ifup-ctc \
  $RPM_BUILD_ROOT/lib/udev/rules.d/55-ccw.rules \
  $RPM_BUILD_ROOT/lib/udev/ccw_init \
- $RPM_BUILD_ROOT/etc/event.d/console
+ $RPM_BUILD_ROOT/etc/init/console
 %else
 rm -f \
  $RPM_BUILD_ROOT/etc/rc.d/rc.sysinit.s390init \
  $RPM_BUILD_ROOT/etc/sysconfig/init.s390 \
- $RPM_BUILD_ROOT/etc/event.d/tty[1-6]
+ $RPM_BUILD_ROOT/etc/init/tty[1-6]
 %endif
 
 %pre
@@ -182,7 +182,7 @@ rm -rf $RPM_BUILD_ROOT
 /etc/statetab
 %dir /etc/statetab.d
 %if with_upstart
-%config(noreplace) /etc/event.d/*
+%config(noreplace) /etc/init/*
 %endif
 %config /etc/X11/prefdm
 %config(noreplace) /etc/inittab
@@ -236,7 +236,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir /etc/NetworkManager/dispatcher.d
 /etc/NetworkManager/dispatcher.d/00-netreport
 /etc/NetworkManager/dispatcher.d/05-netfs
-%doc sysconfig.txt sysvinitfiles static-routes-ipv6 ipv6-tunnel.howto ipv6-6to4.howto changes.ipv6 COPYING README-event.d
+%doc sysconfig.txt sysvinitfiles static-routes-ipv6 ipv6-tunnel.howto ipv6-6to4.howto changes.ipv6 COPYING README-init
 /var/lib/stateless
 %ghost %attr(0600,root,utmp) /var/log/btmp
 %ghost %attr(0664,root,utmp) /var/log/wtmp
diff --git a/inittab.upstart b/inittab.upstart
index 95d359ca..955e7de6 100644
--- a/inittab.upstart
+++ b/inittab.upstart
@@ -2,14 +2,14 @@
 #
 # ADDING OTHER CONFIGURATION HERE WILL HAVE NO EFFECT ON YOUR SYSTEM.
 #
-# System initialization is started by /etc/event.d/rcS
+# System initialization is started by /etc/init/rcS
 #
-# Individual runlevels are started by /etc/event.d/rc[0-6]
+# Individual runlevels are started by /etc/init/rc[0-6]
 #
-# Ctrl-Alt-Delete is handled by /etc/event.d/control-alt-delete
+# Ctrl-Alt-Delete is handled by /etc/init/control-alt-delete
 #
-# Terminal gettys (tty[1-6]) are handled by /etc/event.d/tty[1-6] and
-# /etc/event.d/serial
+# Terminal gettys (tty[1-6]) are handled by /etc/init/tty[1-6] and
+# /etc/init/serial
 #
 # For information on how to write upstart event handlers, or how
 # upstart works, see init(8), initctl(8), and events(5).