Changeset efd5d1f

Timestamp:

05/30/2016 04:37:33 AM (7 years ago)

Author:

DJ Lucas <dj@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 7.10, 7.10-rc1, 8.0, 8.0-rc1, 8.1, 8.1-rc1, 8.1-rc2, 8.2, 8.2-rc1, 8.3, 8.3-rc1, 8.3-rc2, 8.4, 8.4-rc1, 9.0, 9.0-rc1, 9.1, 9.1-rc1, arm, bdubbs/gcc13, cross-chap5, ml-11.0, multilib, nosym, old-trunk, s6-init, trunk, xry111/arm64, xry111/clfs-ng, xry111/git-transition, xry111/glibc-2.34, xry111/glibc-2.37, xry111/kcfg-revise, xry111/lfs-next, xry111/pip3, xry111/queue-11.3, xry111/rust-wip-20221008, xry111/tester-nohack, xry111/usr-move

Children:

26c49f6

Parents:

9a0d741

Message:

Merge symlinks.xml and symlinksd.xml.

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11084 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Location:

chapter07

Files:

• chapter07.xml (modified) (2 diffs)
• etcshellsd.xml (deleted)
• symlinks.xml (modified) (2 diffs)
• symlinksd.xml (deleted)

chapter07/chapter07.xml

@@ -18 +18 @@
   <!-- systemd -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="introductiond.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="networkd.xml"/>
+
   <!-- common -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="udev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="symlinks.xml"/>
 
   <!-- sysv -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="symlinks.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="network.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="usage.xml"/>
@@ -28 +30 @@
 
   <!-- systemd -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="networkd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="symlinksd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="clock.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="consoled.xml"/>

chapter07/symlinks.xml

@@ -6 +6 @@
 ]>
 
-<sect1 id="ch-scripts-symlinks" revision="sysv">
+<sect1 id="ch-scripts-symlinks">
   <?dbhtml filename="symlinks.html"?>
 
   <title>Managing Devices</title>
 
-  <sect2>
+  <sect2 revision="sysv">
 
     <title>Network Devices</title>
@@ -114 +114 @@
 
     </sect3>
-<!--
-    <sect3>
-      <title>Custom Naming in Systemd</title>
-   
-      <para>Network interface names can also be customized with a set of
-      files spcific to systemd.  A file with a name such as 10-eth0.link
-      in the /etc/systemd/network directory can set an interface name. All
-      files in the directory will be applied in lexical order.  Files
-      in the /lib/systemd/network directory with the same name as those
-      in /etc/systemd/network will be overridden.  See the man page
-      for systemd.link for a full explanation.</para>
-
-      <para>An example file looks like:</para>
-
-<screen role="nodump">[Match]
-MACAddress=12:34:56:78:9a:bc
-Driver=brcmsmac
-Path=pci-0000:02:00.0-*
-Type=wlan
-Virtualization=no
-Host=my-laptop
-Architecture=x86-64
-
-[Link]
-Name=wireless0
-MTUBytes=1450
-BitsPerSecond=10M
-WakeOnLan=magic
-MACAddress=cb:a9:87:65:43:21</screen>
-
-    <para>The [Match] section specifies when to apply the rule.  In 
-    the example above, the entries can be shortened to the minimum 
-    needed to uniquely identify the network device.  Similarly,
-    the [Link] section only needs to specify the changes from the 
-    default that are desired.  In many cases, the only thing needed is 
-    the Name entry.</para>
-
-    </sect3>
--->
+
   </sect2>
 
-  <sect2>
+  <sect2 revision="sysv">
 
     <title>CD-ROM symlinks</title>