Changeset f8756ab for network-scripts

Timestamp:

02/15/2014 12:40:11 AM (11 years ago)

Author:

Krejzi <krejzi@…>

Branches:

7.5-systemd, 7.6-systemd, 7.7-systemd, 7.8-systemd, 7.9-systemd

Children:

3e2ac00

Parents:

e88c73c

Message:

Merge latest LFS SVN.

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/systemd/BOOK@10468 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Location:

network-scripts

Files:

• Makefile (modified) (3 diffs)
• lfs/tmpfiles/nscd.conf (deleted)
• lfs/units/nscd.service (deleted)

network-scripts/Makefile

@@ -1 +1 @@
 EXTDIR=${DESTDIR}/etc
-TMPFILESDIR=${EXTDIR}/tmpfiles.d
 LIBDIR=${DESTDIR}/lib
 SERVICEDIR=${LIBDIR}/services
@@ -14 +13 @@
 create-dirs:
         install -d -m ${DIRMODE}  ${EXTDIR}/sysconfig
-        install -d -m ${DIRMODE}  ${TMPFILESDIR}
         install -d -m ${DIRMODE}  ${SERVICEDIR}
         install -d -m ${DIRMODE}  ${UNITDIR}
@@ -22 +20 @@
 
 files: create-dirs
-        install -m ${CONFMODE} lfs/tmpfiles/nscd.conf ${TMPFILESDIR}
-        install -m ${MODE} lfs/sbin/ifup            ${SBIN}
-        install -m ${MODE} lfs/sbin/ifdown          ${SBIN}
-        install -m ${MODE} lfs/sbin/ifup.8          ${MAN8}
-        ln -sf  ifup.8                              ${MAN8}/ifdown.8
+        install -m ${MODE} lfs/sbin/ifup   ${SBIN}
+        install -m ${MODE} lfs/sbin/ifdown ${SBIN}
+        install -m ${MODE} lfs/sbin/ifup.8 ${MAN8}
+        ln -sf  ifup.8                     ${MAN8}/ifdown.8
         install -m ${MODE} lfs/lib/services/ipv4-static-route  ${SERVICEDIR}
         install -m ${MODE} lfs/lib/services/ipv4-static        ${SERVICEDIR}
         install -m ${CONFMODE} lfs/lib/services/init-functions ${SERVICEDIR}
         install -m ${CONFMODE} lfs/units/ifupdownat.service ${UNITDIR}/ifupdown@.service
-        install -m ${CONFMODE} lfs/units/nscd.service ${UNITDIR}
 
 uninstall:
-        rm -rf ${TMPFILESDIR}/nscd.conf ${SERVICEDIR} ${LIBDIR}/lsb \
-               ${UNITDIR}/ifupdown@.service ${UNITDIR}/nscd.service ${SBIN}/ifup \
-               ${SBIN}/ifdown ${MAN8}/ifup.8 ${MAN8}/ifdown.8
+        rm -rf ${SERVICEDIR} ${LIBDIR}/lsb ${UNITDIR}/ifupdown@.service \
+               ${SBIN}/ifup ${SBIN}/ifdown ${MAN8}/ifup.8 ${MAN8}/ifdown.8
 
 .PHONY: all create-dirs install files uninstall