Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arjan Bouter (d72384647f16776797fd6e711c9c90478d283a78)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arjan Bouter <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arjan Bouter (d72384647f16776797fd6e711c9c90478d283a78)
  • Date: Tue, 8 Sep 2009 06:03:48 -0500

GIT changes to master grimoire by Arjan Bouter <abouter AT sourcemage.org>:

ChangeLog |
3
display/qingy/HISTORY |
3
display/qingy/PROVIDES |
1
smgl/basesystem/DEPENDS |
3
smgl/basesystem/HISTORY |
4 +
smgl/init.d/HISTORY |
3
smgl/init.d/PROVIDES |
1
smgl/initng-ifiles/HISTORY |
3
smgl/initng-ifiles/PROVIDES |
1
smgl/simpleinit-msb/CONFLICTS |
2
smgl/simpleinit-msb/HISTORY |
4 +
smgl/simpleinit-msb/PROVIDES |
1
smgl/smgl-upstart/BUILD |
1
smgl/smgl-upstart/CONFIGURE |
4 +
smgl/smgl-upstart/DEPENDS |
2
smgl/smgl-upstart/DETAILS |
13 +++
smgl/smgl-upstart/HISTORY |
5 +
smgl/smgl-upstart/INSTALL |
4 +
smgl/smgl-upstart/PREPARE |
7 ++
smgl/smgl-upstart/PRE_BUILD |
1
smgl/smgl-upstart/PROVIDES |
1
smgl/smgl-upstart/inittab.native |
17 +++++
smgl/smgl-upstart/inittab.sysvcompat |
17 +++++
smgl/smgl-upstart/upstart-init/native/README |
27 +++++++
smgl/smgl-upstart/upstart-init/native/alsa.conf |
26 +++++++
smgl/smgl-upstart/upstart-init/native/avahi.conf |
11 +++
smgl/smgl-upstart/upstart-init/native/clamav.conf |
13 +++
smgl/smgl-upstart/upstart-init/native/control-alt-delete.conf |
12 +++
smgl/smgl-upstart/upstart-init/native/dbus.conf |
22 ++++++
smgl/smgl-upstart/upstart-init/native/devices.conf |
32 +++++++++
smgl/smgl-upstart/upstart-init/native/freshclam.conf |
11 +++
smgl/smgl-upstart/upstart-init/native/gdm.conf |
11 +++
smgl/smgl-upstart/upstart-init/native/hald.conf |
11 +++
smgl/smgl-upstart/upstart-init/native/hostname.conf |
13 +++
smgl/smgl-upstart/upstart-init/native/lighttpd.conf |
11 +++
smgl/smgl-upstart/upstart-init/native/lvm.conf |
19 +++++
smgl/smgl-upstart/upstart-init/native/mount_all.conf |
15 ++++
smgl/smgl-upstart/upstart-init/native/mount_root.conf |
25 +++++++
smgl/smgl-upstart/upstart-init/native/mpd.conf |
16 ++++
smgl/smgl-upstart/upstart-init/native/network.conf |
23 ++++++
smgl/smgl-upstart/upstart-init/native/rc.conf |
18 +++++
smgl/smgl-upstart/upstart-init/native/scripts/lvm.sh |
4 +
smgl/smgl-upstart/upstart-init/native/shorewall.conf |
34 ++++++++++
smgl/smgl-upstart/upstart-init/native/shutdown.conf |
22 ++++++
smgl/smgl-upstart/upstart-init/native/slapd.conf |
14 ++++
smgl/smgl-upstart/upstart-init/native/sulogin.conf |
18 +++++
smgl/smgl-upstart/upstart-init/native/syslog.conf |
19 +++++
smgl/smgl-upstart/upstart-init/native/tty1.conf |
14 ++++
smgl/smgl-upstart/upstart-init/native/tty2.conf |
14 ++++
smgl/smgl-upstart/upstart-init/native/tty3.conf |
14 ++++
smgl/smgl-upstart/upstart-init/native/xinetd.conf |
11 +++
smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/control-alt-delete |
8 ++
smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/rc-default |
23 ++++++
smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/rc0 |
25 +++++++
smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/rc1 |
19 +++++
smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/rc2 |
20 +++++
smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/rc3 |
20 +++++
smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/rc4 |
20 +++++
smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/rc5 |
20 +++++
smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/rc6 |
23 ++++++
smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/rcS |
24 +++++++
smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/rcS-sulogin |
25 +++++++
smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/sulogin |
18 +++++
smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/tty1 |
16 ++++
smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/tty2 |
16 ++++
smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/tty3 |
16 ++++
smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/tty4 |
16 ++++
smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/tty5 |
16 ++++
smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/tty6 |
16 ++++
smgl/upstart/BUILD |
5 -
smgl/upstart/CONFLICTS |
2
smgl/upstart/DEPENDS |
3
smgl/upstart/DETAILS |
2
smgl/upstart/HISTORY |
6 +
smgl/upstart/PROVIDES |
1
smgl/upstart/WIP |
4 -
utils/fbgetty/HISTORY |
3
utils/fbgetty/PROVIDES |
1
utils/util-linux/HISTORY |
3
utils/util-linux/PROVIDES |
1
80 files changed, 941 insertions(+), 12 deletions(-)

New commits:
commit c5d198fbec2c1a0c26e273bdd0b9d572197bca5d
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

basesystem: allow other init systems and their scripts

commit 1054cf9c6e753c120e618594bc06f81efb6af04b
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

fbgetty: provide GETTY

commit 34173241174317ac651fdabd1fde76c3b5f3620e
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

initng-ifiles: almost there

commit 36c5f9a4cf2f3b8bcd4aeb070148f873474d83e5
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

qingy: add missing file, it's not my day...

commit 92e762bdbf315f45643feecf88a8a2af69a6510f
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

simpleinit-msb: add files...

commit 189e6da05c8bff7d14d77542daa886a73f6fb30e
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

init.d: provide INITSCRIPTS

commit e94c30258ff05f5c561ab3f2337ffb43e84351f0
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

initng-ifiles: provides INITSCRIPTS

commit b78b2eaf440d6fe50b1ec31730dcc097906473e4
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

qingy: provide GETTY

commit 4468ab79f6ee3f5113317c9e2422bdaf543cffef
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

simpleinit-msb: provides INIT and conflicts with the other init systems

commit 5c449f46d27cf881bc1f293e03d26332c443b95b
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

util-linux: provide GETTY

commit 8be74979e6d427feba57793536b814f5e20f1f9a
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

upstart: upstart kind of works for me, removing WIP file and edited
spell to replace/provide INIT

commit 7256c73d1c147e44fde6a1e5671b1117c7966bca
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

smgl-upstart: new spell, upstart init scripts

diff --git a/ChangeLog b/ChangeLog
index 160ea3f..4c16eb8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2009-09-08 Arjan Bouter <abouter AT sourcemage.org>
+ * smgl/smgl-upstart: new spell, upstart init scripts
+
2009-09-07 Arjan Bouter <abouter AT sourcemage.org>
* devel/ftrace: new spell

diff --git a/display/qingy/HISTORY b/display/qingy/HISTORY
index 0974833..5f33543 100644
--- a/display/qingy/HISTORY
+++ b/display/qingy/HISTORY
@@ -1,3 +1,6 @@
+2009-09-07 Arjan Bouter <abouter AT sourcemage.org>
+ * PROVIDES: added, provides GETTY
+
2008-11-26 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DEPENDS: remove check_if_xorg_modular* reference #14708

diff --git a/display/qingy/PROVIDES b/display/qingy/PROVIDES
new file mode 100755
index 0000000..7503d84
--- /dev/null
+++ b/display/qingy/PROVIDES
@@ -0,0 +1 @@
+GETTY
diff --git a/smgl/basesystem/DEPENDS b/smgl/basesystem/DEPENDS
index 6d4c959..a89e995 100755
--- a/smgl/basesystem/DEPENDS
+++ b/smgl/basesystem/DEPENDS
@@ -15,7 +15,7 @@ depends grep &&
depends gzip &&
depends iana-etc &&
depends ifupdown &&
-depends init.d &&
+depends INITSCRIPTS &&
depends installwatch &&
depends locale &&
depends make &&
@@ -34,7 +34,6 @@ depends procps &&
depends readline &&
depends sed &&
depends shadow &&
-depends simpleinit-msb &&
depends smgl-archspecs &&
depends smgl-fhs &&
depends tar &&
diff --git a/smgl/basesystem/HISTORY b/smgl/basesystem/HISTORY
index 275e421..f27cc6e 100644
--- a/smgl/basesystem/HISTORY
+++ b/smgl/basesystem/HISTORY
@@ -1,3 +1,7 @@
+2009-09-07 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: removed dependency on INIT and changed the dep on init.d
to INITSCRIPTS.
+ to make sure you do not install upstart with init.d scripts
accidently
+
2009-05-23 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Added a suggested dependency on lsb-release

diff --git a/smgl/init.d/HISTORY b/smgl/init.d/HISTORY
index ad5bcc1..be0471b 100644
--- a/smgl/init.d/HISTORY
+++ b/smgl/init.d/HISTORY
@@ -1,3 +1,6 @@
+2009-09-08 Arjan Bouter <abouter AT sourcemage.org>
+ * PROVIDES: added, provide INITSCRIPTS
+
2009-05-02 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* init.d/devices: made it non-sh, bug #13702
* init.d/mountall.sh: made it non-sh, bug #13702
diff --git a/smgl/init.d/PROVIDES b/smgl/init.d/PROVIDES
new file mode 100755
index 0000000..a0b8af0
--- /dev/null
+++ b/smgl/init.d/PROVIDES
@@ -0,0 +1 @@
+INITSCRIPTS
diff --git a/smgl/initng-ifiles/HISTORY b/smgl/initng-ifiles/HISTORY
index a9db4d6..7f4ccdd 100644
--- a/smgl/initng-ifiles/HISTORY
+++ b/smgl/initng-ifiles/HISTORY
@@ -1,3 +1,6 @@
+2009-09-07 Arjan Bouter <abouter AT sourcemage.org>
+ * PROVIDES: provides INITSCRIPTS
+
2007-12-05 Elisamuel Resto <ryuji AT sourcemage.org>
* BUILD: use cmake_build from FUNCTIONS

diff --git a/smgl/initng-ifiles/PROVIDES b/smgl/initng-ifiles/PROVIDES
new file mode 100755
index 0000000..a0b8af0
--- /dev/null
+++ b/smgl/initng-ifiles/PROVIDES
@@ -0,0 +1 @@
+INITSCRIPTS
diff --git a/smgl/simpleinit-msb/CONFLICTS b/smgl/simpleinit-msb/CONFLICTS
new file mode 100755
index 0000000..082e2e4
--- /dev/null
+++ b/smgl/simpleinit-msb/CONFLICTS
@@ -0,0 +1,2 @@
+conflicts upstart &&
+conflicts initng
diff --git a/smgl/simpleinit-msb/HISTORY b/smgl/simpleinit-msb/HISTORY
index 796095e..1fa51f5 100644
--- a/smgl/simpleinit-msb/HISTORY
+++ b/smgl/simpleinit-msb/HISTORY
@@ -1,3 +1,7 @@
+2009-09-07 Arjan Bouter <abouter AT sourcemage.org>
+ * PROVIDES: added, provides INIT
+ * CONFLICTS: conflicts with other init systems
+
2009-01-27 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* CONFIGURE: static breaks on x86_64 when booting

diff --git a/smgl/simpleinit-msb/PROVIDES b/smgl/simpleinit-msb/PROVIDES
new file mode 100755
index 0000000..d0e366a
--- /dev/null
+++ b/smgl/simpleinit-msb/PROVIDES
@@ -0,0 +1 @@
+INIT
diff --git a/smgl/smgl-upstart/BUILD b/smgl/smgl-upstart/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/smgl/smgl-upstart/BUILD
@@ -0,0 +1 @@
+true
diff --git a/smgl/smgl-upstart/CONFIGURE b/smgl/smgl-upstart/CONFIGURE
new file mode 100755
index 0000000..9b0c7d3
--- /dev/null
+++ b/smgl/smgl-upstart/CONFIGURE
@@ -0,0 +1,4 @@
+message "sysvcompat, copied from ubuntu is currently broken on SMGL" &&
+message "native is created from scratch for Source Mage GNU/Linux" &&
+message "so use native unless you feel like fixing sysvcompat" &&
+config_query_list UPSTART_INIT "Choose upstart init-mode mode:" native
sysvcompat
diff --git a/smgl/smgl-upstart/DEPENDS b/smgl/smgl-upstart/DEPENDS
new file mode 100755
index 0000000..41a516f
--- /dev/null
+++ b/smgl/smgl-upstart/DEPENDS
@@ -0,0 +1,2 @@
+depends upstart &&
+depends GETTY
diff --git a/smgl/smgl-upstart/DETAILS b/smgl/smgl-upstart/DETAILS
new file mode 100755
index 0000000..1b65f57
--- /dev/null
+++ b/smgl/smgl-upstart/DETAILS
@@ -0,0 +1,13 @@
+ SPELL=smgl-upstart
+ VERSION=0.1
+ WEB_SITE=http://www.sourcemage.org
+ ENTERED=20090907
+ LICENSE[0]=GPL
+ SHORT="SMGL upstart scripts"
+cat << EOF
+Upstart is a replacement for the /sbin/init daemon which handles starting of
+tasks and services during boot, stopping them during shutdown and
+supervising them while the system is running.
+
+This spell provides a set of native upstart init scripts to boot your box.
+EOF
diff --git a/smgl/smgl-upstart/HISTORY b/smgl/smgl-upstart/HISTORY
new file mode 100644
index 0000000..fe229c4
--- /dev/null
+++ b/smgl/smgl-upstart/HISTORY
@@ -0,0 +1,5 @@
+2009-09-07 Arjan Bouter <abouter AT sourcemage.org>
+ * BUILD,DEPENDS,DETAILS,INSTALL,PRE_BUILD,upstart-init/*: created
spell
+ based on the upstart example scripts.
+ * CONFIGURE: added option to switch from sysv compat to upstart native
+ * PREPARE: added to prevent accidental installation
diff --git a/smgl/smgl-upstart/INSTALL b/smgl/smgl-upstart/INSTALL
new file mode 100755
index 0000000..7db4c4a
--- /dev/null
+++ b/smgl/smgl-upstart/INSTALL
@@ -0,0 +1,4 @@
+UPSTART_DIR="${INSTALL_ROOT}/etc/init" &&
+mkdir -p ${UPSTART_DIR} &&
+cp ${SCRIPT_DIRECTORY}/upstart-init/${UPSTART_INIT}/* ${UPSTART_DIR} &&
+install_config_file ${SCRIPT_DIRECTORY}/inittab.${UPSTART_INIT}
${INSTALL_ROOT}/etc/inittab
diff --git a/smgl/smgl-upstart/PREPARE b/smgl/smgl-upstart/PREPARE
new file mode 100755
index 0000000..c946056
--- /dev/null
+++ b/smgl/smgl-upstart/PREPARE
@@ -0,0 +1,7 @@
+message 'SMGL upstart is currently under construction.' &&
+message 'It will probably delete all your files, render your box unbootable
and' &&
+message 'embarrass you in front of your friends.' &&
+config_query UPSTART_WARNING 'Are you sure you want to install it?' n &&
+if [[ "$UPSTART_WARNING" = 'n' ]]; then
+ return 1
+fi
diff --git a/smgl/smgl-upstart/PRE_BUILD b/smgl/smgl-upstart/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/smgl/smgl-upstart/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/smgl/smgl-upstart/PROVIDES b/smgl/smgl-upstart/PROVIDES
new file mode 100755
index 0000000..a0b8af0
--- /dev/null
+++ b/smgl/smgl-upstart/PROVIDES
@@ -0,0 +1 @@
+INITSCRIPTS
diff --git a/smgl/smgl-upstart/inittab.native
b/smgl/smgl-upstart/inittab.native
new file mode 100644
index 0000000..ef2b240
--- /dev/null
+++ b/smgl/smgl-upstart/inittab.native
@@ -0,0 +1,17 @@
+bootprog = rc
+# change this to switch to your own upstart init-scripts
+fileprefix = /etc/init
+PATH = /sbin:/bin:/usr/sbin:/usr/bin
+INIT_PATH = smgl
+
+tty1:linux:/sbin/agetty /dev/tty1 9600
+tty2:linux:/sbin/agetty /dev/tty2 9600
+tty3:linux:/sbin/agetty /dev/tty3 9600
+tty4:linux:/sbin/agetty /dev/tty4 9600
+tty5:linux:/sbin/agetty /dev/tty5 9600
+tty6:linux:/sbin/agetty /dev/tty6 9600
+
+finalprog =
+quietrollback = yes
+#ctrlaltdel = /bin/sh -c "PATH=$INIT_ROOT:$PATH; echo $'\\a\\nAuf
Wiedersehen!\\n' ; initctl -u -r -f"
+ctrlaltdel =/sbin/shutdown -r now
diff --git a/smgl/smgl-upstart/inittab.sysvcompat
b/smgl/smgl-upstart/inittab.sysvcompat
new file mode 100644
index 0000000..23b5324
--- /dev/null
+++ b/smgl/smgl-upstart/inittab.sysvcompat
@@ -0,0 +1,17 @@
+bootprog = rc
+# change this to switch to your own upstart init-scripts
+fileprefix = /etc/init
+PATH = /sbin:/bin:/usr/sbin:/usr/bin
+INIT_PATH = sysvcompat
+
+tty1:linux:/sbin/agetty /dev/tty1 9600
+tty2:linux:/sbin/agetty /dev/tty2 9600
+tty3:linux:/sbin/agetty /dev/tty3 9600
+tty4:linux:/sbin/agetty /dev/tty4 9600
+tty5:linux:/sbin/agetty /dev/tty5 9600
+tty6:linux:/sbin/agetty /dev/tty6 9600
+
+finalprog =
+quietrollback = yes
+#ctrlaltdel = /bin/sh -c "PATH=$INIT_ROOT:$PATH; echo $'\\a\\nAuf
Wiedersehen!\\n' ; initctl -u -r -f"
+ctrlaltdel =/sbin/shutdown -r now
diff --git a/smgl/smgl-upstart/upstart-init/native/README
b/smgl/smgl-upstart/upstart-init/native/README
new file mode 100644
index 0000000..e35c15d
--- /dev/null
+++ b/smgl/smgl-upstart/upstart-init/native/README
@@ -0,0 +1,27 @@
+Some useful things to know about upstart on smgl
+
+- The jobs upstart knows about are in the *.conf files, one file per
service/daemon/task/job
+- The jobs MAY NOT FAIL, or the entire boot process is halted...
+- use a script in the scripts dir and a job pointing to it when a job can
fail and make sure the script exits cleanly
+- daemons shouldn't disassociate themselves from the invoking tty if upstart
it to track them
+
+feel free to post bugs with additional jobs on http://bugs.sourcemage.org
and assign them to abouter AT sourcemage.org
+I'll get to them eventually, or just put them in the spell yourself if you
have git access ;)
+
+starting and stopping jobs in upstart:
+
+ start <jobname>
+
+or
+
+ stop <jobname>
+
+where <jobname> is the jobs name in /etc/init without the .conf part.
+
+for example, to start lighty:
+
+ start lighttpd
+
+a list of jobs and there status:
+
+ initctl list
diff --git a/smgl/smgl-upstart/upstart-init/native/alsa.conf
b/smgl/smgl-upstart/upstart-init/native/alsa.conf
new file mode 100644
index 0000000..e044a98
--- /dev/null
+++ b/smgl/smgl-upstart/upstart-init/native/alsa.conf
@@ -0,0 +1,26 @@
+# alsa
+#
+# restores alsa settings
+
+description "Restore alsa settings"
+author "Arjan Bouter <abouter AT sourcemage.org>"
+
+start on started mount_all
+stop on shutdown
+
+emits alsa-start alsa-stop
+
+task
+
+script
+ . /etc/sysconfig/alsa
+ declare -r ASOUNDCFG=/etc/asound.state
+ [[ "$START_ALSA" == no ]] && exit 0
+ if [[ -d /proc/asound ]]; then
+ if ! [[ -r "$ASOUNDCFG" ]]; then
+ echo "No mixer config in $ASOUNDCFG, you have to unmute your card!"
+ else
+ /usr/sbin/alsactl -f $ASOUNDCFG restore
+ fi
+ fi
+end script
diff --git a/smgl/smgl-upstart/upstart-init/native/avahi.conf
b/smgl/smgl-upstart/upstart-init/native/avahi.conf
new file mode 100644
index 0000000..bdbd9ce
--- /dev/null
+++ b/smgl/smgl-upstart/upstart-init/native/avahi.conf
@@ -0,0 +1,11 @@
+# avahi
+#
+# starts avahi-daemon
+
+description "Enable avahi-daemon"
+author "Arjan Bouter <abouter AT sourcemage.org>"
+
+start on started syslog and network-up
+stop on shutdown
+
+exec /usr/sbin/avahi-daemon -s
diff --git a/smgl/smgl-upstart/upstart-init/native/clamav.conf
b/smgl/smgl-upstart/upstart-init/native/clamav.conf
new file mode 100644
index 0000000..fe8f580
--- /dev/null
+++ b/smgl/smgl-upstart/upstart-init/native/clamav.conf
@@ -0,0 +1,13 @@
+# clamav
+#
+# starts clamd
+
+description "Start ClamAV"
+author "Arjan Bouter <abouter AT sourcemage.org>"
+
+emits clamav-started clamav-stopped
+
+start on network-up and started syslog
+stop on shutdown
+
+exec /usr/sbin/clamd
diff --git a/smgl/smgl-upstart/upstart-init/native/control-alt-delete.conf
b/smgl/smgl-upstart/upstart-init/native/control-alt-delete.conf
new file mode 100644
index 0000000..590528d
--- /dev/null
+++ b/smgl/smgl-upstart/upstart-init/native/control-alt-delete.conf
@@ -0,0 +1,12 @@
+# control-alt-delete - emergency keypress handling
+#
+# This task is run whenever the Control-Alt-Delete key combination is
+# pressed, and performs a safe reboot of the machine.
+
+description "emergency keypress handling"
+author "Scott James Remnant <scott AT netsplit.com>"
+
+start on control-alt-delete
+
+task
+exec shutdown -r now "Control-Alt-Delete pressed"
diff --git a/smgl/smgl-upstart/upstart-init/native/dbus.conf
b/smgl/smgl-upstart/upstart-init/native/dbus.conf
new file mode 100644
index 0000000..4001878
--- /dev/null
+++ b/smgl/smgl-upstart/upstart-init/native/dbus.conf
@@ -0,0 +1,22 @@
+# dbus
+#
+# scans starts dbus
+
+description "Start a dbus daemon"
+author "Arjan Bouter <abouter AT sourcemage.org>"
+
+emits dbus-start dbus-stop
+
+#start on started devices
+start on started mount_all
+stop on shutdown
+
+pre-start script
+ mkdir -p /var/run/dbus
+end script
+
+script
+# [[ -e /var/run/dbus/pid ]] && rm /var/run/dbus/*
+ dbus-daemon --system --nofork
+ dbus-uuidgen --ensure
+end script
diff --git a/smgl/smgl-upstart/upstart-init/native/devices.conf
b/smgl/smgl-upstart/upstart-init/native/devices.conf
new file mode 100644
index 0000000..a045dd8
--- /dev/null
+++ b/smgl/smgl-upstart/upstart-init/native/devices.conf
@@ -0,0 +1,32 @@
+# devices
+#
+# populates /dev with devices and does some housekeeping when using udev,
+# does nothing at all when using static /dev
+
+description "Populates /dev"
+author "Arjan Bouter <abouter AT sourcemage.org>"
+
+#start on started mount_root
+stop on shutdown
+
+task
+
+script
+ . /etc/sysconfig/devices
+ case $DEVICES in
+ udev) mount -t tmpfs dev /dev
+ ln -s /proc/self/fd /dev/fd
+ ln -s /dev/fd/0 /dev/stdin
+ ln -s /dev/fd/1 /dev/stdout
+ ln -s /dev/fd/2 /dev/stderr
+ mkdir -p /dev/shm
+ mount -t tmpfs shm /dev/shm
+ mkdir -p /dev/pts
+ mount -t devpts devpts /dev/pts
+ udevd --daemon
+ udevadm trigger
+ udevadm settle ;;
+ static) echo "static /dev nothing to do" ;;
+ *) echo "unsupported /dev system, aborting" ;;
+ esac
+end script
diff --git a/smgl/smgl-upstart/upstart-init/native/freshclam.conf
b/smgl/smgl-upstart/upstart-init/native/freshclam.conf
new file mode 100644
index 0000000..caf8cba
--- /dev/null
+++ b/smgl/smgl-upstart/upstart-init/native/freshclam.conf
@@ -0,0 +1,11 @@
+# freshclam
+#
+# starts freshclam
+
+description "Start Freshclam, the Clamav updater"
+author "Arjan Bouter <abouter AT sourcemage.org>"
+
+start on network-up and started syslog
+stop on shutdown
+
+exec /usr/bin/freshclam -d
diff --git a/smgl/smgl-upstart/upstart-init/native/gdm.conf
b/smgl/smgl-upstart/upstart-init/native/gdm.conf
new file mode 100644
index 0000000..76d04b2
--- /dev/null
+++ b/smgl/smgl-upstart/upstart-init/native/gdm.conf
@@ -0,0 +1,11 @@
+# gdm
+#
+# starts the GDM login manager
+
+description "Start GDM"
+author "Arjan Bouter <abouter AT sourcemage.org>"
+
+start on started hald
+stop on shutdown
+
+exec /usr/sbin/gdm
diff --git a/smgl/smgl-upstart/upstart-init/native/hald.conf
b/smgl/smgl-upstart/upstart-init/native/hald.conf
new file mode 100644
index 0000000..6fcdca3
--- /dev/null
+++ b/smgl/smgl-upstart/upstart-init/native/hald.conf
@@ -0,0 +1,11 @@
+# hald
+#
+# starts a hald daemon
+
+description "Start a hald demon"
+author "Arjan Bouter <abouter AT sourcemage.org>"
+
+start on network-up
+stop on shutdown
+
+exec /usr/sbin/hald --daemon=no
diff --git a/smgl/smgl-upstart/upstart-init/native/hostname.conf
b/smgl/smgl-upstart/upstart-init/native/hostname.conf
new file mode 100644
index 0000000..d124651
--- /dev/null
+++ b/smgl/smgl-upstart/upstart-init/native/hostname.conf
@@ -0,0 +1,13 @@
+# hostname
+#
+# set the hostname to whatever is in /etc/hostname
+
+description "Sets hostname"
+author "Arjan Bouter <abouter AT sourcemage.org>"
+
+start on started devices
+stop on shutdown
+
+task
+
+exec hostname --file /etc/hostname
diff --git a/smgl/smgl-upstart/upstart-init/native/lighttpd.conf
b/smgl/smgl-upstart/upstart-init/native/lighttpd.conf
new file mode 100644
index 0000000..bc664c3
--- /dev/null
+++ b/smgl/smgl-upstart/upstart-init/native/lighttpd.conf
@@ -0,0 +1,11 @@
+# lighttpd
+#
+# starts lighttpd
+
+description "Start lighttpd"
+author "Arjan Bouter <abouter AT sourcemage.org>"
+
+start on network-up and started syslog
+stop on shutdown
+
+exec /usr/sbin/lighttpd -D -f /etc/lighttpd.conf
diff --git a/smgl/smgl-upstart/upstart-init/native/lvm.conf
b/smgl/smgl-upstart/upstart-init/native/lvm.conf
new file mode 100644
index 0000000..2e8776c
--- /dev/null
+++ b/smgl/smgl-upstart/upstart-init/native/lvm.conf
@@ -0,0 +1,19 @@
+# lvm
+#
+# scans and activates any LVM partitions
+
+description "Find and enable LVM"
+author "Arjan Bouter <abouter AT sourcemage.org>"
+
+#start on started devices
+stop on shutdown
+
+emits lvm-start lvm-stop
+
+task
+console output
+
+script
+ vgscan
+ vgchange -ay
+end script
diff --git a/smgl/smgl-upstart/upstart-init/native/mount_all.conf
b/smgl/smgl-upstart/upstart-init/native/mount_all.conf
new file mode 100644
index 0000000..fa1d12a
--- /dev/null
+++ b/smgl/smgl-upstart/upstart-init/native/mount_all.conf
@@ -0,0 +1,15 @@
+# mountall
+#
+# mounts everything in /etc/fstab
+
+description "Mount filesystems from /etc/fstab"
+author "Arjan Bouter <abouter AT sourcemage.org>"
+
+#start on started devices
+#start on started lvm
+stop on shutdown
+
+emits filesystems-mounted
+task
+
+exec mount -a
diff --git a/smgl/smgl-upstart/upstart-init/native/mount_root.conf
b/smgl/smgl-upstart/upstart-init/native/mount_root.conf
new file mode 100644
index 0000000..b5dd89e
--- /dev/null
+++ b/smgl/smgl-upstart/upstart-init/native/mount_root.conf
@@ -0,0 +1,25 @@
+# mount_root
+#
+# mount root filesystem and pseudo filesystems
+
+description "Mounts rootfs and various pseudo filesystems"
+author "Arjan Bouter <abouter AT sourcemage.org>"
+
+#start on startup
+stop on shutdown
+
+emits rootfs-mounted rootfs-unmounted
+
+task
+console output
+
+script
+ mount -o remount,rw /
+ #cleaning up a bit
+ rm /etc/mtab
+ mount -t proc proc /proc
+ mount -t sysfs sysfs /sys
+ mount -t tmpfs lock /var/lock
+ mount -t tmpfs run /var/run
+ mount -t tmpfs tmp /tmp
+end script
diff --git a/smgl/smgl-upstart/upstart-init/native/mpd.conf
b/smgl/smgl-upstart/upstart-init/native/mpd.conf
new file mode 100644
index 0000000..879834c
--- /dev/null
+++ b/smgl/smgl-upstart/upstart-init/native/mpd.conf
@@ -0,0 +1,16 @@
+# mpd
+#
+# starts mpd
+
+description "Start Music Player Daemon"
+author "Arjan Bouter <abouter AT sourcemage.org>"
+
+start on network-up and started alsa and started syslog
+stop on shutdown
+
+script
+ MPD_DB="$(grep db_file /etc/sysconfig/mpd | cut -d \" -f 2)"
+ ARGS="--no-daemon /etc/sysconfig/mpd"
+ [[ -z $MPD_DB ]] && ARGS="--create-db $ARGS"
+ /usr/bin/mpd $ARGS
+end script
diff --git a/smgl/smgl-upstart/upstart-init/native/network.conf
b/smgl/smgl-upstart/upstart-init/native/network.conf
new file mode 100644
index 0000000..2397533
--- /dev/null
+++ b/smgl/smgl-upstart/upstart-init/native/network.conf
@@ -0,0 +1,23 @@
+# network
+#
+# starts networking
+
+description "Start networking"
+author "Arjan Bouter <abouter AT sourcemage.org>"
+
+start on started dbus
+stop on shutdown
+
+emits network-up network-down
+
+console output
+
+script
+ ifconfig lo 127.0.0.1
+ . /etc/sysconfig/facilities
+ case $network in
+ wicd) /usr/sbin/wicd ;;
+ network) ifup -a ;;
+ *) echo "unknown network provider, aborting" ;;
+ esac
+end script
diff --git a/smgl/smgl-upstart/upstart-init/native/rc.conf
b/smgl/smgl-upstart/upstart-init/native/rc.conf
new file mode 100644
index 0000000..46f295b
--- /dev/null
+++ b/smgl/smgl-upstart/upstart-init/native/rc.conf
@@ -0,0 +1,18 @@
+# rc
+#
+# starts essential jobs
+
+description "Start essential jobs"
+author "Arjan Bouter <abouter AT sourcemage.org>"
+
+start on startup
+stop on shutdown
+
+task
+
+script
+ start mount_root
+ start devices
+ start lvm
+ start mount_all
+end script
diff --git a/smgl/smgl-upstart/upstart-init/native/scripts/lvm.sh
b/smgl/smgl-upstart/upstart-init/native/scripts/lvm.sh
new file mode 100755
index 0000000..8df7081
--- /dev/null
+++ b/smgl/smgl-upstart/upstart-init/native/scripts/lvm.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+vgscan
+vgchange -ay
diff --git a/smgl/smgl-upstart/upstart-init/native/shorewall.conf
b/smgl/smgl-upstart/upstart-init/native/shorewall.conf
new file mode 100644
index 0000000..f87a9ae
--- /dev/null
+++ b/smgl/smgl-upstart/upstart-init/native/shorewall.conf
@@ -0,0 +1,34 @@
+# shorewall
+#
+# starts shorewall
+
+description "Start shorewall"
+author "Arjan Bouter <abouter AT sourcemage.org>"
+
+start on network-up
+stop on shutdown
+
+task
+console output
+
+script
+ . /etc/sysconfig/shorewall
+
+ # Shorewall needs /var/log/messages to exist
+ if [[ ! -f /var/log/messages ]]
+ then
+ touch /var/log/messages
+ fi &&
+ # Create shorewall log file if it doesn't exist
+ if [[ ! -f $SHOREWALL_LOG ]]
+ then
+ touch $SHOREWALL_LOG
+ fi &&
+ # Shorewall needs subsys
+ if [[ ! -d /var/lock/subsys/ ]]
+ then
+ mkdir -p /var/lock/subsys/
+ fi &&
+ date "$DATE_FORMAT" >> $SHOREWALL_LOG 2>&1
+ shorewall start >> $SHOREWALL_LOG 2>&1
+end script
diff --git a/smgl/smgl-upstart/upstart-init/native/shutdown.conf
b/smgl/smgl-upstart/upstart-init/native/shutdown.conf
new file mode 100644
index 0000000..b418a86
--- /dev/null
+++ b/smgl/smgl-upstart/upstart-init/native/shutdown.conf
@@ -0,0 +1,22 @@
+# shutdown
+#
+# crude hack to poweroff
+
+description "Shutdown"
+author "Arjan Bouter <abouter AT sourcemage.org>"
+
+start on shutdown
+stop on startup
+
+task
+console output
+
+script
+ for running_job in $(initctl list|grep running|awk -F' ' '{print $1}'); do
+ stop $running_job
+ done
+ umount -a
+ sync
+ echo "powering off"
+ poweroff -f
+end script
diff --git a/smgl/smgl-upstart/upstart-init/native/slapd.conf
b/smgl/smgl-upstart/upstart-init/native/slapd.conf
new file mode 100644
index 0000000..fadb04a
--- /dev/null
+++ b/smgl/smgl-upstart/upstart-init/native/slapd.conf
@@ -0,0 +1,14 @@
+# slapd
+#
+# starts slapd
+
+description "Start OpenLDAP slapd"
+author "Arjan Bouter <abouter AT sourcemage.org>"
+
+start on network-up and started syslog
+stop on shutdown
+
+script
+ . /etc/sysconfig/slapd
+ slapd -d -h $SLAPD_URL
+end script
diff --git a/smgl/smgl-upstart/upstart-init/native/sulogin.conf
b/smgl/smgl-upstart/upstart-init/native/sulogin.conf
new file mode 100644
index 0000000..03823a1
--- /dev/null
+++ b/smgl/smgl-upstart/upstart-init/native/sulogin.conf
@@ -0,0 +1,18 @@
+# sulogin - rescue mode
+#
+# This task ensures that should the system fail to have any active jobs
+# that the system administrator can rescue it; by giving them a shell.
+
+start on stalled
+
+exec /sbin/sulogin
+console owner
+
+pre-start script
+ echo
+ echo "The system has reached a state where there are no jobs running."
+ echo "A shell will be spawned so that you may start such jobs that
are"
+ echo "necessary."
+ echo
+ echo "Type 'exit' when finished."
+end script
diff --git a/smgl/smgl-upstart/upstart-init/native/syslog.conf
b/smgl/smgl-upstart/upstart-init/native/syslog.conf
new file mode 100644
index 0000000..6defcf9
--- /dev/null
+++ b/smgl/smgl-upstart/upstart-init/native/syslog.conf
@@ -0,0 +1,19 @@
+# syslog
+#
+# starts a syslog daemon
+
+description "Start and enable a syslog daemon"
+author "Arjan Bouter <abouter AT sourcemage.org>"
+
+start on started mount_all
+stop on shutdown
+
+emits syslog-start syslog-stop
+
+script
+ . /etc/sysconfig/facilities
+ case $syslog in
+ smgl-metalog) metalog ;;
+ *) echo "unknown syslog provider, aborting" ;;
+ esac
+end script
diff --git a/smgl/smgl-upstart/upstart-init/native/tty1.conf
b/smgl/smgl-upstart/upstart-init/native/tty1.conf
new file mode 100644
index 0000000..fb0e15a
--- /dev/null
+++ b/smgl/smgl-upstart/upstart-init/native/tty1.conf
@@ -0,0 +1,14 @@
+# tty1 - agetty
+#
+# This service maintains a getty on tty1 from the point the system is
+# started until it is shut down again.
+
+description "start agetty on tty1"
+author "Arjan Bouter <abouter AT sourcemage.org>"
+
+start on started mount_all
+#stop on shutdown
+
+console owner
+respawn
+exec /sbin/agetty /dev/tty1 9600
diff --git a/smgl/smgl-upstart/upstart-init/native/tty2.conf
b/smgl/smgl-upstart/upstart-init/native/tty2.conf
new file mode 100644
index 0000000..b3eddd7
--- /dev/null
+++ b/smgl/smgl-upstart/upstart-init/native/tty2.conf
@@ -0,0 +1,14 @@
+# tty2 - agetty
+#
+# This service maintains a getty on tty2 from the point the system is
+# started until it is shut down again.
+
+description "start agetty on tty2"
+author "Arjan Bouter <abouter AT sourcemage.org>"
+
+start on started avahi and started tty3
+stop on stopped avahi
+
+console owner
+respawn
+exec /sbin/agetty /dev/tty2 9600
diff --git a/smgl/smgl-upstart/upstart-init/native/tty3.conf
b/smgl/smgl-upstart/upstart-init/native/tty3.conf
new file mode 100644
index 0000000..7ec7eab
--- /dev/null
+++ b/smgl/smgl-upstart/upstart-init/native/tty3.conf
@@ -0,0 +1,14 @@
+# tty3 - agetty
+#
+# This service maintains a getty on tty3 from the point the system is
+# started until it is shut down again.
+
+description "start agetty on tty3"
+author "Arjan Bouter <abouter AT sourcemage.org>"
+
+start on network-up
+stop on shutdown
+
+console owner
+respawn
+exec /sbin/agetty /dev/tty3 9600
diff --git a/smgl/smgl-upstart/upstart-init/native/xinetd.conf
b/smgl/smgl-upstart/upstart-init/native/xinetd.conf
new file mode 100644
index 0000000..fef7368
--- /dev/null
+++ b/smgl/smgl-upstart/upstart-init/native/xinetd.conf
@@ -0,0 +1,11 @@
+# xinetd
+#
+# starts xinetd
+
+description "Find and enable LVM"
+author "Arjan Bouter <abouter AT sourcemage.org>"
+
+start on network-up and started syslog
+stop on shutdown
+
+exec /usr/sbin/xinetd -dontfork
diff --git
a/smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/control-alt-delete
b/smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/control-alt-delete
new file mode 100644
index 0000000..35cb130
--- /dev/null
+++ b/smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/control-alt-delete
@@ -0,0 +1,8 @@
+# control-alt-delete - emergency keypress handling
+#
+# This task is run whenever the Control-Alt-Delete key combination is
+# pressed. Usually used to shut down the machine.
+
+start on control-alt-delete
+
+exec /sbin/shutdown -r now "Control-Alt-Delete pressed"
diff --git a/smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/rc-default
b/smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/rc-default
new file mode 100644
index 0000000..191763d
--- /dev/null
+++ b/smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/rc-default
@@ -0,0 +1,23 @@
+# rc - runlevel compatibility
+#
+# This task guesses what the "default runlevel" should be and starts the
+# appropriate script.
+
+start on stopped rcS
+
+script
+ runlevel --reboot || true
+
+ if grep -q -w -- "-s\|single\|S" /proc/cmdline; then
+ telinit S
+ elif [ -r /etc/inittab ]; then
+ RL="$(sed -n -e "/^id:[0-9]*:initdefault:/{s/^id://;s/:.*//;p}"
/etc/inittab || true)"
+ if [ -n "$RL" ]; then
+ telinit $RL
+ else
+ telinit 2
+ fi
+ else
+ telinit 2
+ fi
+end script
diff --git a/smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/rc0
b/smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/rc0
new file mode 100644
index 0000000..bbd56b3
--- /dev/null
+++ b/smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/rc0
@@ -0,0 +1,25 @@
+# rc0 - runlevel 0 compatibility
+#
+# This task runs the old sysv-rc runlevel 0 ("halt/poweroff") scripts with
+# the decision as to whether to halt or power off the system left up to the
+# script (and thus /etc/default/poweroff).
+
+start on runlevel 0
+
+stop on runlevel
+
+console output
+script
+ set $(runlevel || true)
+ if [ "$2" != "0" ] && [ "$2" != "6" ]; then
+ set $(runlevel --set 0 || true)
+ fi
+
+ if [ "$1" != "unknown" ]; then
+ PREVLEVEL=$1
+ RUNLEVEL=$2
+ export PREVLEVEL RUNLEVEL
+ fi
+
+ exec /etc/init/rc 0
+end script
diff --git a/smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/rc1
b/smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/rc1
new file mode 100644
index 0000000..edd3284
--- /dev/null
+++ b/smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/rc1
@@ -0,0 +1,19 @@
+# rc1 - runlevel 1 compatibility
+#
+# This task runs the old sysv-rc runlevel 1 ("single-user") scripts.
+
+start on runlevel 1
+
+stop on runlevel
+
+console output
+script
+ set $(runlevel --set 1 || true)
+ if [ "$1" != "unknown" ]; then
+ PREVLEVEL=$1
+ RUNLEVEL=$2
+ export PREVLEVEL RUNLEVEL
+ fi
+
+ exec /etc/init/rc 1
+end script
diff --git a/smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/rc2
b/smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/rc2
new file mode 100644
index 0000000..0068fe9
--- /dev/null
+++ b/smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/rc2
@@ -0,0 +1,20 @@
+# rc2 - runlevel 2 compatibility
+#
+# This task runs the old sysv-rc runlevel 2 ("multi-user") scripts. It
+# is usually started by the telinit compatibility wrapper.
+
+start on runlevel 2
+
+stop on runlevel
+
+console output
+script
+ set $(runlevel --set 2 || true)
+ if [ "$1" != "unknown" ]; then
+ PREVLEVEL=$1
+ RUNLEVEL=$2
+ export PREVLEVEL RUNLEVEL
+ fi
+
+ exec /etc/init/rc 2
+end script
diff --git a/smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/rc3
b/smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/rc3
new file mode 100644
index 0000000..7b71b3e
--- /dev/null
+++ b/smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/rc3
@@ -0,0 +1,20 @@
+# rc3 - runlevel 3 compatibility
+#
+# This task runs the old sysv-rc runlevel 3 (user defined) scripts. It
+# is usually started by the telinit compatibility wrapper.
+
+start on runlevel 3
+
+stop on runlevel
+
+console output
+script
+ set $(runlevel --set 3 || true)
+ if [ "$1" != "unknown" ]; then
+ PREVLEVEL=$1
+ RUNLEVEL=$2
+ export PREVLEVEL RUNLEVEL
+ fi
+
+ exec /etc/init/rc 3
+end script
diff --git a/smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/rc4
b/smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/rc4
new file mode 100644
index 0000000..6fbe51f
--- /dev/null
+++ b/smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/rc4
@@ -0,0 +1,20 @@
+# rc4 - runlevel 4 compatibility
+#
+# This task runs the old sysv-rc runlevel 4 (user defined) scripts. It
+# is usually started by the telinit compatibility wrapper.
+
+start on runlevel 4
+
+stop on runlevel
+
+console output
+script
+ set $(runlevel --set 4 || true)
+ if [ "$1" != "unknown" ]; then
+ PREVLEVEL=$1
+ RUNLEVEL=$2
+ export PREVLEVEL RUNLEVEL
+ fi
+
+ exec /etc/init/rc 4
+end script
diff --git a/smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/rc5
b/smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/rc5
new file mode 100644
index 0000000..8af5080
--- /dev/null
+++ b/smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/rc5
@@ -0,0 +1,20 @@
+# rc5 - runlevel 5 compatibility
+#
+# This task runs the old sysv-rc runlevel 5 (user defined) scripts. It
+# is usually started by the telinit compatibility wrapper.
+
+start on runlevel 5
+
+stop on runlevel
+
+console output
+script
+ set $(runlevel --set 5 || true)
+ if [ "$1" != "unknown" ]; then
+ PREVLEVEL=$1
+ RUNLEVEL=$2
+ export PREVLEVEL RUNLEVEL
+ fi
+
+ exec /etc/init/rc 5
+end script
diff --git a/smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/rc6
b/smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/rc6
new file mode 100644
index 0000000..c238837
--- /dev/null
+++ b/smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/rc6
@@ -0,0 +1,23 @@
+# rc6 - runlevel 6 compatibility
+#
+# This task runs the old sysv-rc runlevel 6 ("reboot") scripts.
+
+start on runlevel 6
+
+stop on runlevel
+
+console output
+script
+ set $(runlevel || true)
+ if [ "$2" != "0" ] && [ "$2" != "6" ]; then
+ set $(runlevel --set 6 || true)
+ fi
+
+ if [ "$1" != "unknown" ]; then
+ PREVLEVEL=$1
+ RUNLEVEL=$2
+ export PREVLEVEL RUNLEVEL
+ fi
+
+ exec /etc/init/rc 6
+end script
diff --git a/smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/rcS
b/smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/rcS
new file mode 100644
index 0000000..3eccece
--- /dev/null
+++ b/smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/rcS
@@ -0,0 +1,24 @@
+# rcS - runlevel compatibility
+#
+# This task runs the old sysv-rc startup scripts.
+
+start on startup
+
+stop on runlevel
+
+# 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/init/rc
+# without information so that it defaults to previous=N runlevel=S.
+console output
+script
+ runlevel --set S >/dev/null || true
+
+ #set $(runlevel --set S || true)
+ #if [ "$1" != "unknown" ]; then
+ # PREVLEVEL=$1
+ # RUNLEVEL=$2
+ # export PREVLEVEL RUNLEVEL
+ #fi
+
+ exec /etc/init/rcS
+end script
diff --git a/smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/rcS-sulogin
b/smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/rcS-sulogin
new file mode 100644
index 0000000..40fd13a
--- /dev/null
+++ b/smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/rcS-sulogin
@@ -0,0 +1,25 @@
+# rcS-sulogin - "single-user" runlevel compatibility
+#
+# This task runs the sulogin binary during "single-user" mode.
+
+start on runlevel S
+
+stop on runlevel
+
+console owner
+
+script
+ runlevel --set S >/dev/null || true
+ /sbin/sulogin
+
+ if [ -r /etc/inittab ]; then
+ RL="$(sed -n -e "/^id:[0-9]*:initdefault:/{s/^id://;s/:.*//;p}"
/etc/inittab || true)"
+ if [ -n "$RL" ]; then
+ telinit $RL
+ else
+ telinit 2
+ fi
+ else
+ telinit 2
+ fi
+end script
diff --git a/smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/sulogin
b/smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/sulogin
new file mode 100644
index 0000000..931fb06
--- /dev/null
+++ b/smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/sulogin
@@ -0,0 +1,18 @@
+# sulogin - rescue mode
+#
+# This task ensures that should the system fail to have any active jobs
+# that the system administrator can rescue it; by giving them a shell.
+
+#start on stalled
+
+exec /sbin/sulogin
+console owner
+
+pre-start script
+ echo
+ echo "The system has reached a state where there are no jobs running."
+ echo "A shell will be spawned so that you may start such jobs that
are"
+ echo "necessary."
+ echo
+ echo "Type 'exit' when finished."
+end script
diff --git a/smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/tty1
b/smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/tty1
new file mode 100644
index 0000000..9f653b5
--- /dev/null
+++ b/smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/tty1
@@ -0,0 +1,16 @@
+# tty1 - getty
+#
+# This service maintains a getty on tty1 from the point the system is
+# started until it is shut down again.
+
+start on runlevel 2
+start on runlevel 3
+start on runlevel 4
+start on runlevel 5
+
+stop on runlevel 0
+stop on runlevel 1
+stop on runlevel 6
+
+respawn
+exec /sbin/getty 38400 tty1
diff --git a/smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/tty2
b/smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/tty2
new file mode 100644
index 0000000..3f07f87
--- /dev/null
+++ b/smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/tty2
@@ -0,0 +1,16 @@
+# tty2 - getty
+#
+# This service maintains a getty on tty2 from the point the system is
+# started until it is shut down again.
+
+start on runlevel 2
+start on runlevel 3
+
+stop on runlevel 0
+stop on runlevel 1
+stop on runlevel 4
+stop on runlevel 5
+stop on runlevel 6
+
+respawn
+exec /sbin/getty 38400 tty2
diff --git a/smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/tty3
b/smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/tty3
new file mode 100644
index 0000000..b489222
--- /dev/null
+++ b/smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/tty3
@@ -0,0 +1,16 @@
+# tty3 - getty
+#
+# This service maintains a getty on tty3 from the point the system is
+# started until it is shut down again.
+
+start on runlevel 2
+start on runlevel 3
+
+stop on runlevel 0
+stop on runlevel 1
+stop on runlevel 4
+stop on runlevel 5
+stop on runlevel 6
+
+respawn
+exec /sbin/getty 38400 tty3
diff --git a/smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/tty4
b/smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/tty4
new file mode 100644
index 0000000..ea1783c
--- /dev/null
+++ b/smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/tty4
@@ -0,0 +1,16 @@
+# tty4 - getty
+#
+# This service maintains a getty on tty4 from the point the system is
+# started until it is shut down again.
+
+start on runlevel 2
+start on runlevel 3
+
+stop on runlevel 0
+stop on runlevel 1
+stop on runlevel 4
+stop on runlevel 5
+stop on runlevel 6
+
+respawn
+exec /sbin/getty 38400 tty4
diff --git a/smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/tty5
b/smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/tty5
new file mode 100644
index 0000000..f218908
--- /dev/null
+++ b/smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/tty5
@@ -0,0 +1,16 @@
+# tty5 - getty
+#
+# This service maintains a getty on tty5 from the point the system is
+# started until it is shut down again.
+
+start on runlevel 2
+start on runlevel 3
+
+stop on runlevel 0
+stop on runlevel 1
+stop on runlevel 4
+stop on runlevel 5
+stop on runlevel 6
+
+respawn
+exec /sbin/getty 38400 tty5
diff --git a/smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/tty6
b/smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/tty6
new file mode 100644
index 0000000..1c5994e
--- /dev/null
+++ b/smgl/smgl-upstart/upstart-init/sysvcompat/sysvcompat/tty6
@@ -0,0 +1,16 @@
+# tty6 - getty
+#
+# This service maintains a getty on tty6 from the point the system is
+# started until it is shut down again.
+
+start on runlevel 2
+start on runlevel 3
+
+stop on runlevel 0
+stop on runlevel 1
+stop on runlevel 4
+stop on runlevel 5
+stop on runlevel 6
+
+respawn
+exec /sbin/getty 38400 tty6
diff --git a/smgl/upstart/BUILD b/smgl/upstart/BUILD
index cfdb6b1..50aca53 100755
--- a/smgl/upstart/BUILD
+++ b/smgl/upstart/BUILD
@@ -1,10 +1,7 @@
-./configure --prefix=${INSTALL_ROOT}/usr \
- --program-prefix="upstart-" \
+./configure --prefix=${INSTALL_ROOT}/ \
--sysconfdir=${INSTALL_ROOT}/etc \
--localstatedir=${INSTALL_ROOT}/var \
--mandir=${INSTALL_ROOT}/usr/share/man \
--infodir=${INSTALL_ROOT}/usr/share/info \
- --disable-compat \
$OPTS &&
make
-
diff --git a/smgl/upstart/CONFLICTS b/smgl/upstart/CONFLICTS
new file mode 100755
index 0000000..cb7b017
--- /dev/null
+++ b/smgl/upstart/CONFLICTS
@@ -0,0 +1,2 @@
+conflicts simpleinit-msb &&
+conflicts initng
diff --git a/smgl/upstart/DEPENDS b/smgl/upstart/DEPENDS
index 6065638..251736e 100755
--- a/smgl/upstart/DEPENDS
+++ b/smgl/upstart/DEPENDS
@@ -1 +1,2 @@
-depends dbus
+depends dbus &&
+depends expat
diff --git a/smgl/upstart/DETAILS b/smgl/upstart/DETAILS
index 9d7ae58..096b4b5 100755
--- a/smgl/upstart/DETAILS
+++ b/smgl/upstart/DETAILS
@@ -4,7 +4,7 @@

SOURCE_HASH=sha512:fc68592941874b4e8e1e79ac0c3ce2b65e0a6be46cd2f229dda6acdd14a95d871a16655faee1cc4ceeabf17a54df688f13b925cf210d012ad89a97ebc6f085cf
SOURCE_URL[0]=http://upstart.ubuntu.com/download/${VERSION:0:3}/${SOURCE}
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- WEB_SITE=https://launchpad.net/upstart/
+ WEB_SITE=http://upstart.ubuntu.com
ENTERED=20080113
LICENSE[0]=GPL
SHORT="Sysv init replacement"
diff --git a/smgl/upstart/HISTORY b/smgl/upstart/HISTORY
index 364700f..e554d03 100644
--- a/smgl/upstart/HISTORY
+++ b/smgl/upstart/HISTORY
@@ -1,3 +1,9 @@
+2009-09-07 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: added expat
+ * BUILD: remove upstart- prefix and install into INSTALL_ROOT/
+ * CONFLICTS: conflict with other init systems
+ * PROVIDES: provides INIT
+
2009-08-09 Finn Haedicke <finn_haedicke AT gmx.net>
* DETAILS: updated to 0.6.3
* DEPENDS: depends on dbus
diff --git a/smgl/upstart/PROVIDES b/smgl/upstart/PROVIDES
new file mode 100755
index 0000000..d0e366a
--- /dev/null
+++ b/smgl/upstart/PROVIDES
@@ -0,0 +1 @@
+INIT
diff --git a/smgl/upstart/WIP b/smgl/upstart/WIP
deleted file mode 100644
index 4138138..0000000
--- a/smgl/upstart/WIP
+++ /dev/null
@@ -1,4 +0,0 @@
-upstart builds and installs fine.
-for testing purposes, all binaries are prefixed with upstart so the
simpleinit ones are not overwritten.
-
-There are NO smgl init scripts for upstart yet, working on those.
diff --git a/utils/fbgetty/HISTORY b/utils/fbgetty/HISTORY
index a4220da..6a8a835 100644
--- a/utils/fbgetty/HISTORY
+++ b/utils/fbgetty/HISTORY
@@ -1,3 +1,6 @@
+2009-09-07 Arjan Bouter <abouter AT sourcemage.org>
+ * PROVIDES: added, provides GETTY
+
2008-02-13 Dale E. Edmons <linuxfan AT sourcemage.org>
* PRE_BUILD: added verify_file 2.

diff --git a/utils/fbgetty/PROVIDES b/utils/fbgetty/PROVIDES
new file mode 100755
index 0000000..7503d84
--- /dev/null
+++ b/utils/fbgetty/PROVIDES
@@ -0,0 +1 @@
+GETTY
diff --git a/utils/util-linux/HISTORY b/utils/util-linux/HISTORY
index 4a0a41d..15f37e3 100644
--- a/utils/util-linux/HISTORY
+++ b/utils/util-linux/HISTORY
@@ -1,3 +1,6 @@
+2009-09-08 Arjan Bouter <abouter AT sourcemage.org>
+ * PROVIDES: provides GETTY
+
2009-09-07 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.16.1

diff --git a/utils/util-linux/PROVIDES b/utils/util-linux/PROVIDES
index 1a41fef..cedb088 100755
--- a/utils/util-linux/PROVIDES
+++ b/utils/util-linux/PROVIDES
@@ -1 +1,2 @@
PAGER
+GETTY



  • [SM-Commit] GIT changes to master grimoire by Arjan Bouter (d72384647f16776797fd6e711c9c90478d283a78), Arjan Bouter, 09/08/2009

Archive powered by MHonArc 2.6.24.

Top of Page