Changeset 634578e

Timestamp:

08/24/2014 07:26:39 PM (10 years ago)

Author:

Krejzi <krejzi@…>

Branches:

7.6-blfs, 7.6-systemd, kde5-14269, kde5-14686, systemd-13485

Children:

0616b513

Parents:

f3d469b1

Message:

Fixes to systemd units.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@14038 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• general.ent (modified) (4 diffs)
• systemd-units/Makefile (modified) (2 diffs)
• systemd-units/blfs/units/ntpd.service (modified) (1 diff)
• systemd-units/blfs/units/saslauthd.service (modified) (1 diff)

general.ent

@@ -1 +1 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "23">                   <!-- Always 2 digits -->
+<!ENTITY day          "24">                   <!-- Always 2 digits -->
 <!ENTITY month        "08">                   <!-- Always 2 digits -->
 <!ENTITY year         "2014">
@@ -7 +7 @@
 <!ENTITY copyholder   "The BLFS systemd Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "August 23rd, &year;">
+<!ENTITY releasedate  "August 24th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "systemd">              <!-- svn|[release #] -->
@@ -45 +45 @@
 <!ENTITY fedora-http-repo     "http://pkgs.fedoraproject.org/repo/pkgs">
 <!ENTITY jaist-ftp-repo       "ftp://ftp.jaist.ac.jp/pub//sourceforge">
-<!ENTITY trinity-repo-ftp     "ftp://anduin.&lfs-domainname;/trinity">
-<!ENTITY trinity-repo-http    "http://anduin.&lfs-domainname;/sources/trinity">
 <!ENTITY publisher            "Unknown">
 <!ENTITY xorg-download-http   "http://xorg.freedesktop.org/archive/individual">
@@ -73 +71 @@
 <!-- End LFS versions -->
 
-<!ENTITY blfs-bootscripts-version     "20140801">
+<!ENTITY blfs-bootscripts-version     "20140824">
 <!ENTITY blfs-bootscripts-download    "&downloads-root;/blfs-systemd-units-&blfs-bootscripts-version;.tar.bz2">
 

systemd-units/Makefile

@@ -119 +119 @@
         install -m ${CONFMODE} blfs/units/ntpd.service ${UNITSDIR}/
         install -d -m ${DIRMODE} ${DESTDIR}/usr/lib/systemd/ntp-units.d
-        echo "ntpd.service" > ${DESTDIR}/usr/lib/systemd/ntp-units.d/ntp.list
         systemctl enable ntpd.service
 
@@ -298 +297 @@
         systemctl stop ntpd.service
         systemctl disable ntpd.service
-        rm -f ${UNITSDIR}/ntpd.service ${DESTDIR}/usr/lib/systemd/ntp-units.d/ntp.list
+        rm -f ${UNITSDIR}/ntpd.service
 
 uninstall-php-fpm:

systemd-units/blfs/units/ntpd.service

@@ -2 +2 @@
 Description=Network Time Protocol daemon
 After=network.target nss-lookup.target
+Conflicts=systemd-timesyncd.service
 
 [Service]

systemd-units/blfs/units/saslauthd.service

@@ -6 +6 @@
 EnvironmentFile=/etc/default/saslauthd
 ExecStart=/usr/sbin/saslauthd -a $MECHANISMS -n $THREADS $MECH_OPTIONS $SASLAUTHD_OPTS
-PidFile=/run/saslauthd/saslauthd.pid
+PIDFile=/run/saslauthd/saslauthd.pid
 
 [Install]