git.iko.soy/typeable/nixpkgs
on master help sign in
fix some brainfarts

svn path=/nixpkgs/trunk/; revision=5021

commit6562861ba416fa5f6154d2e047e0591abafb3c71 authorArmijn Hemel <armijn@gpl-violations.org> dateFri 10 Mar 2006, 13:32 (21 years ago) parent742c1ef
6 files changed+45−15
pkgs/servers/server-scripts/generic/builder.sh+5 pkgs/servers/server-scripts/generic/default.nix+9 pkgs/servers/server-scripts/generic/functions+20−5 pkgs/servers/syslog-script/builder.sh+1 pkgs/servers/syslog-script/default.nix+2−2 pkgs/servers/syslog-script/syslog+8−8
pkgs/servers/server-scripts/generic/builder.shnew file+5
@@ -0,0 +1,5 @@
1+source $stdenv/setup
2+
3+ensureDir $out
4+
5+cp $functions $out/$nicename
pkgs/servers/server-scripts/generic/default.nixnew file+9
@@ -0,0 +1,9 @@
1+{stdenv}:
2+
3+stdenv.mkDerivation {
4+ name = "generic-server-script-0.0.1";
5+ server = "generic";
6+ nicename = "functions";
7+ builder = ./builder.sh ;
8+ functions = [./functions];
9+}
pkgs/servers/server-scripts/generic/functions+20−5
@@ -11,31 +11,36 @@ RCDIR=/etc/rc.d/
1111## resolve $deps to real start/stop scripts first
1212
1313start_deps() {
14− for i in $deps
14+ for i in $deps; do
1515 $i start
1616 RETVAL=$?
1717 if test $RETVAL != 0; then
1818 exit $RETVAL
19+ fi
20+ done
1921}
2022
2123start_softdeps() {
22− for i in $softdeps
24+ for i in $softdeps; do
2325 $i start
2426 RETVAL=$?
2527 if test $RETVAL != 0; then
2628 continue
29+ fi
30+ done
2731}
2832
2933start() {
3034 # are we already running?
3135 # if so, exit with code 0
32− if test -a $STATDIR/$prog = 1; then
36+ if test -a $STATDIR/$prog; then
3337 exit 0
38+ fi
3439 # if not, continue
3540 # launch all hard dependencies
36− start_deps
41+ #start_deps
3742 # launch all preferred dependencies
38− start_softdeps
43+ #start_softdeps
3944 # launch our own program
4045}
4146
@@ -43,6 +48,7 @@ stop() {
4348 # are we running? If so, then stop, otherwise, do nothing...
4449 if test -a $STATDIR/$prog = 0; then
4550 exit 0
51+ fi
4652 # stop our own program
4753}
4854
@@ -53,3 +59,12 @@ register() {
5359unregister() {
5460 rm $STATEDIR/$prog
5561}
62+
63+status() {
64+ # are we running? If so, report
65+ if test -a $STATDIR/$prog; then
66+ echo "running"
67+ else
68+ echo "stopped"
69+ fi
70+}
pkgs/servers/syslog-script/builder.sh+1
@@ -5,6 +5,7 @@ ensureDir $out
55sed -e "s^@bash\@^$bash^g" \
66 -e "s^@syslog\@^$syslog^g" \
77 -e "s^@nicename\@^$nicename^g" \
8+ -e "s^@initscripts\@^$initscripts^g" \
89 < $script > $out/$nicename
910
1011chmod +x $out/$nicename
pkgs/servers/syslog-script/default.nix+2−2
@@ -1,10 +1,10 @@
1−{stdenv, bash, syslog}:
1+{stdenv, bash, syslog, initscripts}:
22
33stdenv.mkDerivation {
44 name = "syslog-script-0.0.1";
55 server = "syslog";
66 nicename = "syslog";
77 builder = ./builder.sh ;
8− inherit bash syslog;
8+ inherit bash syslog initscripts;
99 script = [./syslog];
1010}
pkgs/servers/syslog-script/syslog+8−8
@@ -8,7 +8,7 @@
88# processname: sshd
99
1010# source function library
11−#. @initscripts@/etc/rc.d/init.d/functions
11+source @initscripts@/functions
1212
1313# pull in sysconfig settings
1414#[ -f /etc/sysconfig/sshd ] && . /etc/sysconfig/sshd
@@ -16,23 +16,23 @@
1616RETVAL=0
1717prog=@nicename@
1818
19−start()
19+startService()
2020{
2121 # just do networking
22− echo -n $"Starting $prog:"
22+ echo -n "Starting $prog:"
2323 @syslog@/usr/sbin/syslogd
2424 @syslog@/usr/sbin/klogd
2525}
2626
27−stop()
27+stopService()
2828{
29− echo -n $"Stopping $prog:"
29+ echo -n "Stopping $prog:"
3030}
3131
32−reload()
32+reloadService()
3333{
34− start
3534 stop
35+ start
3636}
3737
3838case "$1" in
@@ -50,7 +50,7 @@ case "$1" in
5050 reload
5151 ;;
5252 status)
53− echo "all OK"
53+ status
5454 ;;
5555 *)
5656 echo $"Usage: $0 {start|stop|restart|reload|status}"