Changeset f350508


Ignore:
Timestamp:
06/09/2014 02:57:13 PM (8 years ago)
Author:
Pierre Labastie <pieere@…>
Branches:
10.0, 10.1, 11.0, 11.1, 7.10, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, krejzi/svn, lazarus, nosym, perl-modules, qt5new, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/test-20220226
Children:
b04b4154
Parents:
6dc6bf4
Message:

Improve detection and handling of udevd in mkinitramfs;
Put correct date in changelog.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@13215 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • general.ent

    r6dc6bf4 rf350508  
    11<!-- $LastChangedBy$ $Date$ -->
    22
    3 <!ENTITY day          "08">                   <!-- Always 2 digits -->
     3<!ENTITY day          "09">                   <!-- Always 2 digits -->
    44<!ENTITY month        "06">                   <!-- Always 2 digits -->
    55<!ENTITY year         "2014">
     
    77<!ENTITY copyholder   "The BLFS Development Team">
    88<!ENTITY version      "&year;-&month;-&day;">
    9 <!ENTITY releasedate  "June 8th, &year;">
     9<!ENTITY releasedate  "June 9th, &year;">
    1010<!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
    1111<!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
  • introduction/welcome/changelog.xml

    r6dc6bf4 rf350508  
    4545-->
    4646    <listitem>
    47       <para>June 8th, 2014</para>
    48       <itemizedlist>
     47      <para>June 9th, 2014</para>
     48      <itemizedlist>
     49        <listitem>
     50          <para>[pierre] - Improve detection and handling of udevd in
     51          mkinitramfs.</para>
     52        </listitem>
    4953        <listitem>
    5054          <para>[pierre] - Eudev-1.7 (Udev-extras). Fixes
    5155          <ulink url="&blfs-ticket-root;5128">#5128</ulink>.</para>
    5256        </listitem>
     57      </itemizedlist>
     58    </listitem>
     59
     60    <listitem>
     61      <para>June 8th, 2014</para>
     62      <itemizedlist>
    5363        <listitem>
    5464          <para>[fernando] - MariaDB-10.0.11: move switch
  • postlfs/filesystems/initramfs.xml

    r6dc6bf4 rf350508  
    9595binfiles="$binfiles umount sed sleep ln rm uname"
    9696
    97 sbinfiles="udevadm modprobe blkid switch_root"
     97# Systemd installs udevadm in /bin. Other udev implementations have it in /sbin
     98if [ -x /bin/udevadm ] ; then binfiles="$binfiles udevadm"; fi
     99
     100sbinfiles="modprobe blkid switch_root"
    98101
    99102#Optional files and locations
    100 for f in mdadm udevd; do
     103for f in mdadm udevd udevadm; do
    101104  if [ -x /sbin/$f ] ; then sbinfiles="$sbinfiles $f"; fi
    102105done
     
    132135cp -a /lib/firmware $WDIR/lib
    133136
    134 # Copy the RAID configureation file if present
     137# Copy the RAID configuration file if present
    135138if [ -f /etc/mdadm.conf ] ; then
    136139  cp /etc/mdadm.conf $WDIR/etc
     
    165168# Add udevd libraries if not in /sbin
    166169if [ -x /lib/udev/udevd ] ; then
    167   ldd /lib/udev/udevd | sed "s/\t//" | cut -d " " -f1 >> $unsorted
     170  ldd /lib/udev/udevd | sed "s/\t//" | cut -d " " -f1 &gt;&gt; $unsorted
     171elif [ -x /lib/systemd/systemd-udevd ] ; then
     172  ldd /lib/systemd/systemd-udevd | sed "s/\t//" | cut -d " " -f1 &gt;&gt; $unsorted
    168173fi
    169174
     
    209214done
    210215
    211 cp -a /lib/udev $WDIR/lib
     216if [ -d /lib/udev ]; then
     217  cp -a /lib/udev $WDIR/lib
     218fi
     219if [ -d /lib/systemd ]; then
     220  cp -a /lib/systemd $WDIR/lib
     221fi
    212222
    213223# Install the kernel modules if requested
     
    322332# udevd location depends on version
    323333if [ -x /sbin/udevd ]; then
    324   UDEV_PATH=/sbin
     334  UDEVD=/sbin/udevd
     335elif [ -x /lib/udev/udevd ]; then
     336  UDEVD=/lib/udev/udevd
     337elif [ -x /lib/systemd/systemd-udevd ]; then
     338  UDEVD=/lib/systemd/systemd-udevd
    325339else
    326   UDEV_PATH=/lib/udev
    327 fi
    328 
    329 ${UDEV_PATH}/udevd --daemon --resolve-names=never
     340  echo "Cannot find udevd nor systemd-udevd"
     341  problem
     342fi
     343
     344${UDEVD} --daemon --resolve-names=never
    330345udevadm trigger
    331346udevadm settle
     
    337352do_mount_root
    338353
    339 killall -w ${UDEV_PATH}/udevd
     354killall -w ${UDEVD##*/}
    340355
    341356exec switch_root /.root "$init" "$@"
Note: See TracChangeset for help on using the changeset viewer.