git.iko.soy/typeable/nixpkgs
on master help sign in
adapt files so that "networking" now also work with our new scheme

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

commit35e30e7797055726faeacfe80957ad5082b3c841 authorArmijn Hemel <armijn@gpl-violations.org> dateFri 17 Mar 2006, 14:16 (21 years ago) parent7c50890
6 files changed+21−13
compare with master
unifiedsplit
pkgs/servers/network-script/builder.sh+3−2 pkgs/servers/network-script/default.nix+2−2 pkgs/servers/network-script/network+8−5 pkgs/servers/server-scripts/generic/functions+6−4 pkgs/servers/ssh-script/builder.sh+1 pkgs/servers/ssh-script/sshd+1
pkgs/servers/network-script/builder.sh+3−2
@@ -4,7 +4,8 @@ ensureDir $out
44
55sed -e "s^@bash\@^$bash^g" \
66 -e "s^@dhcp\@^$dhcp^g" \
7+ -e "s^@initscripts\@^$initscripts^g" \
78 -e "s^@nettools\@^$nettools^g" \
8− < $script > $out/$nicename
9+ < $script > $out/control
910
10−chmod +x $out/$nicename
11+chmod +x $out/control
pkgs/servers/network-script/default.nix+2−2
@@ -1,10 +1,10 @@
1−{stdenv, bash, nettools, dhcp, key ? null}:
1+{stdenv, bash, nettools, dhcp, key ? null, initscripts}:
22
33stdenv.mkDerivation {
44 name = "network-script-0.0.1";
55 server = "network";
66 nicename = "networking";
77 builder = ./builder.sh ;
8− inherit bash nettools dhcp;
8+ inherit bash nettools dhcp initscripts;
99 script = [./network];
1010}
pkgs/servers/network-script/network+8−5
@@ -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,14 +16,14 @@
1616RETVAL=0
1717prog="network"
1818
19−start()
19+startService()
2020{
2121 # just do networking
2222 echo -n $"Starting $prog:"
2323 @dhcp@/sbin/dhclient
2424}
2525
26−stop()
26+stopService()
2727{
2828 echo -n $"Stopping $prog:"
2929}
@@ -49,10 +49,13 @@ case "$1" in
4949 reload
5050 ;;
5151 status)
52− echo "all OK"
52+ status
53+ ;;
54+ name)
55+ name
5356 ;;
5457 *)
55− echo $"Usage: $0 {start|stop|restart|reload|status}"
58+ echo $"Usage: $0 {start|stop|restart|reload|status|name}"
5659 RETVAL=1
5760esac
5861exit $RETVAL
pkgs/servers/server-scripts/generic/functions+6−4
@@ -14,11 +14,14 @@ NIXPKGS=@nixpkgs@
1414start_deps() {
1515 for i in $deps; do
1616 name=`$i/control name`
17− if ! test -a $RCDIR/$name; then
18− echo "blaat"
17+
18+ if ! test -a "$RCDIR/$name"; then
19+ echo $RCDIR/$name $i
20+ @nix@/bin/nix-env -p $RCDIR/$name -i $i
1921 fi
2022
2123 $i/control start
24+
2225 RETVAL=$?
2326 if test $RETVAL != 0; then
2427 exit $RETVAL
@@ -38,7 +41,6 @@ start_softdeps() {
3841
3942 $i/control start
4043
41− #$i start
4244 RETVAL=$?
4345 if test $RETVAL != 0; then
4446 continue
@@ -54,7 +56,7 @@ start() {
5456 fi
5557 # if not, continue
5658 # launch all hard dependencies
57− #start_deps
59+ start_deps
5860 # launch all preferred dependencies
5961 echo "softdeps" $softdeps
6062 start_softdeps
pkgs/servers/ssh-script/builder.sh+1
@@ -7,6 +7,7 @@ sed -e "s^@bash\@^$bash^g" \
77 -e "s^@initscripts\@^$initscripts^g" \
88 -e "s^@coreutils\@^$coreutils^g" \
99 -e "s^@softdeps\@^$softdeps^g" \
10+ -e "s^@deps\@^$deps^g" \
1011 < $script > $out/control
1112
1213chmod +x $out/control
pkgs/servers/ssh-script/sshd+1
@@ -22,6 +22,7 @@ RETVAL=0
2222prog="sshd"
2323
2424softdeps="@softdeps@"
25+deps="@deps@"
2526
2627# Some functions to make the below more readable
2728KEYGEN=@sshd@/bin/ssh-keygen