morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-15 00:47:10 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2543 from keszybz/build-sys-and-man-fixes

Browse Source 
Build sys and man fixes
This commit is contained in:
Lennart Poettering
2016-02-08 12:52:39 +01:00
parent ef9fde5378 8cd095cc27
commit 14f4532026
5 changed files with 57 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
Makefile.am
View File

@@ -155,6 +155,14 @@ else
noinst_PROGRAMS =
TESTS =
endif
if ENABLE_BASH_COMPLETION
dist_bashcompletion_DATA = $(dist_bashcompletion_data)
nodist_bashcompletion_DATA = $(nodist_bashcompletion_data)
endif
if ENABLE_ZSH_COMPLETION
dist_zshcompletion_DATA = $(dist_zshcompletion_data)
nodist_zshcompletion_DATA = $(nodist_zshcompletion_data)
endif
udevlibexec_PROGRAMS =
gperf_gperf_sources =
@@ -165,6 +173,8 @@ m4_files = $(filter %.m4,$(EXTRA_DIST) $(in_files:.m4.in=.m4))
CLEANFILES = $(BUILT_SOURCES) \
$(pkgconfigdata_DATA) \
$(pkgconfiglib_DATA) \
$(nodist_bashcompletion_data) \
$(nodist_zshcompletion_data) \
$(in_files:.in=) $(in_in_files:.in.in=) \
$(m4_files:.m4=)
@@ -416,8 +426,7 @@ systemgenerator_PROGRAMS = \
systemd-system-update-generator \
systemd-debug-generator
if ENABLE_BASH_COMPLETION
dist_bashcompletion_DATA = \
dist_bashcompletion_data = \
shell-completion/bash/busctl \
shell-completion/bash/journalctl \
shell-completion/bash/systemd-analyze \
@@ -432,12 +441,10 @@ dist_bashcompletion_DATA = \
shell-completion/bash/udevadm \
shell-completion/bash/kernel-install
nodist_bashcompletion_DATA = \
nodist_bashcompletion_data = \
shell-completion/bash/systemctl
endif
if ENABLE_ZSH_COMPLETION
dist_zshcompletion_DATA = \
dist_zshcompletion_data = \
shell-completion/zsh/_busctl \
shell-completion/zsh/_journalctl \
shell-completion/zsh/_udevadm \
@@ -451,18 +458,13 @@ dist_zshcompletion_DATA = \
shell-completion/zsh/_systemd-delta \
shell-completion/zsh/_systemd
nodist_zshcompletion_DATA = \
nodist_zshcompletion_data = \
shell-completion/zsh/_systemctl
endif
EXTRA_DIST += \
shell-completion/bash/systemctl.in \
shell-completion/zsh/_systemctl.in
CLEANFILES += \
$(nodist_bashcompletion_DATA) \
$(nodist_zshcompletion_DATA)
dist_sysctl_DATA = \
sysctl.d/50-default.conf
@@ -2396,10 +2398,8 @@ SYSINIT_TARGET_WANTS += \
systemd-tmpfiles-setup-dev.service \
systemd-tmpfiles-setup.service
if ENABLE_ZSH_COMPLETION
dist_zshcompletion_DATA += \
dist_zshcompletion_data += \
shell-completion/zsh/_systemd-tmpfiles
endif
TIMERS_TARGET_WANTS += \
systemd-tmpfiles-clean.timer
@@ -2627,16 +2627,12 @@ bootctl_LDADD = \
bin_PROGRAMS += \
bootctl
if ENABLE_BASH_COMPLETION
dist_bashcompletion_DATA += \
dist_bashcompletion_data += \
shell-completion/bash/bootctl
endif
if ENABLE_ZSH_COMPLETION
dist_zshcompletion_DATA += \
dist_zshcompletion_data += \
shell-completion/zsh/_bootctl
endif
endif
# ------------------------------------------------------------------------------
if HAVE_GNUEFI
@@ -2717,14 +2713,13 @@ systemd_boot_sources = \
EXTRA_DIST += $(systemd_boot_sources) $(systemd_boot_headers)
if ENABLE_EFI
if HAVE_GNUEFI
systemd_boot_objects = $(addprefix $(top_builddir)/,$(systemd_boot_sources:.c=.o))
systemd_boot_solib = $(top_builddir)/src/boot/efi/systemd_boot.so
systemd_boot = systemd-boot$(EFI_MACHINE_TYPE_NAME).efi
if ENABLE_EFI
if HAVE_GNUEFI
bootlib_DATA = $(systemd_boot)
CLEANFILES += $(systemd_boot_objects) $(systemd_boot_solib) $(systemd_boot)
$(top_builddir)/src/boot/efi/%.o: $(top_srcdir)/src/boot/efi/%.c $(addprefix $(top_srcdir)/,$(systemd_boot_headers))
@$(MKDIR_P) $(top_builddir)/src/boot/efi/
@@ -2741,6 +2736,8 @@ $(systemd_boot): $(systemd_boot_solib)
endif
endif
CLEANFILES += $(systemd_boot_objects) $(systemd_boot_solib) $(systemd_boot)
# ------------------------------------------------------------------------------
stub_headers = \
src/boot/efi/util.h \
@@ -2764,14 +2761,13 @@ EXTRA_DIST += \
$(stub_headers) \
test/splash.bmp
if ENABLE_EFI
if HAVE_GNUEFI
stub_objects = $(addprefix $(top_builddir)/,$(stub_sources:.c=.o))
stub_solib = $(top_builddir)/src/boot/efi/stub.so
stub = linux$(EFI_MACHINE_TYPE_NAME).efi.stub
if ENABLE_EFI
if HAVE_GNUEFI
bootlib_DATA += $(stub)
CLEANFILES += $(stub_objects) $(stub_solib) $(stub)
$(top_builddir)/src/boot/efi/%.o: $(top_srcdir)/src/boot/efi/%.c $(addprefix $(top_srcdir)/,$(stub_headers))
@$(MKDIR_P) $(top_builddir)/src/boot/efi/
@@ -2785,6 +2781,11 @@ $(stub_solib): $(stub_objects)
$(stub): $(stub_solib)
$(AM_V_GEN)$(OBJCOPY) -j .text -j .sdata -j .data -j .dynamic \
-j .dynsym -j .rel -j .rela -j .reloc $(EFI_FORMAT) $< $@
endif
endif
CLEANFILES += $(stub_objects) $(stub_solib) $(stub)
# ------------------------------------------------------------------------------
CLEANFILES += test-efi-disk.img
@@ -2794,8 +2795,6 @@ test-efi-disk.img: $(systemd_boot) $(stub) test/test-efi-create-disk.sh
test-efi: test-efi-disk.img
$(QEMU) -machine accel=kvm -m 1024 -bios $(QEMU_BIOS) -snapshot test-efi-disk.img
endif
endif
EXTRA_DIST += test/test-efi-create-disk.sh
@@ -4440,15 +4439,11 @@ test_coredump_vacuum_SOURCES = \
test_coredump_vacuum_LDADD = \
libshared.la
if ENABLE_BASH_COMPLETION
dist_bashcompletion_DATA += \
dist_bashcompletion_data += \
shell-completion/bash/coredumpctl
endif
if ENABLE_ZSH_COMPLETION
dist_zshcompletion_DATA += \
dist_zshcompletion_data += \
shell-completion/zsh/_coredumpctl
endif
nodist_sysctl_DATA = \
sysctl.d/50-coredump.conf
@@ -4699,16 +4694,12 @@ hostnamectl_LDADD = \
bin_PROGRAMS += \
hostnamectl
if ENABLE_BASH_COMPLETION
dist_bashcompletion_DATA += \
dist_bashcompletion_data += \
shell-completion/bash/hostnamectl
endif
if ENABLE_ZSH_COMPLETION
dist_zshcompletion_DATA += \
dist_zshcompletion_data += \
shell-completion/zsh/_hostnamectl
endif
endif
polkitpolicy_in_files += \
src/hostname/org.freedesktop.hostname1.policy.in
@@ -4773,16 +4764,12 @@ localectl_LDADD = \
bin_PROGRAMS += \
localectl
if ENABLE_BASH_COMPLETION
dist_bashcompletion_DATA += \
dist_bashcompletion_data += \
shell-completion/bash/localectl
endif
if ENABLE_ZSH_COMPLETION
dist_zshcompletion_DATA += \
dist_zshcompletion_data += \
shell-completion/zsh/_localectl
endif
endif
.PHONY: update-kbd-model-map
@@ -4833,16 +4820,12 @@ timedatectl_LDADD = \
bin_PROGRAMS += \
timedatectl
if ENABLE_BASH_COMPLETION
dist_bashcompletion_DATA += \
dist_bashcompletion_data += \
shell-completion/bash/timedatectl
endif
if ENABLE_ZSH_COMPLETION
dist_zshcompletion_DATA += \
dist_zshcompletion_data += \
shell-completion/zsh/_timedatectl
endif
endif
polkitpolicy_in_files += \
src/timedate/org.freedesktop.timedate1.policy.in
@@ -4948,11 +4931,6 @@ machinectl_LDADD = \
rootbin_PROGRAMS += \
machinectl
if ENABLE_BASH_COMPLETION
dist_bashcompletion_DATA += \
shell-completion/bash/machinectl
endif
test_machine_tables_SOURCES = \
src/machine/test-machine-tables.c
@@ -4980,11 +4958,12 @@ dist_dbuspolicy_DATA += \
polkitpolicy_files += \
src/machine/org.freedesktop.machine1.policy
if ENABLE_ZSH_COMPLETION
dist_zshcompletion_DATA += \
dist_bashcompletion_data += \
shell-completion/bash/machinectl
dist_zshcompletion_data += \
shell-completion/zsh/_machinectl \
shell-completion/zsh/_sd_machines
endif
SYSTEM_UNIT_ALIASES += \
systemd-machined.service dbus-org.freedesktop.machine1.service
@@ -5474,10 +5453,8 @@ networkctl_LDADD = \
libshared.la \
libsystemd-network.la
if ENABLE_BASH_COMPLETION
dist_bashcompletion_DATA += \
dist_bashcompletion_data += \
shell-completion/bash/networkctl
endif
test_network_SOURCES = \
src/network/test-network.c
@@ -5607,16 +5584,12 @@ loginctl_LDADD = \
rootbin_PROGRAMS += \
loginctl
if ENABLE_BASH_COMPLETION
dist_bashcompletion_DATA += \
dist_bashcompletion_data += \
shell-completion/bash/loginctl
endif
if ENABLE_ZSH_COMPLETION
dist_zshcompletion_DATA += \
dist_zshcompletion_data += \
shell-completion/zsh/_loginctl \
shell-completion/zsh/_systemd-inhibit
endif
systemd_inhibit_SOURCES = \
src/login/inhibit.c

4
man/hostname.xml
View File

@@ -64,10 +64,6 @@
for DNS domain name labels, even though this is not a strict
requirement.</para>
<para>Depending on the operating system, other configuration files
might be checked for configuration of the hostname as well,
however only as fallback.</para>
<para>You may use
<citerefentry><refentrytitle>hostnamectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
to change the value of this file during runtime from the command

8
man/hostnamectl.xml
View File

@@ -66,10 +66,10 @@
high-level "pretty" hostname which might include all kinds of
special characters (e.g. "Lennart's Laptop"), the static hostname
which is used to initialize the kernel hostname at boot (e.g.
"lennarts-laptop"), and the transient hostname which is a default
received from network configuration. If a static hostname is set,
and is valid (something other than localhost), then the transient
hostname is not used.</para>
"lennarts-laptop"), and the transient hostname which is a fallback
value received from network configuration. If a static hostname is
set, and is valid (something other than localhost), then the
transient hostname is not used.</para>
<para>Note that the pretty hostname has little restrictions on the
characters used, while the static and transient hostnames are

15
man/systemd.generator.xml
View File

@@ -164,13 +164,16 @@
Generators are run very early at boot and cannot rely on
any external services. They may not talk to any other
process. That includes simple things such as logging to
<citerefentry
project='man-pages'><refentrytitle>syslog</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
<citerefentry project='man-pages'><refentrytitle>syslog</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
or <command>systemd</command> itself (this means: no
<citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>!). They
can however rely on the most basic kernel functionality to
be available, including a mounted <filename>/sys</filename>,
<filename>/proc</filename>, <filename>/dev</filename>.
<citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>)!.
Non-essential file systems like
<filename>/var</filename> and <filename>/home</filename>
are mounted after generators have run. Generators
can however rely on the most basic kernel functionality to be
available, including a mounted <filename>/sys</filename>,
<filename>/proc</filename>, <filename>/dev</filename>,
<filename>/usr</filename>.
</para>
</listitem>

2
shell-completion/zsh/_busctl
View File

@@ -1,6 +1,6 @@
#compdef busctl
# hostnamectl(1) completion -*- shell-script -*-
# busctl(1) completion -*- shell-script -*-
#
# This file is part of systemd.
#