1
0
mirror of https://github.com/systemd/systemd.git synced 2024-12-25 01:34:28 +03:00
systemd/man
Stef Walter c779a44222 hostnamed: Fix the way that static and transient host names interact
It is almost always incorrect to allow DHCP or other sources of
transient host names to override an explicitly configured static host
name.

This commit changes things so that if a static host name is set, this
will override the transient host name (eg: provided via DHCP). Transient
host names can still be used to provide host names for machines that have
not been explicitly configured with a static host name.

The exception to this rule is if the static host name is set to
"localhost". In those cases we act as if no
static host name has been explicitly set.

As discussed elsewhere, systemd may want to have an fd based ownership
of the transient name. That part is not included in this commit.
2014-05-28 09:34:37 +08:00
..
.gitignore build-sys,man: use XML entities to substite strings 2013-03-29 20:30:21 -04:00
binfmt.d.xml man: resolve word omissions 2013-12-25 22:53:45 -05:00
bootchart.conf.xml bootchart: add control group option 2014-04-24 19:21:51 -04:00
bootctl.xml man: xinclude --help/--version/--no-pager 2014-02-20 22:43:27 -05:00
bootup.xml man: more grammar improvements 2013-07-03 08:19:20 -04:00
busctl.xml man: xinclude --host/--machine 2014-02-20 22:43:27 -05:00
crypttab.xml doc: choose different words to improve clarity 2014-02-17 19:03:07 -05:00
custom-html.xsl man: always supply quotes around literals 2013-06-26 08:05:14 -04:00
custom-man.xsl man: always supply quotes around literals 2013-06-26 08:05:14 -04:00
daemon.xml man: update URL refernce in daemon(7) 2014-05-22 16:22:48 +09:00
halt.xml man: xinclude --help/--version/--no-pager 2014-02-20 22:43:27 -05:00
hostname.xml man: more grammar improvements 2013-07-03 08:19:20 -04:00
hostnamectl.xml hostnamed: Fix the way that static and transient host names interact 2014-05-28 09:34:37 +08:00
journalctl.xml man: xinclude --help/--version/--no-pager 2014-02-20 22:43:27 -05:00
journald.conf.xml man: update journald rate limit defaults 2014-05-16 18:58:35 +02:00
kernel-command-line.xml fsck: Allow to specify the fsck repair option in the cmdline 2014-05-16 18:33:59 +02:00
kernel-install.xml man: always place <programlisting> and </programlisting> in a line with actual sources, so that we don't get spurious newlines in the man page output 2014-02-14 15:56:19 +01:00
less-variables.xml man: use xinclude to de-deduplicate common text 2014-02-12 01:10:31 -05:00
libsystemd-pkgconfig.xml man: xinclude pkg-config note 2014-02-20 22:43:27 -05:00
locale.conf.xml man: more grammar improvements 2013-07-03 08:19:20 -04:00
localectl.xml man: xinclude --host/--machine 2014-02-20 22:43:27 -05:00
localtime.xml doc: properly use XML entities 2014-02-17 19:03:07 -05:00
loginctl.xml man: xinclude --host/--machine 2014-02-20 22:43:27 -05:00
logind.conf.xml man: logind.conf: fix grammar issues, unclear wording, and unclear default values 2014-05-16 23:10:11 -04:00
machine-id.xml man: use HTTPS links for links that support it 2013-07-16 17:42:56 +02:00
machine-info.xml doc: resolve missing/extraneous words or inappropriate forms 2014-02-17 19:03:07 -05:00
machinectl.xml machinectl: reimplement machinectl's "reboot" verb on top of "kill", and add new verb "poweroff" 2014-03-18 04:48:26 +01:00
Makefile build-sys: add small redirecting Makefiles to simplify compilation from within emacs 2010-05-17 01:44:03 +02:00
modules-load.d.xml man: wording and grammar updates 2013-09-12 22:09:57 +02:00
nss-myhostname.xml man: always place <programlisting> and </programlisting> in a line with actual sources, so that we don't get spurious newlines in the man page output 2014-02-14 15:56:19 +01:00
os-release.xml man: wording and grammar updates 2013-09-12 22:09:57 +02:00
pam_systemd.xml man: recommend that XDG_SESSION_DESKTOP and XDG_CURRENT_DESKTOP use the same identifiers 2014-04-23 20:11:38 +02:00
resolved.conf.xml resolved: add daemon to manage resolv.conf 2014-05-19 18:14:56 +02:00
runlevel.xml Revert back to /var/run at a couple of problems 2014-02-26 02:47:43 +01:00
sd_booted.xml man: xinclude pkg-config note 2014-02-20 22:43:27 -05:00
sd_bus_creds_get_pid.xml build-sys: add conditionals and regenerate manpage list 2014-02-20 22:43:27 -05:00
sd_bus_creds_new_from_pid.xml build-sys: add conditionals and regenerate manpage list 2014-02-20 22:43:27 -05:00
sd_bus_error.xml doc: comma placement corrections and word order 2014-05-07 20:13:27 -04:00
sd_bus_message_append_array.xml doc: comma placement corrections and word order 2014-05-07 20:13:27 -04:00
sd_bus_message_append_basic.xml doc: comma placement corrections and word order 2014-05-07 20:13:27 -04:00
sd_bus_message_append_string_memfd.xml doc: comma placement corrections and word order 2014-05-07 20:13:27 -04:00
sd_bus_message_append_strv.xml doc: comma placement corrections and word order 2014-05-07 20:13:27 -04:00
sd_bus_message_append.xml doc: comma placement corrections and word order 2014-05-07 20:13:27 -04:00
sd_bus_message_get_cookie.xml doc: balance C indirections in function prototypes 2014-05-07 20:13:27 -04:00
sd_bus_message_get_monotonic_usec.xml man: explain that the timestamps on incoming kdbus messages are not necessarily monotonically increasing 2014-04-13 17:42:11 -07:00
sd_bus_negotiate_fds.xml doc: comma placement corrections and word order 2014-05-07 20:13:27 -04:00
sd_bus_new.xml build-sys: add conditionals and regenerate manpage list 2014-02-20 22:43:27 -05:00
sd_bus_open_user.xml doc: corrections to words and forms 2014-05-07 20:13:26 -04:00
sd_bus_path_encode.xml doc: comma placement corrections and word order 2014-05-07 20:13:27 -04:00
sd_bus_request_name.xml doc: balance C indirections in function prototypes 2014-05-07 20:13:27 -04:00
sd_event_add_time.xml doc: balance C indirections in function prototypes 2014-05-07 20:13:27 -04:00
sd_event_new.xml doc: comma placement corrections and word order 2014-05-07 20:13:27 -04:00
sd_get_seats.xml doc: balance C indirections in function prototypes 2014-05-07 20:13:27 -04:00
sd_id128_get_machine.xml doc: balance C indirections in function prototypes 2014-05-07 20:13:27 -04:00
sd_id128_randomize.xml doc: balance C indirections in function prototypes 2014-05-07 20:13:27 -04:00
sd_id128_to_string.xml doc: balance C indirections in function prototypes 2014-05-07 20:13:27 -04:00
sd_is_fifo.xml doc: balance C indirections in function prototypes 2014-05-07 20:13:27 -04:00
sd_journal_add_match.xml doc: balance C indirections in function prototypes 2014-05-07 20:13:27 -04:00
sd_journal_get_catalog.xml doc: balance C indirections in function prototypes 2014-05-07 20:13:27 -04:00
sd_journal_get_cursor.xml doc: balance C indirections in function prototypes 2014-05-07 20:13:27 -04:00
sd_journal_get_cutoff_realtime_usec.xml doc: balance C indirections in function prototypes 2014-05-07 20:13:27 -04:00
sd_journal_get_data.xml doc: balance C indirections in function prototypes 2014-05-07 20:13:27 -04:00
sd_journal_get_fd.xml doc: balance C indirections in function prototypes 2014-05-07 20:13:27 -04:00
sd_journal_get_realtime_usec.xml doc: balance C indirections in function prototypes 2014-05-07 20:13:27 -04:00
sd_journal_get_usage.xml doc: balance C indirections in function prototypes 2014-05-07 20:13:27 -04:00
sd_journal_next.xml doc: balance C indirections in function prototypes 2014-05-07 20:13:27 -04:00
sd_journal_open.xml doc: balance C indirections in function prototypes 2014-05-07 20:13:27 -04:00
sd_journal_print.xml man: sd_journal_send does nothing when journald is not available 2014-05-09 08:39:51 -04:00
sd_journal_query_unique.xml doc: balance C indirections in function prototypes 2014-05-07 20:13:27 -04:00
sd_journal_seek_head.xml doc: balance C indirections in function prototypes 2014-05-07 20:13:27 -04:00
sd_journal_stream_fd.xml doc: balance C indirections in function prototypes 2014-05-07 20:13:27 -04:00
sd_listen_fds.xml man: xinclude pkg-config note 2014-02-20 22:43:27 -05:00
sd_login_monitor_new.xml doc: balance C indirections in function prototypes 2014-05-07 20:13:27 -04:00
sd_notify.xml man: xinclude pkg-config note 2014-02-20 22:43:27 -05:00
sd_pid_get_session.xml doc: balance C indirections in function prototypes 2014-05-07 20:13:27 -04:00
sd_readahead.xml man: improvements to comma placement 2013-12-25 22:53:46 -05:00
sd_seat_get_active.xml doc: balance C indirections in function prototypes 2014-05-07 20:13:27 -04:00
sd_session_is_active.xml doc: balance C indirections in function prototypes 2014-05-07 20:13:27 -04:00
sd_uid_get_state.xml man: describe sd_uid_get_display 2014-05-24 18:50:21 -04:00
sd_watchdog_enabled.xml man: xinclude pkg-config note 2014-02-20 22:43:27 -05:00
sd-daemon.xml man: xinclude pkg-config note 2014-02-20 22:43:27 -05:00
sd-id128.xml man: xinclude pkg-config note 2014-02-20 22:43:27 -05:00
sd-journal.xml man: xinclude pkg-config note 2014-02-20 22:43:27 -05:00
sd-login.xml man: xinclude pkg-config note 2014-02-20 22:43:27 -05:00
sd-readahead.xml man: improvements to comma placement 2013-12-25 22:53:46 -05:00
shutdown.xml man: xinclude --help/--version/--no-pager 2014-02-20 22:43:27 -05:00
standard-options.xml man: xinclude --help/--version/--no-pager 2014-02-20 22:43:27 -05:00
sysctl.d.xml sysctl: replaces some slashes with dots 2014-04-16 21:52:36 -04:00
systemctl.xml Fix typos in systemctl manpage 2014-05-15 13:23:55 +02:00
systemd-activate.xml man: xinclude --help/--version/--no-pager 2014-02-20 22:43:27 -05:00
systemd-analyze.xml man: xinclude --host/--machine 2014-02-20 22:43:27 -05:00
systemd-ask-password-console.service.xml Reword sentences that contain psuedo-English "resp." 2012-10-16 01:03:01 +02:00
systemd-ask-password.xml man: xinclude --help/--version/--no-pager 2014-02-20 22:43:27 -05:00
systemd-backlight@.service.xml man: fix typos in backlight/rfkill page 2013-10-19 12:33:47 +02:00
systemd-binfmt.service.xml build-sys: create Makefile-man.am automatically 2013-02-06 23:16:16 -05:00
systemd-bootchart.xml bootchart: add control group option 2014-04-24 19:21:51 -04:00
systemd-bus-proxyd.xml man: xinclude --help/--version/--no-pager 2014-02-20 22:43:27 -05:00
systemd-bus-proxyd@.service.xml Use /var/run/dbus/system_bus_socket for the D-Bus socket 2014-02-25 21:26:42 -05:00
systemd-cat.xml man: xinclude --help/--version/--no-pager 2014-02-20 22:43:27 -05:00
systemd-cgls.xml man: xinclude --help/--version/--no-pager 2014-02-20 22:43:27 -05:00
systemd-cgtop.xml man: xinclude --help/--version/--no-pager 2014-02-20 22:43:27 -05:00
systemd-coredumpctl.xml man: xinclude --help/--version/--no-pager 2014-02-20 22:43:27 -05:00
systemd-cryptsetup-generator.xml man: wording and grammar updates 2013-10-15 08:19:49 -04:00
systemd-cryptsetup@.service.xml build-sys: create Makefile-man.am automatically 2013-02-06 23:16:16 -05:00
systemd-delta.xml man: xinclude --help/--version/--no-pager 2014-02-20 22:43:27 -05:00
systemd-detect-virt.xml man: xinclude --help/--version/--no-pager 2014-02-20 22:43:27 -05:00
systemd-efi-boot-generator.xml man: wording and grammar updates 2013-09-10 18:34:41 +02:00
systemd-fsck@.service.xml fsck: Allow to specify the fsck repair option in the cmdline 2014-05-16 18:33:59 +02:00
systemd-fstab-generator.xml man: document fail/nofail, auto/noauto 2013-12-25 23:22:05 -05:00
systemd-getty-generator.xml man: resolve word omissions 2013-12-25 22:53:45 -05:00
systemd-gpt-auto-generator.xml doc: comma placement corrections and word order 2014-05-07 20:13:27 -04:00
systemd-halt.service.xml man: document fail/nofail, auto/noauto 2013-12-25 23:22:05 -05:00
systemd-hostnamed.service.xml man: improve grammar and word formatting in numerous man pages 2013-07-02 23:06:22 -04:00
systemd-inhibit.xml man: xinclude --help/--version/--no-pager 2014-02-20 22:43:27 -05:00
systemd-initctl.service.xml man: reword man page titles 2012-07-16 18:08:25 +02:00
systemd-journal-gatewayd.service.xml man: xinclude --help/--version/--no-pager 2014-02-20 22:43:27 -05:00
systemd-journal-remote.xml doc: comma placement corrections and word order 2014-05-07 20:13:27 -04:00
systemd-journald.service.xml journald: add support for wall forwarding 2014-03-14 22:05:25 +01:00
systemd-localed.service.xml build-sys: create Makefile-man.am automatically 2013-02-06 23:16:16 -05:00
systemd-logind.service.xml man: document machinectl and systemd-machined 2013-07-06 22:23:31 -04:00
systemd-machine-id-setup.xml machine-id-setup: use path_kill_slashes and modernizations 2014-03-14 09:31:34 -04:00
systemd-machined.service.xml man: fix typo in documentation of systemd-machined 2013-08-04 21:47:14 -04:00
systemd-modules-load.service.xml man: remove "wine" from unrelated man pages 2013-08-15 18:07:47 +02:00
systemd-networkd-wait-online.service.xml doc: comma placement corrections and word order 2014-05-07 20:13:27 -04:00
systemd-networkd.service.xml resolved: add daemon to manage resolv.conf 2014-05-19 18:14:56 +02:00
systemd-notify.xml man: xinclude --help/--version/--no-pager 2014-02-20 22:43:27 -05:00
systemd-nspawn.xml doc: comma placement corrections and word order 2014-05-07 20:13:27 -04:00
systemd-quotacheck.service.xml build-sys: create Makefile-man.am automatically 2013-02-06 23:16:16 -05:00
systemd-random-seed.service.xml fix lingering references to /var/lib/{backlight,random-seed} 2013-10-02 07:51:06 -04:00
systemd-readahead-replay.service.xml man: readahead: fix cmdline switch inconsistency between readahead.c and docs 2014-05-16 17:13:03 +02:00
systemd-remount-fs.service.xml man: add various filenames to the index 2013-05-03 01:00:42 -04:00
systemd-resolved.service.xml resolved: add daemon to manage resolv.conf 2014-05-19 18:14:56 +02:00
systemd-rfkill@.service.xml man: fix typos in backlight/rfkill page 2013-10-19 12:33:47 +02:00
systemd-run.xml doc: comma placement corrections and word order 2014-05-07 20:13:27 -04:00
systemd-shutdownd.service.xml man: reword man page titles 2012-07-16 18:08:25 +02:00
systemd-sleep.conf.xml man: multiple sleep modes are to be separated by whitespace, not commas 2014-03-11 05:24:22 +01:00
systemd-socket-proxyd.xml man: xinclude --help/--version/--no-pager 2014-02-20 22:43:27 -05:00
systemd-suspend.service.xml man: xinclude --help/--version/--no-pager 2014-02-20 22:43:27 -05:00
systemd-sysctl.service.xml man: remove "wine" from unrelated man pages 2013-08-15 18:07:47 +02:00
systemd-system-update-generator.xml man: fix invalid links to generator wiki pages 2012-10-02 11:52:29 -04:00
systemd-system.conf.xml cgroups: simplify CPUQuota= logic 2014-05-22 11:53:12 +09:00
systemd-timedated.service.xml man: improve grammar and word formatting in numerous man pages 2013-07-02 23:06:22 -04:00
systemd-timesyncd.service.xml timesyncd: add unit and man page 2014-04-29 09:51:53 +02:00
systemd-tmpfiles.xml tmpfiles: add --root option to operate on an alternate fs tree 2014-03-14 09:31:34 -04:00
systemd-tty-ask-password-agent.xml man: xinclude --help/--version/--no-pager 2014-02-20 22:43:27 -05:00
systemd-udevd.service.xml man: xinclude --help/--version/--no-pager 2014-02-20 22:43:27 -05:00
systemd-update-utmp.service.xml doc: typographical fine tuning 2014-05-06 23:05:39 +02:00
systemd-user-sessions.service.xml build-sys: create Makefile-man.am automatically 2013-02-06 23:16:16 -05:00
systemd-vconsole-setup.service.xml build-sys: create Makefile-man.am automatically 2013-02-06 23:16:16 -05:00
systemd.automount.xml man: wording and grammar updates 2013-09-12 22:09:57 +02:00
systemd.device.xml man: grammar and wording improvements 2013-12-25 22:53:46 -05:00
systemd.exec.xml fix spelling of privilege 2014-05-19 00:40:44 +09:00
systemd.journal-fields.xml man: explain that the journal field SYSLOG_IDENTIFIER is usually derived from program_invocation_short_name 2014-03-25 00:10:41 +01:00
systemd.kill.xml doc: update punctuation 2014-02-17 19:03:07 -05:00
systemd.link.xml doc: comma placement corrections and word order 2014-05-07 20:13:27 -04:00
systemd.mount.xml man: document fail/nofail, auto/noauto 2013-12-25 23:22:05 -05:00
systemd.netdev.xml man: networkd - additional examples related to bridging 2014-03-17 21:35:28 +01:00
systemd.network.xml doc: comma placement corrections and word order 2014-05-07 20:13:27 -04:00
systemd.path.xml man: wording and grammar updates 2013-09-12 22:09:57 +02:00
systemd.preset.xml man: resolve word omissions 2013-12-25 22:53:45 -05:00
systemd.resource-control.xml man: reword StartupCPUShares= description 2014-05-24 18:50:21 -04:00
systemd.scope.xml man: wording and grammar updates 2013-10-15 08:19:49 -04:00
systemd.service.xml man: fix some minor language typos 2014-05-16 16:51:56 +02:00
systemd.slice.xml man: drop references to "cgroup" wher appropriate 2013-09-27 00:05:07 +02:00
systemd.snapshot.xml man: update scope unit man page a bit 2013-07-19 19:04:17 +02:00
systemd.socket.xml doc: corrections to words and forms 2014-05-07 20:13:26 -04:00
systemd.special.xml doc: update punctuation 2014-02-17 19:03:07 -05:00
systemd.swap.xml man: improvements to comma placement 2013-12-25 22:53:46 -05:00
systemd.target.xml man: use <literal> not <filename> for suffixes 2013-07-12 01:09:25 -04:00
systemd.time.xml time: support @ syntax for denoting times since the UNIX epoch 1970-1-1 2014-03-25 04:08:16 +01:00
systemd.timer.xml doc: comma placement corrections and word order 2014-05-07 20:13:27 -04:00
systemd.unit.xml man: note that entire sections can now be ignored 2014-05-18 11:32:51 +02:00
systemd.xml man: xinclude --help/--version/--no-pager 2014-02-20 22:43:27 -05:00
telinit.xml man: xinclude --help/--version/--no-pager 2014-02-20 22:43:27 -05:00
timedatectl.xml man: xinclude --host/--machine 2014-02-20 22:43:27 -05:00
tmpfiles.d.xml doc: comma placement corrections and word order 2014-05-07 20:13:27 -04:00
udev.xml man: split out systemd.link(5) from udev(7) 2014-02-25 17:04:13 +01:00
udevadm.xml udev: remove seqnum API and all assumptions about seqnums 2014-04-13 17:12:14 -07:00
user-system-options.xml man: xinclude --host/--machine 2014-02-20 22:43:27 -05:00
vconsole.conf.xml man: add various filenames to the index 2013-05-03 01:00:42 -04:00