From 6695e282a58fe395046ec794dba88cfad3f524d8 Mon Sep 17 00:00:00 2001
From: William Harrington <kb0iic@berzerkula.org>
Date: Sat, 26 Apr 2014 21:18:38 -0500
Subject: Merge changes from my local repo to the one at cross-lfs.org.

---
 ChangeLog                  | 10 ++++++++++
 Makefile                   |  5 +++++
 README                     |  4 ++--
 clfs/tmpfiles/apcupsd.conf |  3 +++
 clfs/units/apcupsd.service |  8 ++++++++
 5 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 ChangeLog
 create mode 100644 clfs/tmpfiles/apcupsd.conf
 create mode 100644 clfs/units/apcupsd.service

diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..0c6faff
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,10 @@
+2014-04-07 William Harrington <kb0iic@cross-lfs.org>
+   * Add apcupsd service and tmpfile and install-apcupsd target
+
+2014-02-06 William Harrington <kb0iic@cross-lfs.org>
+   * Adjust for CLFS use and add editd fcron.service from fcron 3.1.2 package
+     to use /etc/default/fcron for runtime options with $FCRON_OPTS
+
+2013-06-10 Armin K. <krejzi@email.com>
+   * Import first revision of the standalone
+     units package.
diff --git a/Makefile b/Makefile
index 3c63df2..9b5c9f2 100644
--- a/Makefile
+++ b/Makefile
@@ -39,6 +39,11 @@ install-acpid: create-dirs
 	install -m ${CONFMODE} clfs/units/acpid.socket ${UNITSDIR}/
 	systemctl enable acpid.socket
 
+install-apcupsd: create-dirs
+	install -m ${CONFMODE} clfs/tmpfiles/apcupsd.conf ${TMPFILESDIR}/
+	install -m ${CONFMODE} clfs/units/apcupsd.service ${UNITSDIR}/
+	systemctl enable apcupsd.service
+
 install-dhcpd: create-dirs
 	install -m ${CONFMODE} clfs/default/dhcpd ${DEFAULTSDIR}/
 	install -m ${CONFMODE} clfs/units/dhcpd.service ${UNITSDIR}/
diff --git a/README b/README
index 7c6de2e..259c348 100644
--- a/README
+++ b/README
@@ -1,12 +1,12 @@
 blfs-units:
 
 This package contains the Systemd units that are mentioned
-in the BLFS Systemd book.
+in the BLFS Systemd BOOK.
 
 The various install targets are mentioned in the BLFS
 Systemd book. There are variables defined for script
 permissions {MODE}, configuration and units file
 permissions {CONFMODE}, directory permissions {DIRMODE}
 and destination directory {DESTDIR}. For more information
-refer to the BLFS Systemd book at
+refer to the BLFS Systemd BOOK at
 http://www.linuxfromscratch.org/blfs/ .
diff --git a/clfs/tmpfiles/apcupsd.conf b/clfs/tmpfiles/apcupsd.conf
new file mode 100644
index 0000000..601b5ae
--- /dev/null
+++ b/clfs/tmpfiles/apcupsd.conf
@@ -0,0 +1,3 @@
+D /run/apcupsd 0755 root root
+r /etc/apcupsd/powerfail
+r /etc/nologin
diff --git a/clfs/units/apcupsd.service b/clfs/units/apcupsd.service
new file mode 100644
index 0000000..9cec6e4
--- /dev/null
+++ b/clfs/units/apcupsd.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=APC UPS Monitor
+
+[Service]
+ExecStart=/sbin/apcupsd -b
+
+[Install]
+WantedBy=multi-user.target
-- 
cgit v1.2.3-54-g00ecf