aboutsummaryrefslogtreecommitdiffstats
path: root/chapter06
diff options
context:
space:
mode:
authorMatthew Burgess <matthew@linuxfromscratch.org>2009-03-12 21:02:01 +0000
committerMatthew Burgess <matthew@linuxfromscratch.org>2009-03-12 21:02:01 +0000
commitc92413c55029fdc26cdd1b82a86558745153f3ce (patch)
tree150460c268bc36bd97960d88b99c64d1e31b6246 /chapter06
parentd1b03c872e3dcc6867febf8b613a7a4142949a19 (diff)
Use Inetutils' version of hostname, rather than Coreutils' version. Fixes #2364.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8836 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter06')
-rw-r--r--chapter06/chapter06.xml2
-rw-r--r--chapter06/coreutils.xml16
-rw-r--r--chapter06/inetutils.xml12
3 files changed, 15 insertions, 15 deletions
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index 2815a7242..55e2bea5c 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -39,6 +39,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="readline.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bash.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libtool.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="inetutils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="perl.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="autoconf.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="automake.xml"/>
@@ -51,7 +52,6 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gettext.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="groff.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gzip.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="inetutils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="iproute2.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="kbd.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="less.xml"/>
diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml
index 3e2f1d3c8..6768b94b1 100644
--- a/chapter06/coreutils.xml
+++ b/chapter06/coreutils.xml
@@ -64,7 +64,7 @@ esac</userinput></screen>
<para>Now prepare Coreutils for compilation:</para>
-<screen><userinput remap="configure">./configure --prefix=/usr --enable-install-program=hostname \
+<screen><userinput remap="configure">./configure --prefix=/usr \
--enable-no-install-program=kill,uptime</userinput></screen>
<variablelist>
@@ -122,7 +122,7 @@ esac</userinput></screen>
<para>Move programs to the locations specified by the FHS:</para>
<screen><userinput remap="install">mv -v /usr/bin/{cat,chgrp,chmod,chown,cp,date,dd,df,echo} /bin
-mv -v /usr/bin/{false,hostname,ln,ls,mkdir,mknod,mv,pwd,readlink,rm} /bin
+mv -v /usr/bin/{false,ln,ls,mkdir,mknod,mv,pwd,readlink,rm} /bin
mv -v /usr/bin/{rmdir,stty,sync,true,uname} /bin
mv -v /usr/bin/chroot /usr/sbin</userinput></screen>
@@ -146,7 +146,7 @@ mv -v /usr/bin/chroot /usr/sbin</userinput></screen>
<seglistitem>
<seg>base64, basename, cat, chgrp, chmod, chown, chroot, cksum, comm,
cp, csplit, cut, date, dd, df, dir, dircolors, dirname, du, echo, env,
- expand, expr, factor, false, fmt, fold, groups, head, hostid, hostname,
+ expand, expr, factor, false, fmt, fold, groups, head, hostid,
id, install, join, link, ln, logname, ls, md5sum, mkdir, mkfifo, mknod,
mktemp, mv, nice, nl, nohup, od, paste, pathchk, pinky, pr, printenv, printf,
ptx, pwd, readlink, rm, rmdir, seq, sha1sum, sha224sum, sha256sum,
@@ -482,16 +482,6 @@ mv -v /usr/bin/chroot /usr/sbin</userinput></screen>
</listitem>
</varlistentry>
- <varlistentry id="hostname">
- <term><command>hostname</command></term>
- <listitem>
- <para>Reports or sets the name of the host</para>
- <indexterm zone="ch-system-coreutils hostname">
- <primary sortas="b-hostname">hostname</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
<varlistentry id="id">
<term><command>id</command></term>
<listitem>
diff --git a/chapter06/inetutils.xml b/chapter06/inetutils.xml
index 2a7ff265d..80fc9fe3b 100644
--- a/chapter06/inetutils.xml
+++ b/chapter06/inetutils.xml
@@ -132,7 +132,7 @@
<segtitle>Installed programs</segtitle>
<seglistitem>
- <seg>ftp, ping, ping6, rcp, rlogin, rsh, talk, telnet, and tftp</seg>
+ <seg>ftp, hostname, ping, ping6, rcp, rlogin, rsh, talk, telnet, and tftp</seg>
</seglistitem>
</segmentedlist>
@@ -151,6 +151,16 @@
</listitem>
</varlistentry>
+ <varlistentry id="hostname">
+ <term><command>hostname</command></term>
+ <listitem>
+ <para>Reports or sets the name of the host</para>
+ <indexterm zone="ch-system-inetutils hostname">
+ <primary sortas="b-hostname">hostname</primary>
+ </indexterm>
+ </listitem>
+ </varlistentry>
+
<varlistentry id="ping">
<term><command>ping</command></term>
<listitem>