[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/OpenIPMI/devel OpenIPMI.spec, 1.38, 1.39 openipmi.initscript, 1.9, 1.10



Author: pknirsch

Update of /cvs/dist/rpms/OpenIPMI/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6674

Modified Files:
	OpenIPMI.spec openipmi.initscript 
Log Message:
- Fixed check for udev in initscript (#197956)



Index: OpenIPMI.spec
===================================================================
RCS file: /cvs/dist/rpms/OpenIPMI/devel/OpenIPMI.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- OpenIPMI.spec	12 Jul 2006 07:33:49 -0000	1.38
+++ OpenIPMI.spec	1 Aug 2006 11:34:45 -0000	1.39
@@ -3,7 +3,7 @@
 Summary: OpenIPMI (Intelligent Platform Management Interface) library and tools
 Name: OpenIPMI
 Version: 2.0.6
-Release: 4.1
+Release: 5
 License: GPL
 Group: System Environment/Base
 URL: http://sourceforge.net/projects/openipmi/
@@ -166,6 +166,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Tue Jul 18 2006 Phil Knirsch <pknirsch redhat com> - 2.0.6-5
+- Fixed check for udev in initscript (#197956)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating redhat com> - 2.0.6-4.1
 - rebuild
 


Index: openipmi.initscript
===================================================================
RCS file: /cvs/dist/rpms/OpenIPMI/devel/openipmi.initscript,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- openipmi.initscript	24 Jan 2006 13:56:18 -0000	1.9
+++ openipmi.initscript	1 Aug 2006 11:34:45 -0000	1.10
@@ -113,6 +113,11 @@
 LOCKFILE=/var/lock/subsys/ipmi
 DEV_IPMI_TIMEOUT=15
 
+UDEV_EXISTS=0
+if [ -e /sbin/udev -o -e /sbin/udevd ]; then
+    UDEV_EXISTS=1
+fi
+
 #############################################################################
 # NOTES:
 # * /dev/ipmi0 is unconditionally deleted here on ipmi_devintf unload,
@@ -207,7 +212,7 @@
 		RETVAL=$((RETVAL | 2)) &&
 		log_failure_msg &&
 		return
-	if [ ! -x /sbin/udev -a ! -e /dev/watchdog ]; then
+	if [ ${UDEV_EXISTS} -eq 0 -a ! -e /dev/watchdog ]; then
 		mknod -m 0600 /dev/watchdog c 10 130
 		[ $? -ne 0 ] &&
 			RETVAL=$((RETVAL | 8)) &&
@@ -245,7 +250,7 @@
 	    log_failure_msg
 	else
 	    if [ "${IPMI_WATCHDOG}" = "yes" ]; then
-		[ ! -x /sbin/udev ] && rm -f /dev/watchdog
+		[ ${UDEV_EXISTS} -eq 0 ] && rm -f /dev/watchdog
 	    fi
 	    log_success_msg
 	fi
@@ -259,7 +264,7 @@
 	    RETVAL=$((RETVAL | 32))
 	else
 	    if [ "${IPMI_WATCHDOG}" = "yes" ]; then
-		[ ! -x /sbin/udev ] && rm -f /dev/watchdog
+		[ ${UDEV_EXISTS} -eq 0 ] && rm -f /dev/watchdog
 	    fi
 	fi
 }
@@ -368,7 +373,7 @@
 		RETVAL=$((RETVAL & ~2))
 		[ ${OnePlusLoaded} -eq 0 ] && RETVAL=$((RETVAL | 2))
 		if [ ${OnePlusLoaded} -eq 1 ]; then
-			if [ ! -x /sbin/udev ]; then
+			if [ ${UDEV_EXISTS} -eq 0 ]; then
 				DEVMAJOR=`cat /proc/devices | awk '/ipmidev/{print $1}'`
 				rm -f /dev/ipmi${INTF_NUM}
 				mknod -m 0600 /dev/ipmi${INTF_NUM} c ${DEVMAJOR} 0 || RETVAL=$((RETVAL | 4))


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]