rpms/OpenIPMI
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Fixed check for udev in initscript (#197956)

Browse Source
This commit is contained in:
Phil Knirsch 2006-08-01 11:34:45 +00:00
parent 1dcb5d1c02
commit 9bfb6852ab
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenIPMI.spec
View File

@ -3,7 +3,7 @@
Summary: OpenIPMI (Intelligent Platform Management Interface) library and tools Summary: OpenIPMI (Intelligent Platform Management Interface) library and tools
Name: OpenIPMI Name: OpenIPMI
Version: 2.0.6 Version: 2.0.6
Release: 4.1 Release: 5
License: GPL License: GPL
Group: System Environment/Base Group: System Environment/Base
URL: http://sourceforge.net/projects/openipmi/ URL: http://sourceforge.net/projects/openipmi/
@ -166,6 +166,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/*.a %{_libdir}/*.a
%changelog %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 * Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 2.0.6-4.1
- rebuild - rebuild

13
openipmi.initscript
View File

@ -113,6 +113,11 @@ RETVAL=0
LOCKFILE=/var/lock/subsys/ipmi LOCKFILE=/var/lock/subsys/ipmi
DEV_IPMI_TIMEOUT=15 DEV_IPMI_TIMEOUT=15
UDEV_EXISTS=0
if [ -e /sbin/udev -o -e /sbin/udevd ]; then
UDEV_EXISTS=1
fi
############################################################################# #############################################################################
# NOTES: # NOTES:
# * /dev/ipmi0 is unconditionally deleted here on ipmi_devintf unload, # * /dev/ipmi0 is unconditionally deleted here on ipmi_devintf unload,
@ -207,7 +212,7 @@ start_watchdog_common()
RETVAL=$((RETVAL | 2)) && RETVAL=$((RETVAL | 2)) &&
log_failure_msg && log_failure_msg &&
return 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 mknod -m 0600 /dev/watchdog c 10 130
[ $? -ne 0 ] && [ $? -ne 0 ] &&
RETVAL=$((RETVAL | 8)) && RETVAL=$((RETVAL | 8)) &&
@ -245,7 +250,7 @@ stop_watchdog()
log_failure_msg log_failure_msg
else else
if [ "${IPMI_WATCHDOG}" = "yes" ]; then if [ "${IPMI_WATCHDOG}" = "yes" ]; then
[ ! -x /sbin/udev ] && rm -f /dev/watchdog [ ${UDEV_EXISTS} -eq 0 ] && rm -f /dev/watchdog
fi fi
log_success_msg log_success_msg
fi fi
@ -259,7 +264,7 @@ stop_watchdog_quiet()
RETVAL=$((RETVAL | 32)) RETVAL=$((RETVAL | 32))
else else
if [ "${IPMI_WATCHDOG}" = "yes" ]; then if [ "${IPMI_WATCHDOG}" = "yes" ]; then
[ ! -x /sbin/udev ] && rm -f /dev/watchdog [ ${UDEV_EXISTS} -eq 0 ] && rm -f /dev/watchdog
fi fi
fi fi
} }
@ -368,7 +373,7 @@ load_ipmi_modules ()
RETVAL=$((RETVAL & ~2)) RETVAL=$((RETVAL & ~2))
[ ${OnePlusLoaded} -eq 0 ] && RETVAL=$((RETVAL | 2)) [ ${OnePlusLoaded} -eq 0 ] && RETVAL=$((RETVAL | 2))
if [ ${OnePlusLoaded} -eq 1 ]; then if [ ${OnePlusLoaded} -eq 1 ]; then
if [ ! -x /sbin/udev ]; then if [ ${UDEV_EXISTS} -eq 0 ]; then
DEVMAJOR=`cat /proc/devices | awk '/ipmidev/{print $1}'` DEVMAJOR=`cat /proc/devices | awk '/ipmidev/{print $1}'`
rm -f /dev/ipmi${INTF_NUM} rm -f /dev/ipmi${INTF_NUM}
mknod -m 0600 /dev/ipmi${INTF_NUM} c ${DEVMAJOR} 0 || RETVAL=$((RETVAL | 4)) mknod -m 0600 /dev/ipmi${INTF_NUM} c ${DEVMAJOR} 0 || RETVAL=$((RETVAL | 4))