hostname/hostname-rh.patch
Jiri Popelka 3ba95970d3 3.09
2011-12-29 12:21:33 +01:00

123 lines
4.0 KiB
Diff

diff -up hostname/hostname.1.rh hostname/hostname.1
--- hostname/hostname.1.rh 2011-12-28 15:13:29.000000000 +0100
+++ hostname/hostname.1 2011-12-29 12:17:57.000000000 +0100
@@ -98,6 +98,33 @@ complete FQDN of the system is returned
.B "THE FQDN"
below).
+.LP
+The function
+.BR gethostname(2)
+is used to get the hostname. When the
+.BR "hostname \-a, \-d, \-f or \-i"
+is called will
+.BR gethostbyname(3)
+be called. The difference in
+.BR gethostname(2)
+and
+.BR gethostbyname(3)
+is that
+.BR gethostbyname(3)
+is network aware, so it consults
+.IR /etc/nsswitch.conf
+and
+.IR /etc/host.conf
+to decide whether to read information in
+.IR /etc/sysconfig/network
+or
+.IR /etc/hosts
+
+To add another dimension to this,
+the
+.B hostname
+is also set when the network interface is brought up.
+
.SS "SET NAME"
When called with one argument or with the
.B \-\-file
@@ -113,7 +140,7 @@ and
use
.BR setdomainname (2).
Note, that this is effective only until the next reboot.
-Edit /etc/hostname for permanent change.
+After reboot original names from \fI/etc/hosts\fR are used again.
.LP
Note, that only the super-user can change the names.
.LP
@@ -124,10 +151,10 @@ command (see
below).
.LP
The host name is usually set once at system startup in
-.I /etc/init.d/hostname.sh
+.I /etc/rc.d/rc.sysinit
(normally by reading the contents of a file which contains
the host name, e.g.
-.IR /etc/hostname ).
+.IR /etc/sysconfig/network ).
.SS THE FQDN
You can't change the FQDN (as returned by
@@ -221,7 +248,7 @@ order of the output.
Display the short host name. This is the host name cut at the first dot.
.TP
.I "\-v, \-\-verbose"
-Be verbose and tell what's going on.
+Verbose output was removed.
.TP
.I "\-V, \-\-version"
Print version information on standard output and exit successfully.
@@ -246,9 +273,7 @@ option in
.SH FILES
.B /etc/hosts
-.B /etc/hostname
-Historically this file was supposed to only contain the hostname and not the
-full canonical FQDN. Nowadays most software is able to cope with a full FQDN here.
+.B /etc/sysconfig/network
.SH AUTHORS
Peter Tobias, <tobias@et-inf.fho-emden.de>
.br
diff -up hostname/Makefile.rh hostname/Makefile
--- hostname/Makefile.rh 2010-11-16 14:13:21.000000000 +0100
+++ hostname/Makefile 2011-12-29 12:16:31.000000000 +0100
@@ -7,26 +7,28 @@ OBJS=hostname.o
hostname: $(OBJS)
$(CC) $(CFLAGS) -o $@ $(OBJS) -lnsl
- ln -fs hostname dnsdomainname
- ln -fs hostname domainname
- ln -fs hostname ypdomainname
- ln -fs hostname nisdomainname
install: hostname
install -d ${BASEDIR}/usr/share/man/man1
- install -o root -g root -m 0644 hostname.1 ${BASEDIR}/usr/share/man/man1
+ install -m 0644 hostname.1 ${BASEDIR}/usr/share/man/man1
ln -fs hostname.1 ${BASEDIR}/usr/share/man/man1/dnsdomainname.1
ln -fs hostname.1 ${BASEDIR}/usr/share/man/man1/domainname.1
ln -fs hostname.1 ${BASEDIR}/usr/share/man/man1/ypdomainname.1
ln -fs hostname.1 ${BASEDIR}/usr/share/man/man1/nisdomainname.1
- install -o root -g root -m 0644 hostname.1.fr ${BASEDIR}/usr/share/man/fr/man1/hostname.1
+ install -d ${BASEDIR}/usr/share/man/fr/man1
+ install -m 0644 hostname.1.fr ${BASEDIR}/usr/share/man/fr/man1/hostname.1
+ ln -fs hostname.1 ${BASEDIR}/usr/share/man/fr/man1/dnsdomainname.1
+ ln -fs hostname.1 ${BASEDIR}/usr/share/man/fr/man1/domainname.1
+ ln -fs hostname.1 ${BASEDIR}/usr/share/man/fr/man1/ypdomainname.1
+ ln -fs hostname.1 ${BASEDIR}/usr/share/man/fr/man1/nisdomainname.1
+
install -d ${BASEDIR}/bin
- install -o root -g root -m 0755 hostname ${BASEDIR}/bin
- ln -f hostname ${BASEDIR}/bin/dnsdomainname
- ln -f hostname ${BASEDIR}/bin/domainname
- ln -f hostname ${BASEDIR}/bin/nisdomainname
- ln -f hostname ${BASEDIR}/bin/ypdomainname
+ install -m 0755 hostname ${BASEDIR}/bin
+ ln -fs hostname ${BASEDIR}/bin/dnsdomainname
+ ln -fs hostname ${BASEDIR}/bin/domainname
+ ln -fs hostname ${BASEDIR}/bin/nisdomainname
+ ln -fs hostname ${BASEDIR}/bin/ypdomainname
clean:
-rm -f $(OBJS) hostname dnsdomainname domainname nisdomainname ypdomainname