Changed log file location to something more common in other distros

4 files changed, 6 insertions, 5 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 09277c6f5853..d03f6c2fd41a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -41,7 +41,7 @@ package() {
   make -C "$srcdir/trunk" DESTDIR="$pkgdir/" install
   rm "$pkgdir/usr/bin/last" "$pkgdir/usr/share/man/man1/last.1"
   install -Dm644 "${srcdir}/trunk/COPYING" "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
-  install -dm700 "${pkgdir}/var/log/${_pkgname}"
+  install -dm700 "${pkgdir}/var/log/account"
   install -Dm644 "${_pkgname}" "${pkgdir}/etc/logrotate.d/${_pkgname}"
   install -Dm755 "${_pkgname}on-create" "${pkgdir}/usr/lib/${_pkgname}/${_pkgname}on-create"
   install -Dm644 "${_pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${_pkgname}.service"
diff --git a/acct b/acct
index d3b4fb77439b..c81b88d3ac19 100644
--- a/acct
+++ b/acct
@@ -1,6 +1,6 @@
 # Logrotate file for acct
 
-/var/log/acct/acct {
+/var/log/account/pacct {
     compress
     delaycompress
     notifempty
@@ -9,7 +9,7 @@
     create 0600 root root
     postrotate
        if /usr/bin/systemctl --quiet is-active acct.service ; then
-           /usr/sbin/accton /var/log/acct/acct | /usr/bin/grep -v "Turning on process accounting." | /usr/bin/cat
+           /usr/sbin/accton /var/log/account/pacct | /usr/bin/grep -v "Turning on process accounting, file set to '/var/log/account/pacct'." | /usr/bin/cat
        fi
     endscript
 }
diff --git a/acct.service b/acct.service
index 3fb123ad32f5..94efeca79fa1 100644
--- a/acct.service
+++ b/acct.service
@@ -1,11 +1,12 @@
 [Unit]
 Description=Kernel process accounting
 After=syslog.target
+ConditionPathExists=/var/log/account
 
 [Service]
 Type=oneshot
 ExecStartPre=/usr/lib/acct/accton-create
-ExecStart=/usr/sbin/accton /var/log/acct/acct
+ExecStart=/usr/sbin/accton /var/log/account/pacct
 ExecStop=/usr/sbin/accton off
 RemainAfterExit=yes
 
diff --git a/accton-create b/accton-create
index 362b55f0f2f1..b797c1e67ecf 100755
--- a/accton-create
+++ b/accton-create
@@ -1,5 +1,5 @@
 #!/usr/bin/sh
-ACCTFILE=/var/log/acct/acct
+ACCTFILE=/var/log/account/pacct
 if [ ! -r $ACCTFILE ];then
   touch $ACCTFILE && chmod 600 $ACCTFILE
 fi