[Initng-svn] r2664 - in initng/initfiles: daemon system

[svn at initng.thinktux.net]

Author: seldon
Date: Sun Jan  1 16:11:46 2006
New Revision: 2664

Modified:
   initng/initfiles/daemon/acpid.ii
   initng/initfiles/daemon/gpm.ii
   initng/initfiles/daemon/hald.ii
   initng/initfiles/system/clock.ii
   initng/initfiles/system/ifupdown-debian.ii
Log:
debian-specific fixes to daemon/gpm, system/ifupdown-debian, daemon/hald and
daemon/acpid. Also, have system/clock use system/static-modules.


Modified: initng/initfiles/daemon/acpid.ii
==============================================================================
--- initng/initfiles/daemon/acpid.ii	(original)
+++ initng/initfiles/daemon/acpid.ii	Sun Jan  1 16:11:46 2006
@@ -38,4 +38,7 @@
 	need = system/bootmisc daemon/acpid/modules;
 	use = system/discover system/coldplug;
 	exec daemon = @/usr/sbin/acpid@ -f -c /etc/acpi/events ${OPTIONS};
+#ifd debian
+	env_file = /etc/default/acpid;
+#endd
 }

Modified: initng/initfiles/daemon/gpm.ii
==============================================================================
--- initng/initfiles/daemon/gpm.ii	(original)
+++ initng/initfiles/daemon/gpm.ii	Sun Jan  1 16:11:46 2006
@@ -1,8 +1,41 @@
 daemon daemon/gpm {
 	need = system/bootmisc;
+#ifd debian
+        env CFG=/etc/gpm.conf;
+
+        script daemon = {
+                cmdln=
+
+                if [ -f $CFG ]
+                then
+                        . $CFG
+
+                        if [ -n "$device" ]; then cmdln="$cmdln -m $device"; fi
+                        if [ -n "$type" ]; then cmdln="$cmdln -t $type"; fi
+                        if [ -n "$responsiveness" ]; then cmdln="$cmdln -r $responsiveness"; fi
+                        if [ -n "$sample_rate" ]; then cmdln="$cmdln -s $sample_rate"; fi
+                        # Yes, this /IS/ correct! There is no space after -R!!!!!!
+                        # I reserve the right to throw manpages at anyone who disagrees.
+                        if [ -n "$repeat_type" ] && [ "$repeat_type" != "none" ]; then
+                                cmdln="$cmdln -R$repeat_type"
+                        fi
+                        if [ -n "$append" ]; then cmdln="$cmdln $append"; fi
+                        # If both the second device and type are specified, use it.
+                        if [ -n "$device2" ] && [ -n "$type2" ] ; then
+                                cmdln="$cmdln -M -m $device2 -t $type2"
+                        fi
+
+                        /usr/sbin/gpm -m ${device} -t ${type} ${cmdln} -D;
+                else
+                        echo GPM unconfigured.
+                        exit 1
+                fi
+        };
+#elsed
 	env MOUSE=imps2;
 	env MOUSEDEV=/dev/input/mice;
 	env APPEND=;
 	exec daemon = @/usr/sbin/gpm@ -m ${MOUSEDEV} -t ${MOUSE} ${APPEND};
 	pid_file = /var/run/gpm.pid;
+#endd
 }

Modified: initng/initfiles/daemon/hald.ii
==============================================================================
--- initng/initfiles/daemon/hald.ii	(original)
+++ initng/initfiles/daemon/hald.ii	Sun Jan  1 16:11:46 2006
@@ -1,21 +1,10 @@
 daemon daemon/hald {
 	need = system/bootmisc daemon/dbus;
+
+	stdall = /dev/null;
 #ifdd debian
-	env PIDDIR=/var/run/hal;
-	env DAEMONUSER=hal;
 	env_file = /etc/default/hal;
-	pid_file = ${PIDDIR}/hald.pid;
-#endd
-	stdall = /dev/null;
-#ifd debian
-	script daemon = {
-		if [ ! -d ${PIDDIR} ]
-		then
-			@mkdir@ -p ${PIDDIR}
-			chown ${DAEMONUSER}:${DAEMONUSER} ${PIDDIR}
-		fi
-		@/usr/sbin/hald@ ${DAEMON_OPTS}
-	};
+	exec daemon = @/usr/sbin/hald@ ${DAEMON_OPTS} --daemon=no;
 #elsed gentoo
 	exec daemon = @/usr/sbin/hald@ --retain-privileges;
 	exec daemon = @/usr/sbin/hald@ --drop-privileges;

Modified: initng/initfiles/system/clock.ii
==============================================================================
--- initng/initfiles/system/clock.ii	(original)
+++ initng/initfiles/system/clock.ii	Sun Jan  1 16:11:46 2006
@@ -1,5 +1,6 @@
 service system/clock {
 	need = system/initial;
+	use = system/static-modules;
 #ifd debian linspire
 	env_file = /etc/default/rcS;
 #elsed fedora

Modified: initng/initfiles/system/ifupdown-debian.ii
==============================================================================
--- initng/initfiles/system/ifupdown-debian.ii	(original)
+++ initng/initfiles/system/ifupdown-debian.ii	Sun Jan  1 16:11:46 2006
@@ -28,7 +28,7 @@
 				if [ -d "${dest}" ]
 				then
 					cd "${dest}"
-					dest=`@/bin/pwd@`
+					dest=$(@/bin/pwd@)
 					break
 				fi