From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 6 Aug 2009 16:14:23 +0000 (+0200)
Subject: Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x
X-Git-Tag: v2.5-core30~46
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=f4aa9e17f26d0d97b804db456638a8bd9a549a04;hp=a9349373db65c67340e11df5dad470c15025de40

Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x
---

diff --git a/config/backup/includes/lcd4linux b/config/backup/includes/lcd4linux
new file mode 100644
index 0000000000..40fa69c51c
--- /dev/null
+++ b/config/backup/includes/lcd4linux
@@ -0,0 +1 @@
+/etc/lcd4linux.conf
diff --git a/config/rootfiles/packages/lcd4linux b/config/rootfiles/packages/lcd4linux
index fc7fe35e5d..226daf4187 100644
--- a/config/rootfiles/packages/lcd4linux
+++ b/config/rootfiles/packages/lcd4linux
@@ -1 +1,3 @@
 usr/bin/lcd4linux
+var/ipfire/backup/addons/includes/lcd4linux
+etc/rc.d/init.d/lcd4linux
diff --git a/lfs/lcd4linux b/lfs/lcd4linux
index dfabfb490f..a0ae13848c 100644
--- a/lfs/lcd4linux
+++ b/lfs/lcd4linux
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = lcd4linux
-PAK_VER    = 1
+PAK_VER    = 2
 
 DEPS       = ""
 
@@ -80,5 +80,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/var/ipfire/lcd4linux
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
+	install -v -m 644 $(DIR_SRC)/config/backup/includes/lcd4linux /var/ipfire/backup/addons/includes/lcd4linux
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/src/initscripts/init.d/lcd4linux b/src/initscripts/init.d/lcd4linux
new file mode 100644
index 0000000000..34f8c8b46e
--- /dev/null
+++ b/src/initscripts/init.d/lcd4linux
@@ -0,0 +1,46 @@
+#!/bin/sh
+# Begin $rc_base/init.d/lcd4linux
+
+
+. /etc/sysconfig/rc
+. $rc_functions
+
+case "$1" in
+	start)
+		boot_mesg "Starting lcd4linux..."
+		if [ ! -f /etc/lcd4linux.conf ]; then
+			boot_mesg "No configuration file found, not starting."
+			exit 1
+		fi
+
+		loadproc /usr/bin/lcd4linux
+		;;
+
+	stop)
+		boot_mesg "Stopping lcd4linux..."
+		killproc /usr/bin/lcd4linux
+		;;
+
+	reload)
+		boot_mesg "Reloading lcd4linux..."
+		reloadproc /usr/bin/lcd4linux
+		;;
+
+	restart)
+		$0 stop
+		sleep 3
+		$0 start
+		;;
+
+	status)
+		statusproc /usr/bin/lcd4linux
+		;;
+
+	*)
+		echo "Usage: $0 {start|stop|reload|restart|status}"
+		exit 1
+		;;
+esac
+
+
+# End $rc_base/init.d/lcd4linux