141 lines
4.3 KiB
Diff
141 lines
4.3 KiB
Diff
Index: doc/coreutils.texi
|
|
================================================================================
|
|
--- doc/coreutils.texi
|
|
+++ doc/coreutils.texi
|
|
@@ -65,8 +65,6 @@
|
|
* fold: (coreutils)fold invocation. Wrap long input lines.
|
|
* groups: (coreutils)groups invocation. Print group names a user is in.
|
|
* head: (coreutils)head invocation. Output the first part of files.
|
|
-* hostid: (coreutils)hostid invocation. Print numeric host identifier.
|
|
-* hostname: (coreutils)hostname invocation. Print or set system name.
|
|
* id: (coreutils)id invocation. Print user identity.
|
|
* install: (coreutils)install invocation. Copy and change attributes.
|
|
* join: (coreutils)join invocation. Join lines on a common field.
|
|
@@ -400,8 +398,6 @@ System context
|
|
* arch invocation:: Print machine hardware name
|
|
* date invocation:: Print or set system date and time
|
|
* uname invocation:: Print system information
|
|
-* hostname invocation:: Print or set system name
|
|
-* hostid invocation:: Print numeric host identifier.
|
|
|
|
@command{date}: Print or set system date and time
|
|
|
|
@@ -12452,8 +12448,6 @@ information.
|
|
* arch invocation:: Print machine hardware name.
|
|
* date invocation:: Print or set system date and time.
|
|
* uname invocation:: Print system information.
|
|
-* hostname invocation:: Print or set system name.
|
|
-* hostid invocation:: Print numeric host identifier.
|
|
@end menu
|
|
|
|
|
|
@@ -13234,55 +13228,6 @@ Print the kernel version.
|
|
@exitstatus
|
|
|
|
|
|
-@node hostname invocation
|
|
-@section @command{hostname}: Print or set system name
|
|
-
|
|
-@pindex hostname
|
|
-@cindex setting the hostname
|
|
-@cindex printing the hostname
|
|
-@cindex system name, printing
|
|
-@cindex appropriate privileges
|
|
-
|
|
-With no arguments, @command{hostname} prints the name of the current host
|
|
-system. With one argument, it sets the current host name to the
|
|
-specified string. You must have appropriate privileges to set the host
|
|
-name. Synopsis:
|
|
-
|
|
-@example
|
|
-hostname [@var{name}]
|
|
-@end example
|
|
-
|
|
-The only options are @option{--help} and @option{--version}. @xref{Common
|
|
-options}.
|
|
-
|
|
-@exitstatus
|
|
-
|
|
-
|
|
-@node hostid invocation
|
|
-@section @command{hostid}: Print numeric host identifier.
|
|
-
|
|
-@pindex hostid
|
|
-@cindex printing the host identifier
|
|
-
|
|
-@command{hostid} prints the numeric identifier of the current host
|
|
-in hexadecimal. This command accepts no arguments.
|
|
-The only options are @option{--help} and @option{--version}.
|
|
-@xref{Common options}.
|
|
-
|
|
-For example, here's what it prints on one system I use:
|
|
-
|
|
-@example
|
|
-$ hostid
|
|
-1bac013d
|
|
-@end example
|
|
-
|
|
-On that system, the 32-bit quantity happens to be closely
|
|
-related to the system's Internet address, but that isn't always
|
|
-the case.
|
|
-
|
|
-@exitstatus
|
|
-
|
|
-
|
|
@node Modified command invocation
|
|
@chapter Modified command invocation
|
|
|
|
--- m4/gnulib-comp.m4
|
|
+++ m4/gnulib-comp.m4
|
|
@@ -235,7 +235,6 @@ AC_DEFUN([gl_INIT],
|
|
gl_POSIXVER
|
|
gl_FUNC_PRINTF_FREXP
|
|
gl_FUNC_PRINTF_FREXPL
|
|
- m4_divert_text([INIT_PREPARE], [gl_printf_safe=yes])
|
|
gl_FUNC_PUTENV
|
|
gl_STDLIB_MODULE_INDICATOR([putenv])
|
|
gl_QUOTE
|
|
--- man/Makefile.am
|
|
+++ man/Makefile.am
|
|
@@ -179,7 +179,7 @@ check-x-vs-1:
|
|
PATH=../src$(PATH_SEPARATOR)$$PATH; export PATH; \
|
|
t=ls-files.$$$$; \
|
|
(cd $(srcdir) && ls -1 *.x) | sed 's/\.x$$//' | $(ASSORT) > $$t;\
|
|
- (echo $(dist_man_MANS) $(NO_INSTALL_PROGS_DEFAULT) \
|
|
+ (echo $(dist_man_MANS) $(NO_INSTALL_PROGS_DEFAULT) hostid \
|
|
| tr -s ' ' '\n' | sed 's/\.1$$//') \
|
|
| $(ASSORT) -u | diff - $$t || { rm $$t; exit 1; }; \
|
|
rm $$t
|
|
--- src/system.h
|
|
+++ src/system.h
|
|
@@ -168,7 +168,7 @@ enum
|
|
# define DEV_BSIZE BBSIZE
|
|
#endif
|
|
#ifndef DEV_BSIZE
|
|
-# define DEV_BSIZE 4096
|
|
+# define DEV_BSIZE 512
|
|
#endif
|
|
|
|
/* Extract or fake data from a `struct stat'.
|
|
--- tests/misc/help-version
|
|
+++ tests/misc/help-version
|
|
@@ -205,6 +205,7 @@ lbracket_args=": ]"
|
|
for i in $built_programs; do
|
|
# Skip these.
|
|
case $i in chroot|stty|tty|false|chcon|runcon) continue;; esac
|
|
+ case $i in df) continue;; esac
|
|
|
|
rm -rf $tmp_in $tmp_in2 $tmp_dir $tmp_out
|
|
echo > $tmp_in
|
|
--- tests/other-fs-tmpdir
|
|
+++ tests/other-fs-tmpdir
|
|
@@ -42,6 +42,8 @@ for d in $CANDIDATE_TMP_DIRS; do
|
|
fi
|
|
|
|
done
|
|
+# Autobuild hack
|
|
+test -f /bin/uname.bin && other_partition_tmpdir=
|
|
|
|
if test -z "$other_partition_tmpdir"; then
|
|
cat <<EOF 1>&2
|