Changeset 339d477

Timestamp:

08/22/2014 03:40:22 PM (10 years ago)

Author:

Krejzi <krejzi@…>

Branches:

systemd-11177

Children:

d3f5d5f8

Parents:

e3692bdf

Message:

Fix sed alignment, typo and remove empty line from lo instructions, merge trunk.

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

Files:

• introduction/welcome/changelog.xml (modified) (1 diff)
• postlfs/security/openssh-systemd.xml (modified) (1 diff)
• xsoft/office/libreoffice.xml (modified) (3 diffs)

introduction/welcome/changelog.xml

@@ -48 +48 @@
       <itemizedlist>
         <listitem>
-          <para>[cjg] - Update to libreoffice-4.3.0.4. fixes
+          <para>[cjg] - Update to libreoffice-4.3.0.4. Fixes
           <ulink url="&blfs-ticket-root;5311">#5311</ulink>.</para>
         </listitem>
         <listitem>
-          <para>[name] - Another changelog entry.</para>
+          <para>[igor] - Use ssh-copy-id shell wrapper for copying OpenSSH
+          public key. Fixes
+          <ulink url="&blfs-ticket-root;5368">#5368</ulink>.</para>
         </listitem>
       </itemizedlist>

postlfs/security/openssh-systemd.xml

@@ -259 +259 @@
         <command>ssh-keygen</command> and then copy ~/.ssh/id_rsa.pub to
         ~/.ssh/authorized_keys on the remote computer that you want to log into.
-        You'll need to change REMOTE_HOSTNAME for the hostname of the remote
-        computer and you'll also need to enter you password for the ssh command
+        You'll need to change REMOTE_USERNAME and REMOTE_HOSTNAME for the username and hostname of the remote
+        computer and you'll also need to enter your password for the ssh-copy-id command
         to succeed:
       </para>
 
 <screen><userinput>ssh-keygen &amp;&amp;
-public_key="$(cat ~/.ssh/id_rsa.pub)" &amp;&amp;
-ssh REMOTE_HOSTNAME "echo ${public_key} &gt;&gt; ~/.ssh/authorized_keys" &amp;&amp;
-unset public_key</userinput></screen>
+ssh-copy-id -i ~/.ssh/id_rsa.pub <replaceable>REMOTE_USERNAME</replaceable>@<replaceable>REMOTE_HOSTNAME</replaceable></userinput></screen>
 
       <para>

xsoft/office/libreoffice.xml

@@ -303 +303 @@
 
     <para>
-     For i686 systems, fix a problem inroduced by
+     For i686 systems, fix a problem introduced by
      <application>&gcc-490;</application>:
     </para>
@@ -320 +320 @@
 
 sed -e "/distro-install-file-lists/d"           \
-    -e "s:fetch_Download_item:&amp;_unchecked:" \
+    -e "s:fetch_Download_item:&amp;_unchecked:"     \
     -e "/fetch_Download_item/s:,no-check::"     \
    -i Makefile.in                                  &amp;&amp;
@@ -341 +341 @@
              --disable-postgresql-sdbc   \
              --enable-release-build      \
-             --enable-python=system      \
-            <!-- - -with-system-boost    \ -->
+             --enable-python=system      \<!--
+             - -with-system-boost    \ -->
              --with-system-clucene       \
              --with-system-cairo         \