From 1dd7b0aecec9185e669e24077bef3d95562c87f5 Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pieere@linuxfromscratch.org>
Date: Sat, 18 Feb 2017 21:51:19 +0000
Subject: [PATCH] Fix a few minor issues

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@18341 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general/sysutils/logrotate.xml        | 14 ++++++++------
 postlfs/filesystems/smartmontools.xml | 16 ++++++++++++++++
 postlfs/security/tripwire.xml         |  9 +++++++++
 pst/scanning/sane.xml                 |  2 +-
 server/major/vsftpd.xml               |  6 +++---
 5 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/general/sysutils/logrotate.xml b/general/sysutils/logrotate.xml
index 901028d86f..3800398112 100644
--- a/general/sysutils/logrotate.xml
+++ b/general/sysutils/logrotate.xml
@@ -100,8 +100,9 @@
       command:
     </para>
 
-<screen><userinput>./autogen.sh &amp;&amp;
-./configure --prefix=/usr &amp;&amp;
+<screen><userinput>sed 's/-Werror//' Makefile.am &amp;&amp;
+./autogen.sh                  &amp;&amp;
+./configure --prefix=/usr     &amp;&amp;
 make</userinput></screen>
 
     <para>
@@ -115,16 +116,17 @@ make</userinput></screen>
 <screen role="root"><userinput>make install</userinput></screen>
 
   </sect2>
-<!--
+
   <sect2 role="commands">
     <title>Command Explanations</title>
 
     <para>
-      <envar>MANDIR=/usr/share/man</envar>: Ensure the man pages are installed
-      in the correct location.
+      <command>sed 's/-Werror//' Makefile.am</command>: Prevents the compiler
+      to stop with error when a warning is issued, since GCC 6 has introduced
+      a lot more warnings, which are triggered by the code.
     </para>
 
-  </sect2>-->
+  </sect2>
 
   <sect2 role="configuration">
      <title>Configuring Logrotate</title>
diff --git a/postlfs/filesystems/smartmontools.xml b/postlfs/filesystems/smartmontools.xml
index 71dc96117e..67e7d2af74 100644
--- a/postlfs/filesystems/smartmontools.xml
+++ b/postlfs/filesystems/smartmontools.xml
@@ -97,6 +97,22 @@ make</userinput></screen>
 
 <screen role="root"><userinput>make install</userinput></screen>
 
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring smartmontools</title>
+
+    <sect3 id="smartmontools-config">
+      <title>Config File</title>
+      <para>
+        <filename>/etc/smartd.conf</filename>
+      </para>
+
+      <indexterm zone="smartmontools smartmontools-config">
+        <primary sortas="e-etc-smartd.conf">/etc/smartd.conf</primary>
+      </indexterm>
+    </sect3>
+
     <sect3>
       <title>Configuration Information</title>
 
diff --git a/postlfs/security/tripwire.xml b/postlfs/security/tripwire.xml
index 95c6e4322e..2d799809f3 100644
--- a/postlfs/security/tripwire.xml
+++ b/postlfs/security/tripwire.xml
@@ -128,6 +128,15 @@ cp -v policy/*.txt /usr/share/doc/tripwire-&tripwire-version;</userinput></scree
         Of course, you should do this with dummy passwords and change them
 	later.
       </para>
+
+      <para>
+        Another issue when scripting is that the installer exits when the
+        standard input is not a terminal. You may disable this beahvior
+        with the following sed:
+      </para>
+
+<screen><userinput>sed '/-t 0/,+3d' -i installer/install.sh</userinput></screen>
+
     </note>
 
   </sect2>
diff --git a/pst/scanning/sane.xml b/pst/scanning/sane.xml
index 95249a3ce3..4c75fb54e5 100644
--- a/pst/scanning/sane.xml
+++ b/pst/scanning/sane.xml
@@ -161,7 +161,7 @@
       group.  Create this group by issuing the following commands as the
       <systemitem class="username">root</systemitem> user:</para>
 
-<screen><userinput>groupadd -g 70 scanner</userinput></screen>
+<screen role="root"><userinput>groupadd -g 70 scanner</userinput></screen>
 
       <note>
         <para>
diff --git a/server/major/vsftpd.xml b/server/major/vsftpd.xml
index 0ac1552997..cf82bf6735 100644
--- a/server/major/vsftpd.xml
+++ b/server/major/vsftpd.xml
@@ -181,11 +181,11 @@ EOF</userinput></screen>
       <filename>/etc/vsftpd.conf</filename> file (as the
       <systemitem class="username">root</systemitem> user):</para>
 
-<screen><userinput role="root">cat &gt;&gt; /etc/vsftpd.conf &lt;&lt; "EOF"
+<screen role="root"><userinput>cat &gt;&gt; /etc/vsftpd.conf &lt;&lt; "EOF"
 <literal>local_enable=YES</literal>
 EOF</userinput></screen>
 
-      <para>In additon, if using <application>Linux-PAM</application> and
+      <para>In addition, if using <application>Linux-PAM</application> and
       <application>vsftpd</application> with local user logins, you will need
       a <application>Linux-PAM</application> configuration file. As the
       <systemitem class="username">root</systemitem> user, create the
@@ -193,7 +193,7 @@ EOF</userinput></screen>
       configuration changes for <application>Linux-PAM</application> session
       support using the following commands:</para>
 
-<screen><userinput role="root">cat &gt; /etc/pam.d/vsftpd &lt;&lt; "EOF" &amp;&amp;
+<screen role="root"><userinput>cat &gt; /etc/pam.d/vsftpd &lt;&lt; "EOF" &amp;&amp;
 <literal># Begin /etc/pam.d/vsftpd
 auth       required     /lib/security/pam_listfile.so item=user sense=deny \
                                                       file=/etc/ftpusers \