Changeset 89265b09


Ignore:
Timestamp:
07/11/2021 04:34:32 PM (5 months ago)
Author:
Thomas Trepl (Moody) <thomas@…>
Branches:
11.0, ken/refactor-virt, lazarus, qt5new, trunk
Children:
68c127d
Parents:
5f23d48f
Message:

Tweak autofs for merged-/usr mode

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • general.ent

    r5f23d48f r89265b09  
    9191<!-- End LFS versions -->
    9292
    93 <!ENTITY blfs-bootscripts-version     "20210110">
     93<!ENTITY blfs-bootscripts-version     "20210711">
    9494<!ENTITY systemd-units-version        "20210122">
    9595
  • general/sysutils/autofs.xml

    r5f23d48f r89265b09  
    133133    </para>
    134134
    135 <screen revision="sysv"><userinput>./configure --prefix=/         \
    136             --with-libtirpc    \
    137             --without-openldap \
     135<screen revision="sysv"><userinput>./configure --prefix=/usr             \
     136            --with-mapdir=/etc/autofs \
     137            --with-libtirpc           \
     138            --without-openldap        \
    138139            --mandir=/usr/share/man &amp;&amp;
    139140make</userinput></screen>
    140141
    141 <screen revision="systemd"><userinput>./configure --prefix=/         \
    142             --with-libtirpc    \
    143             --with-systemd     \
    144             --without-openldap \
     142<screen revision="systemd"><userinput>./configure --prefix=/usr             \
     143            --with-mapdir=/etc/autofs \
     144            --with-libtirpc           \
     145            --with-systemd            \
     146            --without-openldap        \
    145147            --mandir=/usr/share/man &amp;&amp;
    146148make</userinput></screen>
     
    204206      <para>
    205207        <filename>/etc/sysconfig/autofs.conf</filename>,
    206         <filename>/etc/auto.master</filename>,
    207         <filename>/etc/auto.misc</filename>, and
    208         <filename>/etc/auto.net</filename>
     208        <filename>/etc/autofs/auto.master</filename>,
     209        <filename>/etc/autofs/auto.misc</filename>, and
     210        <filename>/etc/autofs/auto.net</filename>
    209211      </para>
    210212
     
    214216
    215217      <indexterm zone="autofs autofs-config">
    216         <primary sortas="e-etc-auto.master">/etc/auto.master</primary>
     218        <primary sortas="e-etc-auto.master">/etc/autofs/auto.master</primary>
    217219      </indexterm>
    218220
    219221      <indexterm zone="autofs autofs-config">
    220         <primary sortas="e-etc-auto.misc">/etc/auto.misc</primary>
     222        <primary sortas="e-etc-auto.misc">/etc/autofs/auto.misc</primary>
    221223      </indexterm>
    222224
    223225      <indexterm zone="autofs autofs-config">
    224         <primary sortas="e-etc-auto.net">/etc/auto.net</primary>
     226        <primary sortas="e-etc-auto.net">/etc/autofs/auto.net</primary>
    225227      </indexterm>
    226228
     
    238240      </para>
    239241
    240 <screen role="root"><userinput>mv /etc/auto.master /etc/auto.master.bak &amp;&amp;
    241 cat &gt; /etc/auto.master &lt;&lt; "EOF"
    242 <literal># Begin /etc/auto.master
    243 
    244 /media/auto  /etc/auto.misc  --ghost
    245 #/home        /etc/auto.home
    246 
    247 # End /etc/auto.master</literal>
     242<screen role="root"><userinput>mv /etc/autofs/auto.master /etc/autofs/auto.master.bak &amp;&amp;
     243cat &gt; /etc/autofs/auto.master &lt;&lt; "EOF"
     244<literal># Begin /etc/autofs/auto.master
     245
     246/media/auto  /etc/autofs/auto.misc  --ghost
     247#/home        /etc/autofs/auto.home
     248
     249# End /etc/autofs/auto.master</literal>
    248250EOF</userinput></screen>
    249251
     
    252254        <filename>/media/auto</filename> that will overlay any existing
    253255        directory of the same name.  In this example, the file,
    254         <filename>/etc/auto.misc</filename>, has a line:
     256        <filename>/etc/autofs/auto.misc</filename>, has a line:
    255257      </para>
    256258
     
    324326        <application>autofs</application> installs its own
    325327        boot script, but it has no capability for logging or visual conformance
    326         with other BLFS scripts.
     328        with other BLFS scripts. It will be replaced by an enhanced version.
    327329      </para>
    328330
     
    385387          mount_nfs4.so, parse_amd.so, and parse_sun.so
    386388           </seg>
    387         <seg>/lib/autofs</seg>
     389        <seg>/usr/lib/autofs, /etc/autofs</seg>
    388390      </seglistitem>
    389391    </segmentedlist>
  • introduction/welcome/changelog.xml

    r5f23d48f r89265b09  
    4646      <itemizedlist>
    4747        <listitem>
     48          <para>[thomas] - Adapt autofs to merged-/usr changes. Partially
     49          fixes <ulink url="&blfs-ticket-root;15223">#15223</ulink>.</para>
     50        </listitem>
     51        <listitem>
    4852          <para>[thomas] - Update to mpg123-1.28.1. Fixes
    4953          <ulink url="&blfs-ticket-root;15265">#15265</ulink>.</para>
Note: See TracChangeset for help on using the changeset viewer.