Author: thomas
Date: Tue Nov 28 10:10:14 2017
New Revision: 19547

Log:
Version 2.9.1, fix #10078
Add files to mkinitramfs

Modified:
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/packages.ent
   trunk/BOOK/postlfs/editors/nano.xml
   trunk/BOOK/postlfs/filesystems/initramfs.xml

Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml       Tue Nov 28 07:25:30 
2017        (r19546)
+++ trunk/BOOK/introduction/welcome/changelog.xml       Tue Nov 28 10:10:14 
2017        (r19547)
@@ -42,6 +42,20 @@
     </listitem>
 -->
     <listitem>
+      <para>November 28th, 2017</para>
+      <itemizedlist>
+        <listitem>
+          <para>[thomas] - Update to nano-2.9.1. Fixes
+          <ulink url="&blfs-ticket-root;10078">#10078</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[thomas] - Add readlink and basename to mkinitramfs.
+          Required in some udev rules.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>November 27th, 2017</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/packages.ent
==============================================================================
--- trunk/BOOK/packages.ent     Tue Nov 28 07:25:30 2017        (r19546)
+++ trunk/BOOK/packages.ent     Tue Nov 28 10:10:14 2017        (r19547)
@@ -70,7 +70,7 @@
 <!ENTITY emacs-version                "25.3">
 <!ENTITY joe-version                  "4.5">
 <!ENTITY juffed-version               "0.10.r71.gc3c1a3f">
-<!ENTITY nano-version                 "2.9.0">
+<!ENTITY nano-version                 "2.9.1">
 <!ENTITY vim-version                  "8.0.586">
 <!ENTITY vim-majmin                   "80">
 

Modified: trunk/BOOK/postlfs/editors/nano.xml
==============================================================================
--- trunk/BOOK/postlfs/editors/nano.xml Tue Nov 28 07:25:30 2017        (r19546)
+++ trunk/BOOK/postlfs/editors/nano.xml Tue Nov 28 10:10:14 2017        (r19547)
@@ -7,7 +7,7 @@
   <!-- Note minor version in URL -->
   <!ENTITY nano-download-http 
"https://www.nano-editor.org/dist/v2.9/nano-&nano-version;.tar.xz";>
   <!ENTITY nano-download-ftp  " ">
-  <!ENTITY nano-md5sum        "a7f0a70fea21431745aa07ee2c5c8d3a">
+  <!ENTITY nano-md5sum        "ecb29612c30996d0d1139b47d3a413ba">
   <!ENTITY nano-size          "1.4 MB">
   <!ENTITY nano-buildsize     "17 MB">
   <!ENTITY nano-time          "0.2 SBU">
@@ -166,14 +166,12 @@
 set smooth
 set suspend</literal></screen>
 
-      <para>You probably want to create the directory
-        <filename class="directory">$HOME/.local/share/nano</filename>.
-        This is where <application>Nano</application> will store search
-        and position log files. Required only if you have either historylog
-        and/or positionlog enabled. When using those settings in a system-wide
-        configuration, you may want to update
-        <filename class="directory">/etc/skel</filename> to make the
-        directory available for all (new) users.
+      <para>If you want <application>Nano</application> to store
+        search and position log files, make sure that the directory 
+        <filename class="directory">$HOME/.local/share</filename> exists.
+        When using those settings in a system-wide configuration, you 
+        should update <filename class="directory">/etc/skel</filename> to
+        make the directory available for all (new) users.
       </para>
 
       <para>

Modified: trunk/BOOK/postlfs/filesystems/initramfs.xml
==============================================================================
--- trunk/BOOK/postlfs/filesystems/initramfs.xml        Tue Nov 28 07:25:30 
2017        (r19546)
+++ trunk/BOOK/postlfs/filesystems/initramfs.xml        Tue Nov 28 10:10:14 
2017        (r19547)
@@ -93,6 +93,7 @@
 
 binfiles="sh cat cp dd killall ls mkdir mknod mount "
 binfiles="$binfiles umount sed sleep ln rm uname"
+binfiles="$binfiles readlink basename"
 
 # Systemd installs udevadm in /bin. Other udev implementations have it in /sbin
 if [ -x /bin/udevadm ] ; then binfiles="$binfiles udevadm"; fi
@@ -113,10 +114,11 @@
 WDIR=$(mktemp -d /tmp/initrd-work.XXXXXXXXXX)
 
 # Create base directory structure
-mkdir -p $WDIR/{bin,dev,lib/firmware,run,sbin,sys,proc}
+mkdir -p $WDIR/{bin,dev,lib/firmware,run,sbin,sys,proc,usr}
 mkdir -p $WDIR/etc/{modprobe.d,udev/rules.d}
 touch $WDIR/etc/modprobe.d/modprobe.conf
 ln -s lib $WDIR/lib64
+ln -s ../bin $WDIR/usr/bin
 
 # Create necessary device nodes
 mknod -m 640 $WDIR/dev/console c 5 1
@@ -153,8 +155,9 @@
 
 # Install basic binaries
 for f in $binfiles ; do
-  ldd /bin/$f | sed "s/\t//" | cut -d " " -f1 &gt;&gt; $unsorted
-  copy $f bin
+  if [ -e /bin/$f ]; then d="/bin"; else d="/usr/bin"; fi
+  ldd $d/$f | sed "s/\t//" | cut -d " " -f1 &gt;&gt; $unsorted
+  copy $d/$f bin
 done
 
 # Add lvm if present
-- 
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

Reply via email to