[Astlinux-commits] SF.net SVN: astlinux: [416] trunk

[<kr...@us...>]

Revision: 416
          http://svn.sourceforge.net/astlinux/?rev=416&view=rev
Author:   krisk84
Date:     2006-10-18 14:30:12 -0700 (Wed, 18 Oct 2006)

Log Message:
-----------
update iaxmodem to only install the init script if it was selected

Modified Paths:
--------------
    trunk/package/iaxmodem/iaxmodem.mk

Added Paths:
-----------
    trunk/package/iaxmodem/iaxmodem.init

Removed Paths:
-------------
    trunk/target/generic/target_skeleton/etc/init.d/iaxmodem

Copied: trunk/package/iaxmodem/iaxmodem.init (from rev 415, trunk/target/generic/target_skeleton/etc/init.d/iaxmodem)
===================================================================
--- trunk/package/iaxmodem/iaxmodem.init	                        (rev 0)
+++ trunk/package/iaxmodem/iaxmodem.init	2006-10-18 21:30:12 UTC (rev 416)
@@ -0,0 +1,59 @@
+#!/bin/sh
+
+. /etc/rc.conf
+
+init () {
+if [ ! -d /var/log/iaxmodem ]
+then
+mkdir /var/log/iaxmodem
+fi
+
+if [ -d /mnt/kd/iaxmodem ]
+then
+ln -s /mnt/kd/iaxmodem /tmp/etc/iaxmodem
+else
+mkdir /tmp/etc/iaxmodem
+cp -a /stat/etc/iaxmodem/* /tmp/etc/iaxmodem/
+fi
+}
+
+start () {
+echo "Starting IAXmodem..."
+iaxmodem
+fi
+}
+
+stop () {
+if [ -r /var/run/iaxmodem.pid ]
+then
+echo "Stopping IAXmodem..."
+kill `cat /var/run/iaxmodem.pid`
+fi
+}
+
+case $1 in
+
+init)
+init
+start
+;;
+
+start)
+start
+;;
+
+stop)
+stop
+;;
+
+restart)
+stop
+sleep 2
+start
+;;
+
+*)
+echo "Usage: start|stop|restart"
+;;
+
+esac

Modified: trunk/package/iaxmodem/iaxmodem.mk
===================================================================
--- trunk/package/iaxmodem/iaxmodem.mk	2006-10-18 21:27:47 UTC (rev 415)
+++ trunk/package/iaxmodem/iaxmodem.mk	2006-10-18 21:30:12 UTC (rev 416)
@@ -91,6 +91,7 @@
 	cp $(IAXMODEM_DIR)/lib/libiax2/src/iax2-parser.h $(STAGING_DIR)/usr/include/iax
 	rm -f $(TARGET_DIR)/usr/lib/libiax*.a $(TARGET_DIR)/usr/lib/libiax*.la
 	$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libiax*
+	$(INSTALL) -D -m 0755 package/iaxmodem/iaxmodem.init $(TARGET_DIR)/etc/init.d/iaxmodem
 	touch $(IAXMODEM_DIR)/.libiax2_installed
 
 $(IAXMODEM_DIR)/.built: $(IAXMODEM_DIR)/.libiax2_installed

Deleted: trunk/target/generic/target_skeleton/etc/init.d/iaxmodem
===================================================================
--- trunk/target/generic/target_skeleton/etc/init.d/iaxmodem	2006-10-18 21:27:47 UTC (rev 415)
+++ trunk/target/generic/target_skeleton/etc/init.d/iaxmodem	2006-10-18 21:30:12 UTC (rev 416)
@@ -1,59 +0,0 @@
-#!/bin/sh
-
-. /etc/rc.conf
-
-init () {
-if [ ! -d /var/log/iaxmodem ]
-then
-mkdir /var/log/iaxmodem
-fi
-
-if [ -d /mnt/kd/iaxmodem ]
-then
-ln -s /mnt/kd/iaxmodem /tmp/etc/iaxmodem
-else
-mkdir /tmp/etc/iaxmodem
-cp -a /stat/etc/iaxmodem/* /tmp/etc/iaxmodem/
-fi
-}
-
-start () {
-echo "Starting IAXmodem..."
-iaxmodem
-fi
-}
-
-stop () {
-if [ -r /var/run/iaxmodem.pid ]
-then
-echo "Stopping IAXmodem..."
-kill `cat /var/run/iaxmodem.pid`
-fi
-}
-
-case $1 in
-
-init)
-init
-start
-;;
-
-start)
-start
-;;
-
-stop)
-stop
-;;
-
-restart)
-stop
-sleep 2
-start
-;;
-
-*)
-echo "Usage: start|stop|restart"
-;;
-
-esac


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.