From f8fa2f15e70a286e42e9d601aa66f2317467a2a7 Mon Sep 17 00:00:00 2001
From: matsuand <matsuand@d6661c75-0afd-443a-aae1-cb31083e41e8>
Date: Thu, 13 Sep 2018 11:02:44 +0000
Subject: [PATCH] =?utf8?q?[LFS-SVN]=20SVN-20180902,=20=E3=83=81=E3=82=A7?=
 =?utf8?q?=E3=83=B3=E3=82=B8=E3=82=BB=E3=83=83=E3=83=88=2011467-11471=20?=
 =?utf8?q?=E5=AF=BE=E5=BF=9C=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

git-svn-id: svn+ssh://svn.osdn.net/svnroot/lfsbookja/trunk@1211 d6661c75-0afd-443a-aae1-cb31083e41e8
---
 lfsbook/src/Makefile.am                 | 12 ++++++------
 lfsbook/src/Makefile.in                 | 12 ++++++------
 lfsbook/src/chapter01/jchangelog.ch     | 16 ++++++++++++++++
 lfsbook/src/chapter07/systemd-custom.ch |  6 +++---
 4 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/lfsbook/src/Makefile.am b/lfsbook/src/Makefile.am
index c5e7bed2..b8ba6f0f 100644
--- a/lfsbook/src/Makefile.am
+++ b/lfsbook/src/Makefile.am
@@ -33,7 +33,7 @@ ALLXML=$(shell find . -type d -name $(RENDERTMP) -prune -o -type f -name '*.xml'
 
 REV=@revspec@
 
-all: ctie $(srcs) stylesheets _bootscripts udev-lfs book dump-commands
+all: ctie $(srcs) stylesheets _bootscripts udev-lfs book
 
 ctie:
 	@$(MAKE) -C $(top_builddir)/$@ $@ >/dev/null
@@ -215,12 +215,12 @@ $(BASEDIR)/md5sums: stylesheets/wget-list.xsl chapter03/chapter03.xml packages.e
            "s/BOOTSCRIPTS-MD5SUM/$(shell md5sum lfs-bootscripts*.tar.bz2 | cut -d' ' -f1)/" \
            $(BASEDIR)/md5sums
 
-dump-commands: validate
-	@echo "Dumping book commands..."
-	$(XSLTPROC) --output $(DUMPDIR)/ \
-	   stylesheets/dump-commands.xsl $(RENDERTMP)/lfs-full.xml
+#dump-commands: validate
+#	@echo "Dumping book commands..."
+#	$(XSLTPROC) --output $(DUMPDIR)/ \
+#	   stylesheets/dump-commands.xsl $(RENDERTMP)/lfs-full.xml
 
 
 #all: lfs nochunks pdf dump-commands
 
-.PHONY : all dump-commands lfs nochunks pdf profile-html tmpdir validate 
+.PHONY : all lfs nochunks pdf profile-html tmpdir validate 
diff --git a/lfsbook/src/Makefile.in b/lfsbook/src/Makefile.in
index 00fca518..88aa835d 100644
--- a/lfsbook/src/Makefile.in
+++ b/lfsbook/src/Makefile.in
@@ -619,7 +619,7 @@ uninstall-am:
 .PRECIOUS: Makefile
 
 
-all: ctie $(srcs) stylesheets _bootscripts udev-lfs book dump-commands
+all: ctie $(srcs) stylesheets _bootscripts udev-lfs book
 
 ctie:
 	@$(MAKE) -C $(top_builddir)/$@ $@ >/dev/null
@@ -801,14 +801,14 @@ $(BASEDIR)/md5sums: stylesheets/wget-list.xsl chapter03/chapter03.xml packages.e
            "s/BOOTSCRIPTS-MD5SUM/$(shell md5sum lfs-bootscripts*.tar.bz2 | cut -d' ' -f1)/" \
            $(BASEDIR)/md5sums
 
-dump-commands: validate
-	@echo "Dumping book commands..."
-	$(XSLTPROC) --output $(DUMPDIR)/ \
-	   stylesheets/dump-commands.xsl $(RENDERTMP)/lfs-full.xml
+#dump-commands: validate
+#	@echo "Dumping book commands..."
+#	$(XSLTPROC) --output $(DUMPDIR)/ \
+#	   stylesheets/dump-commands.xsl $(RENDERTMP)/lfs-full.xml
 
 #all: lfs nochunks pdf dump-commands
 
-.PHONY : all dump-commands lfs nochunks pdf profile-html tmpdir validate 
+.PHONY : all lfs nochunks pdf profile-html tmpdir validate 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/lfsbook/src/chapter01/jchangelog.ch b/lfsbook/src/chapter01/jchangelog.ch
index 5415d293..3bba811b 100644
--- a/lfsbook/src/chapter01/jchangelog.ch
+++ b/lfsbook/src/chapter01/jchangelog.ch
@@ -60,6 +60,22 @@
 -->
 
    <listitem>
+      <para>2018-09-13</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matsuand] -
+          <phrase revision="sysv">SVN-20180902</phrase>
+          <phrase revision="systemd">20180902-systemd</phrase>,
+          チェンジセット
+          <ulink url="&lfs-rev-root;11467">11467</ulink> ～
+          <ulink url="&lfs-rev-root;11471">11471</ulink>
+          対応。
+          </para>
+        </listitem>
+      </itemizedlist>
+   </listitem>
+
+   <listitem>
       <para>2018-09-06</para>
       <itemizedlist>
         <listitem>
diff --git a/lfsbook/src/chapter07/systemd-custom.ch b/lfsbook/src/chapter07/systemd-custom.ch
index 22f8d53c..7bd2cd89 100644
--- a/lfsbook/src/chapter07/systemd-custom.ch
+++ b/lfsbook/src/chapter07/systemd-custom.ch
@@ -418,12 +418,12 @@
 @x
           <emphasis>Disable at build-time</emphasis>: You can enable
           lingering by default while building systemd by adding the switch
-          <parameter>--without-kill-user-processes</parameter> to the
-          <command>configure</command> command for systemd. This completely
+          <parameter>-Ddefault-kill-user-processes=no</parameter> to the
+          <command>meson</command> command for systemd. This completely
           disables the ability of systemd to kill user processes at session
           end.
 @y
           <emphasis>機能変更をビルド時に無効化する方法</emphasis>:
-          プロセス継続をデフォルトとするために systemd のビルド時に <command>configure</command> コマンドにおいて <parameter>--without-kill-user-processes</parameter> スイッチを指定する方法があります。
+          プロセス継続をデフォルトとするために systemd のビルド時に <command>meson</command> コマンドにおいて <parameter>-Ddefault-kill-user-processes=no</parameter> スイッチを指定する方法があります。
           この方法をとれば、systemd がセッション終了時にユーザープロセスを終了させてしまう機能を完全に無効化することができます。
 @z
\ No newline at end of file
-- 
2.11.0