Miroirs/SlackBuildsOrg
1
0
Fork 0
mirror of https://github.com/SlackBuildsOrg/slackbuilds synced 2024-09-30 05:39:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

system/apcupsd: Fix lockdir definition and usage

Browse source 
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
This commit is contained in:
Robby Workman 2013-05-15 13:11:49 -05:00
parent 39e0617de0
commit 699843a169
3 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
system/apcupsd/apcupsd.SlackBuild
View file

@ -2,7 +2,7 @@
# Slackware build script for apcupsd
# Copyright 2006-2012 Robby Workman Northport, AL, USA
# Copyright 2006-2013 Robby Workman Northport, AL, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@ -27,7 +27,7 @@
PRGNAM=apcupsd
VERSION=${VERSION:-3.14.10}
BUILD=${BUILD:-2}
BUILD=${BUILD:-3}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@ -70,7 +70,10 @@ chmod -R a-s,u+w,go+r-w .
# Create /var/lock/subsys in the init script (rc.apcupsd)
# These days, /var/lock may be on a tmpfs, so we can't assume the dir is there
patch -p1 < $CWD/create_lockdir_in_init_script.diff
patch -p1 < $CWD/patches/create_lockdir_in_init_script.diff
# Use /var/lock/subsys as the LOCKDIR in apcupsd.conf
patch -p1 < $CWD/patches/fix_lockdir_in_config_file.diff
# The "--disable-install-distdir" is important - don't remove it.
# If you enable the distribution-specific install, then apcupsd will attempt
@ -129,6 +132,9 @@ for i in apccontrol apcupsd.conf apcupsd.css changeme commfailure \
mv $PKG/etc/apcupsd/$i $PKG/etc/apcupsd/$i.new;
done
# Remove obsolete HAL stuff
rm -rf $PKG/usr/share/hal
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a \
COPYING ChangeLog DISCLAIMER Developers INSTALL ReleaseNotes \

0
system/apcupsd/create_lockdir_in_init_script.diff → system/apcupsd/patches/create_lockdir_in_init_script.diff
View file

12
system/apcupsd/patches/fix_lockdir_in_config_file.diff Normal file
View file

@ -0,0 +1,12 @@
diff -Nur apcupsd-3.14.10.orig/platforms/etc/apcupsd.conf.in apcupsd-3.14.10/platforms/etc/apcupsd.conf.in
--- apcupsd-3.14.10.orig/platforms/etc/apcupsd.conf.in 2011-05-19 17:55:25.000000000 -0500
+++ apcupsd-3.14.10/platforms/etc/apcupsd.conf.in 2013-05-15 12:44:25.497885953 -0500
@@ -90,7 +90,7 @@
# LOCKFILE <path to lockfile>
# Path for device lock file. Not used on Win32.
-LOCKFILE @LOCKDIR@
+LOCKFILE @LOCKDIR@/subsys
# SCRIPTDIR <path to script directory>
# Directory in which apccontrol and event scripts are located.