Ignore:
Timestamp:
Apr 20, 2014, 8:57:39 AM (11 years ago)
Author:
Chris Staub <chris@…>
Children:
0be79ea
Parents:
88ef769 (diff), 578ca586 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'systemd' into simp

Conflicts:

BOOK/final-system/common/bash.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/bash.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/general.ent
BOOK/packages.ent
BOOK/temp-system/common/bash.xml
BOOK/temp-system/mips64-64-chapter.xml
BOOK/temp-system/mips64-chapter.xml
BOOK/temp-system/multilib/bash.xml
BOOK/temp-system/ppc64-64-chapter.xml
BOOK/temp-system/ppc64-chapter.xml
BOOK/temp-system/sparc64-64-chapter.xml
BOOK/temp-system/sparc64-chapter.xml
BOOK/temp-system/x86_64-64-chapter.xml
BOOK/temp-system/x86_64-chapter.xml

File:
1 edited

Legend:

Unmodified
Added
Removed
  • BOOK/network/common/hostname.xml

    r88ef769 r03e6a40  
    99  <?dbhtml filename="hostname.html"?>
    1010
    11   <title>Configuring the localnet Script</title>
     11  <title>Configuring the system hostname</title>
    1212
    1313  <indexterm zone="ch-network-hostname">
    14     <primary sortas="d-localnet">localnet</primary>
     14    <primary sortas="d-hostname">hostname</primary>
    1515  <secondary>configuring</secondary></indexterm>
    1616
    17   <para>Part of the job of the <command>localnet</command> script is
    18   setting the system's hostname. This needs to be configured in the
    19   <filename>/etc/sysconfig/network</filename> file.</para>
     17  <para>Systemd reads <filename>/etc/hostname</filename> to determine which
     18  hostname should be set.</para>
    2019
    21   <para>Create the <filename>/etc/sysconfig/network</filename> file
    22   and enter a hostname by running:</para>
     20  <para>Create the <filename>/etc/hostname</filename> file and enter a hostname
     21  by running:</para>
    2322
    24   <screen><userinput>echo "HOSTNAME=<replaceable>[clfs]</replaceable>" &gt; /etc/sysconfig/network</userinput></screen>
     23  <screen><userinput>echo "<replaceable>[clfs]</replaceable>" &gt; /etc/hostname</userinput></screen>
    2524
    2625  <para><replaceable>[clfs]</replaceable> needs to be replaced with the
Note: See TracChangeset for help on using the changeset viewer.