Hello community,
here is the log from the commit of package upstart for openSUSE:Factory
checked in at Fri Mar 26 16:51:03 CET 2010.
--------
--- upstart/upstart.changes 2010-03-12 11:58:30.000000000 +0100
+++ upstart/upstart.changes 2010-03-26 14:01:00.000000000 +0100
@@ -1,0 +2,5 @@
+Fri Mar 26 13:00:43 UTC 2010 - coolo@novell.com
+
+- remove duplicated boot script
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ upstart.spec ++++++
--- /var/tmp/diff_new_pack.JeVsYK/_old 2010-03-26 16:50:47.000000000 +0100
+++ /var/tmp/diff_new_pack.JeVsYK/_new 2010-03-26 16:50:47.000000000 +0100
@@ -19,7 +19,7 @@
Name: upstart
Version: 0.6.5
-Release: 1
+Release: 2
Summary: An event-driven init system
Group: System/Boot
License: GPLv2 and LGPLv2+
++++++ scripts.diff ++++++
--- /var/tmp/diff_new_pack.JeVsYK/_old 2010-03-26 16:50:47.000000000 +0100
+++ /var/tmp/diff_new_pack.JeVsYK/_new 2010-03-26 16:50:47.000000000 +0100
@@ -1,7 +1,7 @@
Index: upstart-0.6.5/conf/control-alt-delete.conf
===================================================================
---- upstart-0.6.5.orig/conf/control-alt-delete.conf 2010-03-11 18:10:09.000000000 +0100
-+++ upstart-0.6.5/conf/control-alt-delete.conf 2010-03-12 11:49:04.000000000 +0100
+--- upstart-0.6.5.orig/conf/control-alt-delete.conf 2009-10-23 22:47:27.000000000 +0200
++++ upstart-0.6.5/conf/control-alt-delete.conf 2010-03-24 15:27:21.000000000 +0100
@@ -1,12 +1,9 @@
# control-alt-delete - emergency keypress handling
#
@@ -19,8 +19,8 @@
+exec /sbin/shutdown -r now "Control-Alt-Delete pressed"
Index: upstart-0.6.5/conf/rc.conf
===================================================================
---- upstart-0.6.5.orig/conf/rc.conf 2010-03-11 18:10:09.000000000 +0100
-+++ upstart-0.6.5/conf/rc.conf 2010-03-11 20:25:21.000000000 +0100
+--- upstart-0.6.5.orig/conf/rc.conf 2009-10-23 22:47:27.000000000 +0200
++++ upstart-0.6.5/conf/rc.conf 2010-03-24 15:27:21.000000000 +0100
@@ -1,18 +1,15 @@
# rc - System V runlevel compatibility
#
@@ -47,67 +47,52 @@
exec /etc/init.d/rc $RUNLEVEL
Index: upstart-0.6.5/conf/rcS.conf
===================================================================
---- upstart-0.6.5.orig/conf/rcS.conf 2010-03-11 18:10:09.000000000 +0100
-+++ upstart-0.6.5/conf/rcS.conf 2010-03-12 12:11:02.000000000 +0100
-@@ -1,26 +1,35 @@
+--- upstart-0.6.5.orig/conf/rcS.conf 2009-10-23 22:47:27.000000000 +0200
++++ upstart-0.6.5/conf/rcS.conf 2010-03-24 15:28:25.000000000 +0100
+@@ -1,26 +1,21 @@
-# rcS - System V single-user mode compatibility
-+# rcS - runlevel compatibility
++# rcS - "single-user" runlevel compatibility
#
-# This task handles the old System V-style single-user mode, this is
-# distinct from the other runlevels since running the rc script would
-# be bad.
-+# This task runs the old sysv-rc startup scripts.
-
+-
-description "System V single-user mode compatibility"
-author "Scott James Remnant "
-+start on startup
++# This task runs /bin/bash during "single-user" mode,
++# then continues to the default runlevel.
--start on runlevel S
--stop on runlevel [!S]
-+stop on runlevel
+ start on runlevel S
++
+ stop on runlevel [!S]
--console owner
+ console owner
-exec /sbin/sulogin
-+task
-
--post-stop script
+-
++script
++ exec /bin/bash
++end script
+ post-stop script
- # Don't switch runlevels if we were stopped by an event, since that
- # means we're already switching runlevels
- if [ -n "${UPSTART_STOP_EVENTS}" ]
- then
- exit 0
- fi
-+# Note: there can be no previous runlevel here, if we have one it's bad
-+# information (we enter rc1 not rcS for maintenance). Run /etc/rc.d/rc
-+# without information so that it defaults to previous=N runlevel=S.
-+console output
-+
-+script
-+ if [ -f /dev/shm/initrd_exports.sh ]; then
-+ . /dev/shm/initrd_exports.sh
-+ fi
-+ /etc/init.d/boot
-+end script
-
+-
- # Switch, passing a magic flag
- start --no-wait rc-sysinit FROM_SINGLE_USER_MODE=y
-+post-stop script
-+ if [ "$UPSTART_EVENTS" = "startup" ]; then
-+ runlevel=$(/bin/awk -F ':' '$3 == "initdefault" && $1 !~ "^#" { print $2 }' /etc/inittab)
-+ [ -z "$runlevel" ] && runlevel="3"
-+ for t in $(cat /proc/cmdline); do
-+ case $t in
-+ -s|single|S|s) runlevel="S" ;;
-+ [1-9]) runlevel="$t" ;;
-+ esac
-+ done
-+ exec telinit $runlevel
-+ fi
++ if [ "$RUNLEVEL" = "S" ]; then
++ runlevel=$(/bin/awk -F ':' '$3 == "initdefault" && $1 !~ "^#" { print $2 }' /etc/inittab)
++ [ -z "$runlevel" ] && runlevel="3"
++ exec telinit $runlevel
++ fi
end script
++
Index: upstart-0.6.5/conf/reload-init.conf
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ upstart-0.6.5/conf/reload-init.conf 2010-03-06 13:21:06.000000000 +0100
++++ upstart-0.6.5/conf/reload-init.conf 2010-03-24 15:27:21.000000000 +0100
@@ -0,0 +1,4 @@
+start on started messagebus
+
@@ -116,7 +101,7 @@
Index: upstart-0.6.5/conf/start-ttys.conf
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ upstart-0.6.5/conf/start-ttys.conf 2010-03-06 13:21:06.000000000 +0100
++++ upstart-0.6.5/conf/start-ttys.conf 2010-03-24 15:27:21.000000000 +0100
@@ -0,0 +1,18 @@
+#
+# This service starts the configured number of gettys.
@@ -139,7 +124,7 @@
Index: upstart-0.6.5/conf/tty.conf
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ upstart-0.6.5/conf/tty.conf 2010-03-06 13:21:06.000000000 +0100
++++ upstart-0.6.5/conf/tty.conf 2010-03-24 15:27:21.000000000 +0100
@@ -0,0 +1,9 @@
+# tty - getty
+#
@@ -152,28 +137,26 @@
+exec /sbin/mingetty $OPTS $TTY
Index: upstart-0.6.5/conf/Makefile.am
===================================================================
---- upstart-0.6.5.orig/conf/Makefile.am 2010-03-11 18:10:09.000000000 +0100
-+++ upstart-0.6.5/conf/Makefile.am 2010-03-12 11:52:58.000000000 +0100
-@@ -5,4 +5,8 @@ dist_init_DATA = \
+--- upstart-0.6.5.orig/conf/Makefile.am 2009-10-23 22:47:27.000000000 +0200
++++ upstart-0.6.5/conf/Makefile.am 2010-03-24 15:29:31.000000000 +0100
+@@ -5,4 +5,7 @@ dist_init_DATA = \
rc-sysinit.conf \
rc.conf \
rcS.conf \
- control-alt-delete.conf
-+ rcS-sulogin.conf \
+ control-alt-delete.conf \
+ reload-init.conf \
+ start-ttys.conf \
+ tty.conf
Index: upstart-0.6.5/conf/Makefile.in
===================================================================
---- upstart-0.6.5.orig/conf/Makefile.in 2010-03-11 18:10:09.000000000 +0100
-+++ upstart-0.6.5/conf/Makefile.in 2010-03-12 11:53:04.000000000 +0100
-@@ -269,7 +269,12 @@ dist_init_DATA = \
+--- upstart-0.6.5.orig/conf/Makefile.in 2010-02-04 03:18:13.000000000 +0100
++++ upstart-0.6.5/conf/Makefile.in 2010-03-24 15:29:39.000000000 +0100
+@@ -269,7 +269,11 @@ dist_init_DATA = \
rc-sysinit.conf \
rc.conf \
rcS.conf \
- control-alt-delete.conf
-+ rcS-sulogin.conf \
+ control-alt-delete.conf \
+ reload-init.conf \
+ start-ttys.conf \
@@ -182,36 +165,10 @@
all: all-am
-Index: upstart-0.6.5/conf/rcS-sulogin.conf
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ upstart-0.6.5/conf/rcS-sulogin.conf 2010-03-06 13:21:06.000000000 +0100
-@@ -0,0 +1,21 @@
-+# rcS-sulogin - "single-user" runlevel compatibility
-+#
-+# This task runs /bin/bash during "single-user" mode,
-+# then continues to the default runlevel.
-+
-+start on runlevel S
-+
-+stop on runlevel [!S]
-+
-+console owner
-+script
-+ exec /bin/bash
-+end script
-+post-stop script
-+ if [ "$RUNLEVEL" = "S" ]; then
-+ runlevel=$(/bin/awk -F ':' '$3 == "initdefault" && $1 !~ "^#" { print $2 }' /etc/inittab)
-+ [ -z "$runlevel" ] && runlevel="3"
-+ exec telinit $runlevel
-+ fi
-+end script
-+
Index: upstart-0.6.5/conf/rc-sysinit.conf
===================================================================
--- upstart-0.6.5.orig/conf/rc-sysinit.conf 2010-02-04 04:58:39.000000000 +0100
-+++ upstart-0.6.5/conf/rc-sysinit.conf 2010-03-12 12:11:32.000000000 +0100
++++ upstart-0.6.5/conf/rc-sysinit.conf 2010-03-24 15:27:21.000000000 +0100
@@ -25,6 +25,10 @@ task
console owner
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org