[patch] ebuild patch with return to original run directories

apcupsd-ebuild.patch (text/plain), 1.22 KB, created by Billy DeVincentis on 2013-11-23 23:58:17 UTC

--- /usr/portage/sys-power/apcupsd/apcupsd-3.14.10-r5.ebuild	2013-10-24 23:02:13.000000000 -0400
+++ /usr/portage/local/miscellaneous/sys-power/apcupsd/apcupsd-3.14.10-r5.ebuild	2013-11-23 18:19:54.668406634 -0500
@@ -61,8 +61,8 @@
 		--sbindir=/sbin \
 		--sysconfdir=/etc/apcupsd \
 		--with-pwrfail-dir=/etc/apcupsd \
-		--with-lock-dir=/var/run/apcupsd \
-		--with-pid-dir=/var/run/apcupsd \
+		--with-lock-dir=/var/lock \
+		--with-pid-dir=/var/run \
 		--with-log-dir=/var/log \
 		--with-nis-port=3551 \
 		--enable-net --enable-pcnet \
@@ -87,7 +87,8 @@
 
 	insinto /etc/apcupsd
 	newins examples/safe.apccontrol safe.apccontrol
-	doins "${FILESDIR}"/apcupsd.conf
+	# no longer necessary since we are not changing run directories
+        #doins "${FILESDIR}"/apcupsd.conf
 
 	dodoc ChangeLog* ReleaseNotes
 	doman doc/*.8 doc/*.5
@@ -103,6 +104,12 @@
 		systemd_dotmpfilesd "${FILESDIR}"/${PN}-tmpfiles.conf
 	fi
 
+        # Without this it'll crash at startup. When merging in ROOT= this
+	# won't be created by default, so we want to make sure we got it!
+	keepdir /var/lock
+	fowners root:uucp /var/lock
+	fperms 0775 /var/lock
+
 	# remove hal settings, we don't really want to have it around still.
 	rm -r "${D}"/usr/share/hal