etc/init.d/hald

@@ -36,12 +36,6 @@ source /etc/init.d/functions
 
 case "$1" in
         start)
-		if [ -f /usr/share/pci.ids.gz ]; then
-			gzip -d -c /usr/share/pci.ids.gz >/usr/share/pci.ids
-		fi
-		if [ -f /usr/share/usb.ids.gz ]; then
-			gzip -d -c /usr/share/usb.ids.gz >/usr/share/usb.ids
-		fi
 		if [ -f /var/run/hald.pid ]; then
 			if [ "`pgrep -P 1 hald`" == "`cat /var/run/hald.pid`" ]; then
 				echo -n "Hald already running"
@@ -52,7 +46,7 @@ case "$1" in
 			fi
 		fi
                 echo -n "Starting Hardware Abstraction Layer Daemon"
-                loadproc /usr/sbin/hald --verbose=yes --use-syslog
+                loadproc /usr/sbin/hald --daemon=yes --use-syslog
 		PID=`pgrep -P 1 hald` 
 		echo $PID >/var/run/hald.pid
                 ;;

etc/init/hald.conf

@@ -1,24 +0,0 @@
-description	"Hardware Abstraction Layer daemon startup"
-author		"Harald Kueller <harald.kueller@compuextreme.de>"
-version		1.0
-emits		none special
-
-start on (runlevel [2345] and (started dbus))
-stop on runlevel [016]
-
-console none
-
-pre-start script
-	if [ ! -f /usr/share/pci.ids ]; then
-		if [ -f /usr/share/pci.ids.gz ]; then
-			gzip -d -c /usr/share/pci.ids.gz >/usr/share/pci.ids
-		fi
-	fi
-	if [ ! -f /usr/share/usb.ids ]; then
-		if [ -f /usr/share/usb.ids.gz ]; then
-			gzip -d -c /usr/share/usb.ids.gz >/usr/share/usb.ids
-		fi
-	fi
-end script
-
-exec /usr/sbin/hald --daemon=no --verbose=yes --use-syslog

etc/udev/rules.d/90-hal.rules

@@ -1,2 +0,0 @@
-# pass all events to the HAL daemon
-RUN+="socket:/org/freedesktop/hal/udev_event"

init/genpkg

@@ -25,20 +25,18 @@
 #
 #
 
-if [ -d /var/install/sysvinit* ]; then
-	WDIR=`pwd`
-	cd etc/init.d
-	chmod 755 dbus
-	mkdir rc{0,1,2,3,4,5,6}.d
-	for i in 0 1 6; do
-		cd rc$i.d
-		ln -s ../hald K70hald
-		cd ..
-	done
-	for i in 2 3 4 5; do
-		cd rc$i.d
-		ln -s ../hald S14hald
-		cd ..
-	done
-	cd $WDIR
-fi
+WDIR=`pwd`
+cd etc/init.d
+chmod 755 dbus
+mkdir rc{0,1,2,3,4,5,6}.d
+for i in 0 1 6; do
+	cd rc$i.d
+	ln -s ../hald K70hald
+	cd ..
+done
+for i in 2 3 4 5; do
+	cd rc$i.d
+	ln -s ../hald S14hald
+	cd ..
+done
+cd $WDIR

tmp/postremove

@@ -1,52 +0,0 @@
-#!/bin/bash
-#Framework, welches ein komplettes Linux System aus den Sourcen erstellt
-#dieses Framework wird im CVS Repository
-#:pserver:cvs.rainmaker-mm.de/RMM/cvs zur Verfügung gestellt
-#
-#Lage dieser Datei im Archiv: $Source$
-#
-#(c) Rainmaker MultiMedia OHG
-#This program is free software; you can redistribute it and/or
-#modify ist under the terms of the GNU General Public License
-#as published by the Free Software Foundation; either version
-#2 of the License, or (at your option) any later version.
-#
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-#See the GNU General Public License for more details.
-#
-#You should have received a copy of the GNU General Public License
-#along with this program; if not write to the Free Software Foundation,
-#Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-#Beschreibung:
-#
-#legt den von dbus benoetigten user messagebus local an
-#
-#Aufrufparameter:
-#keine
-#
-#Letzte Änderung von: $Author$
-#Datum der letzten Änderung: $Date$
-#Version der Datei: $Revision$
-#
-#$Log$
-#Revision 1.2  2007/04/29 10:38:36  kueller
-#haldaemon user bekommt uid 42, haldaemongroup gid 21
-#
-#Revision 1.1  2007/04/13 14:16:04  kueller
-#hald braucht den user haldaemon
-#
-#Revision 1.1  2007/04/13 09:22:39  kueller
-#Anpassung des startup -> Dbus wird nun mit systemweiter Konfiguration gestartet
-#neue postinstall installiert den in der neuen version erwarteten user messagebus
-#
-
-if getent passwd haldaemon 2>&1 >/dev/null; then
-	userdel haldaemon
-fi
-if getent group haldaemon 2>&1 >/dev/null; then
-	groupdel haldaemon
-fi
-