[svn-commits] kpfleming: trunk r2481 - in /trunk: ./ zaptel.init

svn-commits at lists.digium.com svn-commits at lists.digium.com
Mon Apr 30 16:09:38 MST 2007


Author: kpfleming
Date: Mon Apr 30 18:09:37 2007
New Revision: 2481

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2481
Log:
Merged revisions 2480 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.4

........
r2480 | kpfleming | 2007-04-30 19:07:21 -0400 (Mon, 30 Apr 2007) | 2 lines

eliminate bogus warning message during script startup with no HPEC licenses

........

Modified:
    trunk/   (props changed)
    trunk/zaptel.init

Propchange: trunk/
            ('branch-1.2-merged' removed)

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/zaptel.init
URL: http://svn.digium.com/view/zaptel/trunk/zaptel.init?view=diff&rev=2481&r1=2480&r2=2481
==============================================================================
--- trunk/zaptel.init (original)
+++ trunk/zaptel.init Mon Apr 30 18:09:37 2007
@@ -200,6 +200,46 @@
 	RETVAL=$?
 
 	[ $RETVAL -eq 0 ] && touch $LOCKFILE
+	
+	# check for HPEC licenses
+	for f in /var/lib/digium/licenses/HPEC*.lic; do
+		if [ -f ${f} ]; then
+			haveHPEC = 1
+		fi
+	done
+
+	# HPEC license found
+	if [ -n "${haveHPEC}" ]; then
+		# zaphpec_enable not installed in /usr/sbin
+		if [ ! -f /usr/sbin/zaphpec_enable ]; then
+			echo -n "Running zaphpec_enable: Failed"
+			echo -n "."
+			echo "  The zaphpec_enable binary is not installed in /usr/sbin."
+		else
+			# zaphpec_enable not set executable
+			if [ ! -x /usr/sbin/zaphpec_enable ]; then
+				echo -n "Running zaphpec_enable: Failed"
+				echo -n "."
+				echo "  /usr/sbin/zaphpec_enable is not set as executable."
+			else
+				# zaphpec_enable properly installed
+				if [ $system = debian ]; then
+					echo -n "Running zaphpec_enable: "
+					/usr/sbin/zaphpec_enable >& /dev/null
+				elif [ $system = redhat ]; then
+					action "Running zaphpec_enable: " /usr/sbin/zaphpec_enable
+				fi
+				if [ $? = 0 ]; then
+					echo -n "done"
+					echo "."
+				else
+					echo -n "Failed"
+					echo -n "."
+					echo "  This can be caused if you had already run zaphpec_enable, or if your HPEC license is no longer valid."
+				fi
+			fi
+		fi
+	fi
 	;;
   stop)
 	# Unload drivers



More information about the svn-commits mailing list