Prep v225: Sync build files with upstream

diff --git a/.gitignore b/.gitignore
index 009923cb9ed6c8d324f5c845e7905f3a2999f627..53f1eef2bcbbb711d8cfc1d6b723c5923bf08835 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -137,6 +137,8 @@
 /tags
 /test-architecture
 /test-audit-type
+/test-af-list
+/test-arphrd-list
 /test-async
 /test-barrier
 /test-bitmap
@@ -192,6 +194,7 @@
 /test-firewall-util
 /test-hashmap
 /test-hostname
+/test-hostname-util
 /test-icmp6-rs
 /test-id128
 /test-inhibit

diff --git a/CODING_STYLE b/CODING_STYLE
index dbadfbdb5441adf3ae53a0ebec458bf2726cd151..a96ddd35980fd11aa2cf81edfee01f77d1f1a496 100644 (file)
--- a/CODING_STYLE
+++ b/CODING_STYLE
@@ -314,3 +314,10 @@
   are always defined after more global ones. Thus, our local
   definitions will never "leak" into the global header files, possibly
   altering their effect due to #ifdeffery.
+
+- To implement an endless loop, use "for (;;)" rather than "while
+  (1)". The latter is a bit ugly anyway, since you probably really
+  meant "while (true)"... To avoid the discussion what the right
+  always-true expression for an infinite while() loop is our
+  recommendation is to simply write it without any such expression by
+  using "for (;;)".

diff --git a/Makefile.am b/Makefile.am
index 54c2aeeafd87c363a9f0fa92853f9e7bbe90c2a3..87c4565f10d95e3e33b7b21490915fa24e26a5ac 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,7 +39,7 @@ SUBDIRS = . po
 .PRECIOUS: $(TEST_SUITE_LOG) Makefile
 
 LIBELOGIND_CURRENT=10
-LIBELOGIND_REVISION=1
+LIBELOGIND_REVISION=2
 LIBELOGIND_AGE=10
 
 # Dirs of external packages
@@ -188,9 +188,6 @@ rootbin_PROGRAMS =
 bin_PROGRAMS =
 rootlibexec_PROGRAMS =
 
-dist_bashcompletion_DATA =
-dist_zshcompletion_DATA =
-
 dist_doc_DATA = \
        README \
        NEWS \
@@ -690,12 +687,16 @@ loginctl_LDADD = \
 rootbin_PROGRAMS += \
        loginctl
 
-dist_bashcompletion_DATA += \
+if ENABLE_BASH_COMPLETION
+dist_bashcompletion_DATA = \
        shell-completion/bash/loginctl
+endif
 
-dist_zshcompletion_DATA += \
+if ENABLE_ZSH_COMPLETION
+dist_zshcompletion_DATA = \
        shell-completion/zsh/_loginctl \
        shell-completion/zsh/_elogind-inhibit
+endif
 
 elogind_inhibit_SOURCES = \
        src/login/inhibit.c

diff --git a/NEWS b/NEWS
index 97dd000d4e86015af2398bcd8c3c6f5ab15ee9f7..1baa9aa1125e95106fbd8f1bb1aa09f5433c12ae 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,30 @@
 systemd System and Service Manager
 
+CHANGES WITH 225:
+
+        * machinectl gained a new verb 'shell' which opens a fresh shell on the
+          target machine. It is similar to 'login', but spawns the shell
+          directly. The pseudo machine '.host' now refers to the local host and
+          is used by default. Hence, 'machinectl shell' can be used as
+          replacement for 'su' which spawns the session as a fresh systemd
+          unit.
+
+        * systemd-networkd learned to cope with private-zone DHCP options and
+          allows other programs to query the values.
+
+        Contributions from: Alastair Hughes, Alex Crawford, Daniel Mack, David
+        Herrmann, Dimitri John Ledkov, Eric Kostrowski, Evgeny Vereshchagin,
+        Felipe Sateler, HATAYAMA Daisuke, Jan Pokorný, Jan Synacek, Johnny
+        Robeson, Karel Zak, Kay Sievers, Kefeng Wang, Lennart Poettering, Major
+        Hayden, Marcel Holtmann, Markus Elfring, Martin Mikkelsen, Martin Pitt,
+        Matt Turner, Maxim Mikityanskiy, Michael Biebl, Namhyung Kim, Nicolas
+        Cornu, Owen W. Taylor, Patrik Flykt, Peter Hutterer, reverendhomer,
+        Richard Maw, Ronny Chevalier, Seth Jennings, Stef Walter, Susant Sahani,
+        Thomas Blume, Thomas Hindoe Paaboel Andersen, Thomas Meyer, Tom
+        Gundersen, Vincent Batts, WaLyong Cho, Zbigniew Jędrzejewski-Szmek
+
+        -- Berlin, 2015-08-27
+
 CHANGES WITH 224:
 
         * The systemd-efi-boot-generator functionality was merged into
@@ -756,7 +781,7 @@ CHANGES WITH 218:
         * When querying unit file enablement status (for example via
           "systemctl is-enabled"), a new state "indirect" is now known
           which indicates that a unit might not be enabled itself, but
-          another unit listed in its Alias= setting might be.
+          another unit listed in its Also= setting might be.
 
         * Similar to the various existing ConditionXYZ= settings for
           units there are now matching AssertXYZ= settings. While

diff --git a/README b/README
index 75959497650b63ae59bff341121abbb9c31c3a55..d84bf8ea69e05ef3d115656c2eb815ef541449e9 100644 (file)
--- a/README
+++ b/README
@@ -274,8 +274,3 @@ WARNINGS:
         servers if not specified otherwise at configure time. You
         really should not ship an OS or device with this default
         setting. See DISTRO_PORTING for details.
-
-ENGINEERING AND CONSULTING SERVICES:
-        ENDOCODE <https://endocode.com/> offers professional
-        engineering and consulting services for systemd. Please
-        contact Chris Kühl <chris@endocode.com> for more information.

diff --git a/TODO b/TODO
index 9514af5a90862d40a6fd329b0a2c35b3a86e84d4..ce50f1655528586dfa568181cb091da2e7ad509a 100644 (file)
--- a/TODO
+++ b/TODO
@@ -6,7 +6,7 @@ Bugfixes:
   automount points even when the original .automount file did not exist
   anymore. Only the .mount unit was still around.
 
-* ExecStart with unicode characters fails in strv_split_quoted:
+* ExecStart with unicode characters fails in strv_split_extract:
 
           [Service]
           Environment=ONE='one' "TWO='two two' too" THREE=
@@ -26,6 +26,16 @@ External:
 
 Features:
 
+* PID 1 should send out sd_notify("WATCHDOG=1") messages (for usage in the --user mode, and when run via nspawn)
+
+* nspawn should send out sd_notify("WATCHDOG=1") messages
+
+* nspawn should optionally support receiving WATCHDOG=1 messages from its payload PID 1...
+
+* introduce "machinectl shell" that is like systemd-run -M foo /bin/bash -t but also adds PAMName=login
+
+* allow loging into host with "machinectl login".
+
 * consider throwing a warning if a service declares it wants to be "Before=" a .device unit.
 
 * "systemctl edit" should know a mode to create a new unit file
@@ -263,7 +273,7 @@ Features:
 
 * maybe add support for specifier expansion in user.conf, specifically DefaultEnvironment=
 
-* code cleanup: retire FOREACH_WORD_QUOTED, port to unquote_first_word() loops instead
+* code cleanup: retire FOREACH_WORD_QUOTED, port to extract_first_word() loops instead
 
 * introduce systemd-timesync-wait.service or so to sync on an NTP fix?
 
@@ -299,7 +309,7 @@ Features:
 
 * exponential backoff in timesyncd and resolved when we cannot reach a server
 
-* unquote_many_words() should probably be used by a lot of code that
+* extract_many_words() should probably be used by a lot of code that
   currently uses FOREACH_WORD and friends. For example, most conf
   parsing callbacks should use it.
 
@@ -344,7 +354,9 @@ Features:
         - avahi compat
   - DNS-SD service registration from socket units
   - edns0
-  - dname
+  - dname: Not necessary for plain DNS as synthesized cname is handed out instead if we do not
+           announce dname support. However, for DNSSEC it is necessary as the synthesized cname
+           will not be signed.
   - cname on PTR (?)
 
 * Allow multiple ExecStart= for all Type= settings, so that we can cover rescue.service nicely
@@ -460,6 +472,8 @@ Features:
   ReadOnlyDirectories=... for whitelisting files for a service.
 
 * sd-bus:
+  - EBADSLT handling
+  - change argv list matching logic
   - GetAllProperties() on a non-existing object does not result in a failure currently
   - kdbus: process fd=-1 for incoming msgs
   - port to sd-resolve for connecting to TCP dbus servers
@@ -690,10 +704,6 @@ Features:
 
 * If we show an error about a unit (such as not showing up) and it has no Description string, then show a description string generated form the reverse of unit_name_mangle().
 
-* fedup: add --unit to systemctl switch-root somehow
-* fedup: do not delete initrd on switch-root
-* fedup: generator
-
 * clean up date formatting and parsing so that all absolute/relative timestamps we format can also be parsed
 
 * on shutdown: move utmp, wall, audit logic all into PID 1 (or logind?), get rid of systemd-update-utmp-runlevel

diff --git a/configure.ac b/configure.ac
index 8143f74a948ac4c001b6645192b064ea235c382a..395d5a7238cd7d5fb72c7ab99ebf45e06e17d546 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 AC_PREREQ([2.64])
 
 AC_INIT([elogind],
-        [224],
+        [225],
         [https://github.com/elogind/elogind/issues],
         [elogind],
         [https://github.com/elogind/elogind])
@@ -625,11 +625,13 @@ AC_ARG_WITH([bashcompletiondir],
         ] , [
                 with_bashcompletiondir=${datadir}/bash-completion/completions
         ])])
+AM_CONDITIONAL(ENABLE_BASH_COMPLETION, [test "$with_bashcompletiondir" != "no"])
 AX_NORMALIZE_PATH([with_bashcompletiondir])
 
 AC_ARG_WITH([zshcompletiondir],
         AS_HELP_STRING([--with-zshcompletiondir=DIR], [Zsh completions directory]),
         [], [with_zshcompletiondir=${datadir}/zsh/site-functions])
+AM_CONDITIONAL(ENABLE_ZSH_COMPLETION, [test "$with_zshcompletiondir" != "no"])
 AX_NORMALIZE_PATH([with_zshcompletiondir])
 
 AC_ARG_WITH([rootprefix],