Changeset 8d55018 for BOOK

Timestamp:

Feb 19, 2016, 8:38:23 PM (9 years ago)

Author:

Chris Staub <chris@…>

Branches:

master, systemd

Children:

e3e2a37

Parents:

57fc8e7

Message:

Prevent bashbug from being installed to /bin

Location:

BOOK

Files:

• final-system/common/bash.xml (modified) (2 diffs)
• final-system/multilib/bash.xml (modified) (2 diffs)
• introduction/common/changelog.xml (modified) (1 diff)

BOOK/final-system/common/bash.xml

@@ -34 +34 @@
 <screen os="b"><userinput>./configure \
     --prefix=/usr \
-    --bindir=/bin \
     --without-bash-malloc \
     --with-installed-readline \
@@ -65 +64 @@
 <screen os="h"><userinput>make install</userinput></screen>
 
-    <para os="i">Run the newly compiled <command>bash</command> program (replacing
+    <para os="i">Move the <command>bash</command> binary to
+    <filename class="directory">/bin</filename>, overwriting the symlink
+    that was previously created:</para>
+
+<screen os="j"><userinput>mv -v /usr/bin/bash /bin</userinput></screen>
+
+    <para os="k">Run the newly compiled <command>bash</command> program (replacing
     the one that is currently being executed):</para>
 
-<screen os="j" role="nodump"><userinput>exec /bin/bash --login +h</userinput></screen>
+<screen os="l" role="nodump"><userinput>exec /bin/bash --login +h</userinput></screen>
 
-    <note os="k">
+    <note os="m">
       <para>The parameters used make the <command>bash</command>
       process an interactive login shell and continue to disable hashing so

BOOK/final-system/multilib/bash.xml

@@ -42 +42 @@
 ./configure \
     --prefix=/usr \
-    --bindir=/bin \
     --without-bash-malloc \
     --with-installed-readline \
@@ -87 +86 @@
     xpointer="xpointer(//*[@os='k'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/bash.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/bash.xml"
+    xpointer="xpointer(//*[@os='m'])"/>
+
   </sect2>
 

BOOK/introduction/common/changelog.xml

@@ -55 +55 @@
           <ulink url="&clfs-ticket-root;1104">#1104.</ulink></para>
         </listitem>
+        <listitem>
+          <para>[Chris] - Prevented the <command>bashbug</command> script
+          from being installed in <filename class="directory">/bin</filename>,
+          as it is not needed there. Fixes ticket
+          <ulink url="&clfs-ticket-root;1099">#1099.</ulink></para>
+        </listitem>
       </itemizedlist>
     </listitem>