platform/upstream/systemd.git
6 years agoman: mention StateDirectory in file-hierarchy(7)
Lucas Werkmeister [Thu, 21 Dec 2017 22:25:00 +0000 (23:25 +0100)]
man: mention StateDirectory in file-hierarchy(7)

6 years agococcinelle: beef up isempty() checks (#7729)
Lennart Poettering [Sat, 23 Dec 2017 07:47:55 +0000 (08:47 +0100)]
coccinelle: beef up isempty() checks (#7729)

With these additions, coccinelle finds everything fixed by the first
commit in PR #7695. In order not to needlessly conflict with that PR
this PR won't include those fixes, but only the coccinelle changes to
detect them automatically in the future.

6 years agoman: fix example config to conform the content of the man page
Dmitry Rozhkov [Thu, 21 Dec 2017 12:55:29 +0000 (14:55 +0200)]
man: fix example config to conform the content of the man page

The config example contains wrong specificator for hostname.
It should be %H instead of %h as documented in the man page.

Use correct specificator for hostname.

6 years agocatalog: update french translation
Sylvain Plantefève [Thu, 21 Dec 2017 22:11:25 +0000 (23:11 +0100)]
catalog: update french translation

6 years agoshared/seccomp: add mmap handling for powerpc
Mathieu Malaterre [Fri, 22 Dec 2017 09:06:29 +0000 (10:06 +0100)]
shared/seccomp: add mmap handling for powerpc

Also remove the warning:

./src/shared/seccomp-util.c:1414:2: warning: #warning "Consider adding the right mmap() syscall definitions here!" [-Wcpp]
 #warning "Consider adding the right mmap() syscall definitions here!"

6 years agonetworkd: show warning on error or cast to void when error is ignored (#7716)
Yu Watanabe [Thu, 21 Dec 2017 18:07:23 +0000 (03:07 +0900)]
networkd: show warning on error or cast to void when error is ignored (#7716)

6 years agohwdb: Add accelerometer orientation entry for Lenovo MIIX3-1030 tablet (#7713)
Michał [Thu, 21 Dec 2017 13:17:33 +0000 (14:17 +0100)]
hwdb: Add accelerometer orientation entry for Lenovo MIIX3-1030 tablet (#7713)

Full dmi/id/modalias:
dmi:bvnLENOVO:bvrB4CN29WW:bd12/04/2015:svnLENOVO:pn80HV:pvrLenovoMIIX3-1030:rvnLENOVO:rnMartini:rvrSDK0G98662WIN:cvnLENOVO:ct11:cvrLenovoMIIX3-1030:

Tested on Lenovo MIIX3 with Debian 9

6 years agoFix #7704 and #7708. (#7712)
Susant Sahani [Thu, 21 Dec 2017 12:27:45 +0000 (17:57 +0530)]
Fix  #7704 and #7708. (#7712)

Init rule variable iif oif and to, from

While foreign rules are added the network part is not attached.
attach manager to rules and use it in routing_policy_rule_free.

6 years agonetwork: fix memory leak when an netdev was skipped
Zbigniew Jędrzejewski-Szmek [Wed, 20 Dec 2017 09:17:37 +0000 (10:17 +0100)]
network: fix memory leak when an netdev was skipped

In general we'd leak anything that was allocated in the first parsing of
netdev, e.g. netdev name, host name, etc. Use normal netdev_unref to make sure
everything is freed.

--- command ---
/home/zbyszek/src/systemd/build2/test-network
--- stderr ---
/etc/systemd/network/wg0.netdev:3: Failed to parse netdev kind, ignoring: wireguard
/etc/systemd/network/wg0.netdev:5: Unknown section 'WireGuard'. Ignoring.
/etc/systemd/network/wg0.netdev:9: Unknown section 'WireGuardPeer'. Ignoring.
NetDev has no Kind configured in /etc/systemd/network/wg0.netdev. Ignoring
/etc/systemd/network/br0.network:13: Unknown lvalue 'NetDev' in section 'Network'
br0: netdev ready

=================================================================
==11666==ERROR: LeakSanitizer: detected memory leaks

Direct leak of 4 byte(s) in 1 object(s) allocated from:
    #0 0x7f3a314cf238 in __interceptor_strdup (/lib64/libasan.so.4+0x77238)
    #1 0x7f3a30e71ad1 in free_and_strdup ../src/basic/string-util.c:870
    #2 0x7f3a30d34fba in config_parse_ifname ../src/shared/conf-parser.c:981
    #3 0x7f3a30d2f5b0 in next_assignment ../src/shared/conf-parser.c:155
    #4 0x7f3a30d30303 in parse_line ../src/shared/conf-parser.c:273
    #5 0x7f3a30d30dee in config_parse ../src/shared/conf-parser.c:390
    #6 0x7f3a30d310a5 in config_parse_many_files ../src/shared/conf-parser.c:428
    #7 0x7f3a30d3181c in config_parse_many ../src/shared/conf-parser.c:487
    #8 0x55b4200f9b00 in netdev_load_one ../src/network/netdev/netdev.c:634
    #9 0x55b4200fb562 in netdev_load ../src/network/netdev/netdev.c:778
    #10 0x55b4200c607a in manager_load_config ../src/network/networkd-manager.c:1299
    #11 0x55b4200818e0 in test_load_config ../src/network/test-network.c:128
    #12 0x55b42008343b in main ../src/network/test-network.c:254
    #13 0x7f3a305f8889 in __libc_start_main (/lib64/libc.so.6+0x20889)

SUMMARY: AddressSanitizer: 4 byte(s) leaked in 1 allocation(s).
-------

6 years agoMerge pull request #7710 from jwrdegoede/hwdb-accel-chuwi-vi8-teclast-x80-pro
Zbigniew Jędrzejewski-Szmek [Wed, 20 Dec 2017 12:57:12 +0000 (13:57 +0100)]
Merge pull request #7710 from jwrdegoede/hwdb-accel-chuwi-vi8-teclast-x80-pro

hwdb/60-sensor.hwdb: Add entries for the Chuwi vi8 and Teclast x80 pro tablets

6 years agoMerge pull request #7702 from keszybz/reduce-linkage
Lennart Poettering [Wed, 20 Dec 2017 11:08:40 +0000 (12:08 +0100)]
Merge pull request #7702 from keszybz/reduce-linkage

Some small cleanups and another attempt to reduce linkage of nss modules

6 years agohwdb: Add accelerometer orientation entry for Teclast X80 Pro tablet
Hans de Goede [Wed, 20 Dec 2017 10:06:13 +0000 (11:06 +0100)]
hwdb: Add accelerometer orientation entry for Teclast X80 Pro tablet

Add an accelerometer orientation entry for the Teclast X80 Pro tablet.

6 years agohwdb: Add accelerometer orientation entry for Chuwi Vi8 (CWI506) tablet
Hans de Goede [Wed, 20 Dec 2017 09:57:38 +0000 (10:57 +0100)]
hwdb: Add accelerometer orientation entry for Chuwi Vi8 (CWI506) tablet

Add an accelerometer orientation entry for the Chuwi Vi8 (CWI506) tablet.

6 years agoman: User=, Group= *never* work for mount units (#7602)
Alan Jenkins [Tue, 19 Dec 2017 20:22:05 +0000 (20:22 +0000)]
man: User=, Group= *never* work for mount units (#7602)

Old text:

> Note that the User= and
> Group= options are not particularly useful for mount units specifying a
> "Type=" option or using configuration not specified in /etc/fstab;
> mount(8) will refuse options that are not listed in /etc/fstab if it is
> not run as UID 0.

However I recently learnt the following:

> The mount program does not read the /etc/fstab file if both device
> and dir are specified.

Therefore, if both device and dir are specified, the `user` or `users`
options in `fstab` will not have any effect.  Run as a normal user,
you will always see

    mount: only root can do that

Fix the explanation in the man page.

Also make sure to markup User= and Group= with <varname>.

6 years agoMerge pull request #7697 from yuwata/fix-man-exec-no-new-priv
Zbigniew Jędrzejewski-Szmek [Tue, 19 Dec 2017 18:31:55 +0000 (19:31 +0100)]
Merge pull request #7697 from yuwata/fix-man-exec-no-new-priv

man: LockPersonality= implies NoNewPrivileges=

6 years agosd-bus: drop check for selinux before calling getsockopt(SO_PEERSEC)
Zbigniew Jędrzejewski-Szmek [Tue, 19 Dec 2017 14:12:50 +0000 (15:12 +0100)]
sd-bus: drop check for selinux before calling getsockopt(SO_PEERSEC)

Quoting Lennart Poettering in
https://github.com/systemd/systemd/pull/6464#issuecomment-319029293:
> If the kernel allows us to query that data we should also be Ok with passing
> it on to our own caller, regardless if selinux is technically on or off...

The advantage is that this allows gcc to be smarter and reduce linkage:
(before)$ ldd build/libnss_systemd.so.2
linux-vdso.so.1 (0x00007ffeb46ff000)
librt.so.1 => /lib64/librt.so.1 (0x00007f2f60da6000)
libcap.so.2 => /lib64/libcap.so.2 (0x00007f2f60ba1000)
libselinux.so.1 => /lib64/libselinux.so.1 (0x00007f2f60978000)
libpthread.so.0 => /lib64/libpthread.so.0 (0x00007f2f60759000)
libc.so.6 => /lib64/libc.so.6 (0x00007f2f60374000)
/lib64/ld-linux-x86-64.so.2 (0x00007f2f61294000)
libpcre2-8.so.0 => /lib64/libpcre2-8.so.0 (0x00007f2f600f0000)
libdl.so.2 => /lib64/libdl.so.2 (0x00007f2f5feec000)
(after )$ ldd build/libnss_systemd.so.2
linux-vdso.so.1 (0x00007ffe5f543000)
librt.so.1 => /lib64/librt.so.1 (0x00007f427dcaa000)
libcap.so.2 => /lib64/libcap.so.2 (0x00007f427daa5000)
libpthread.so.0 => /lib64/libpthread.so.0 (0x00007f427d886000)
libc.so.6 => /lib64/libc.so.6 (0x00007f427d4a1000)
/lib64/ld-linux-x86-64.so.2 (0x00007f427e196000)

Note that this only works in conjuction with the previous commit: either
of the two commits alone does not have the desired effect on linkage.

Replaces #6464.

6 years agoMove selinux-related stuff from btrfs-util.c to label.c
Zbigniew Jędrzejewski-Szmek [Tue, 19 Dec 2017 13:33:11 +0000 (14:33 +0100)]
Move selinux-related stuff from btrfs-util.c to label.c

In preparation for future changes.

6 years agomachine-id-setup: use return log_error… pattern
Zbigniew Jędrzejewski-Szmek [Tue, 19 Dec 2017 09:02:27 +0000 (10:02 +0100)]
machine-id-setup: use return log_error… pattern

No functional difference, but this way it's clearer that the original errno
value is returned.

6 years agobootctl: silence warning about signed/unsigned comparison
Zbigniew Jędrzejewski-Szmek [Tue, 19 Dec 2017 08:21:02 +0000 (09:21 +0100)]
bootctl: silence warning about signed/unsigned comparison

6 years agoAdd T430 series to list of supported trackpoint (#7699)
John Paul Herold [Tue, 19 Dec 2017 10:22:36 +0000 (04:22 -0600)]
Add T430 series to list of supported trackpoint (#7699)

Confirmed via `udevadm test /sys/class/input/eventX` that
POINTINGSTICK_* properties were not being set for my T430s trackpoint.
After adding a local entry file (as advised in this file), the same
`udevadm test` command showed properties.

More importantly, the movement of mouse using trackpoint felt much
better. Hard to describe its previous state, but following come to mind:
slippery, hard to control, awkward. Now it feels more consistent and predictable.
A little on the sensitive side with the defaults, but didn't think it warranted
dedicated properties just for this series though as the X230 is same generation
and uses the defaults.

Before local change:

$ udevadm info /dev/input/event5
P: /devices/platform/i8042/serio1/serio2/input/input6/event5
N: input/event5
E: DEVNAME=/dev/input/event5
E: DEVPATH=/devices/platform/i8042/serio1/serio2/input/input6/event5
E: ID_BUS=i8042
E: ID_INPUT=1
E: ID_INPUT_MOUSE=1
E: ID_INPUT_POINTINGSTICK=1
E: LIBINPUT_DEVICE_GROUP=11/2/a:synaptics-pt/serio0
E: MAJOR=13
E: MINOR=69
E: SUBSYSTEM=input
E: USEC_INITIALIZED=38609915

After change:

$ udevadm info /dev/input/event5
P: /devices/platform/i8042/serio1/serio2/input/input6/event5
N: input/event5
E: DEVNAME=/dev/input/event5
E: DEVPATH=/devices/platform/i8042/serio1/serio2/input/input6/event5
E: ID_BUS=i8042
E: ID_INPUT=1
E: ID_INPUT_MOUSE=1
E: ID_INPUT_POINTINGSTICK=1
E: LIBINPUT_DEVICE_GROUP=11/2/a:synaptics-pt/serio0
E: MAJOR=13
E: MINOR=69
E: POINTINGSTICK_CONST_ACCEL=1.0
E: POINTINGSTICK_SENSITIVITY=200
E: SUBSYSTEM=input
E: USEC_INITIALIZED=38609915

6 years agotimedatectl: fix status output (#7696)
Yu Watanabe [Tue, 19 Dec 2017 10:15:50 +0000 (19:15 +0900)]
timedatectl: fix status output (#7696)

Follow-up for 3ec530a1890925efe347f739917dd4078c1b1942.

Fixes #7693.

6 years agomore portable perl shebangs (#7701)
Jörg Thalheim [Tue, 19 Dec 2017 10:13:34 +0000 (10:13 +0000)]
more portable perl shebangs (#7701)

same motivation as in #5816:

- distributions have scripts to rewrite shebangs on installation and
  they know what locations to rely on.
- For tests/compilation we should rather rely on the user to have setup
  there PATH correctly.

6 years agocryptsetup: use uint64_t for keyfile-offset= (#7689)
Zbigniew Jędrzejewski-Szmek [Tue, 19 Dec 2017 07:51:12 +0000 (08:51 +0100)]
cryptsetup: use uint64_t for keyfile-offset= (#7689)

On 32bit, refuse large offsets. Once https://gitlab.com/cryptsetup/cryptsetup/issues/359
is resolved, we should switch to the new api, whatever it is.

Fixes #7677.

6 years agoman: note that `systemctl show` does not overridden value
Yu Watanabe [Tue, 19 Dec 2017 07:07:04 +0000 (16:07 +0900)]
man: note that `systemctl show` does not overridden value

Fixes #7694.

6 years agoman: LockPersonality= implies NoNewPrivileges=
Yu Watanabe [Tue, 19 Dec 2017 03:48:54 +0000 (12:48 +0900)]
man: LockPersonality= implies NoNewPrivileges=

6 years agoanalyze: use normal bus connection for "plot" verb (#7685)
Zbigniew Jędrzejewski-Szmek [Mon, 18 Dec 2017 18:35:03 +0000 (19:35 +0100)]
analyze: use normal bus connection for "plot" verb (#7685)

We need to connect to hostnamed, so a private bus connection is no good.
It'd be simpler to use the normal bus connection unconditionally, but
that'd mean that e.g. systemd-analyze set-log-level might not work in
emergency mode. So let's keep trying to use the private connection except
for "plot".

Fixes #7667.

6 years agoMerge pull request #7687 from hbakken/work/add-missing-features2
Lennart Poettering [Mon, 18 Dec 2017 18:29:00 +0000 (19:29 +0100)]
Merge pull request #7687 from hbakken/work/add-missing-features2

Kernel 3.10 compat

6 years agobuild-sys: install TRANSIENT-SETTINGS.md and UIDS-GIDS.md (#7690)
Felipe Sateler [Mon, 18 Dec 2017 13:58:13 +0000 (10:58 -0300)]
build-sys: install TRANSIENT-SETTINGS.md and UIDS-GIDS.md (#7690)

6 years agocryptsetup-generator: Don't mistake NULL input as OOM (#7688)
Jan Alexander Steffens [Mon, 18 Dec 2017 13:47:18 +0000 (14:47 +0100)]
cryptsetup-generator: Don't mistake NULL input as OOM (#7688)

Since systemd v236, several Arch users complained that
systemd-cryptsetup-generator exits with an OOM error and that it
prevents the boot from continuing.

Investigating the diff of cryptsetup-generator between v235 and v236 I
noticed that create_disk allowed for the `password` and `filtered`
variables to be NULL (they're handled with `strempty()`) but not their
`*_escaped` versions, and returned OOM errors in those cases.

Fix this by checking that the input string is non-NULL before deciding
that `specifier_escape` had an OOM error.

I could not test this fix myself, but some users have reported success.

Downstream bug: https://bugs.archlinux.org/task/56733

6 years agomissing: Add DM_DEFERRED_REMOVE
Henrik Grindal Bakken [Thu, 23 Mar 2017 15:19:15 +0000 (16:19 +0100)]
missing: Add DM_DEFERRED_REMOVE

Also include missing.h in dissect-image.c to pick it up.

6 years agomissing: Define SMACK_MAGIC if it's missing
Henrik Grindal Bakken [Thu, 23 Mar 2017 15:09:10 +0000 (16:09 +0100)]
missing: Define SMACK_MAGIC if it's missing

6 years agonspawn: Include missing.h
Henrik Grindal Bakken [Thu, 23 Mar 2017 15:02:43 +0000 (16:02 +0100)]
nspawn: Include missing.h

6 years agomissing: Define EFIVARFS_MAGIC if missing
Henrik Grindal Bakken [Thu, 23 Mar 2017 15:02:20 +0000 (16:02 +0100)]
missing: Define EFIVARFS_MAGIC if missing

6 years agomissing: Add MAX_HANDLE_SZ
Henrik Grindal Bakken [Thu, 23 Mar 2017 15:07:33 +0000 (16:07 +0100)]
missing: Add MAX_HANDLE_SZ

6 years agocatalog: update Russian translation (#7678)
Sergey Ptashnick [Mon, 18 Dec 2017 12:41:43 +0000 (15:41 +0300)]
catalog: update Russian translation (#7678)

Translated taint message.

Also added a blank line before "Current system is tagged" for better
visual separation between current system state and tags description.

6 years agomissing: Add PR_SET_MM_{ARG,ENV}_{START,END}
Henrik Grindal Bakken [Thu, 23 Mar 2017 14:42:15 +0000 (15:42 +0100)]
missing: Add PR_SET_MM_{ARG,ENV}_{START,END}

6 years agomissing: Add some more btrfs structs and constants
Henrik Grindal Bakken [Thu, 23 Mar 2017 14:33:06 +0000 (15:33 +0100)]
missing: Add some more btrfs structs and constants

6 years agobtrfs: Include missing.h in btrfs-ctree.h
Henrik Grindal Bakken [Thu, 23 Mar 2017 14:30:57 +0000 (15:30 +0100)]
btrfs: Include missing.h in btrfs-ctree.h

6 years agocondition: Create AssertControlGroupController (#7630)
Chris Down [Mon, 18 Dec 2017 07:53:29 +0000 (07:53 +0000)]
condition: Create AssertControlGroupController (#7630)

Up until now, the behaviour in systemd has (mostly) been to silently
ignore failures to action unit directives that refer to an unavailble
controller. The addition of AssertControlGroupController and its
conditional counterpart allow explicit specification of the desired
behaviour when such a situation occurs.

As for how this can happen, it is possible that a particular controller
is not available in the cgroup hierarchy. One possible reason for this
is that, in the running kernel, the controller simply doesn't exist --
for example, the CPU controller in cgroup v2 has only recently been
merged and was out of tree until then. Another possibility is that the
controller exists, but has been forcibly disabled by `cgroup_disable=`
on the kernel command line.

In future this will also support whatever comes out of issue #7624,
`DefaultXAccounting=never`, or similar.

6 years agoMerge pull request #7665 from poettering/main-cleanup
Zbigniew Jędrzejewski-Szmek [Mon, 18 Dec 2017 07:26:36 +0000 (08:26 +0100)]
Merge pull request #7665 from poettering/main-cleanup

let's split up main() into more functions, to make it digestable

6 years agocatalog: update Polish translation (#7660)
Piotr Drąg [Sat, 16 Dec 2017 14:20:34 +0000 (15:20 +0100)]
catalog: update Polish translation (#7660)

6 years agoMerge pull request #7664 from poettering/fix-integration-tests
Zbigniew Jędrzejewski-Szmek [Sat, 16 Dec 2017 14:01:04 +0000 (15:01 +0100)]
Merge pull request #7664 from poettering/fix-integration-tests

Fix integration tests

6 years agoman: generalize "binary" to "program" (#7668)
Alan Jenkins [Sat, 16 Dec 2017 10:48:12 +0000 (10:48 +0000)]
man: generalize "binary" to "program" (#7668)

Systemd services are permitted to be scripts, as well as binary
executables.

The same also applies to the underlying /sbin/mount and /sbin/swapon.
It is not necessary for the user to consider what type of program file
these are.  Nor is it necessary with systemd-nspawn, to distinguish between
init as a "binary" v.s. a user-specified "program".

Also fix a couple of grammar nits in the modified sentences.

6 years agomeson: libudev_core and udevadm should have LOG_REALM=LOG_REALM_UDEV (#7666)
Franck Bui [Sat, 16 Dec 2017 08:36:36 +0000 (09:36 +0100)]
meson: libudev_core and udevadm should have LOG_REALM=LOG_REALM_UDEV (#7666)

Otherwise, setting udev_log=debug in /etc/udev/udev.conf has no effects since
systemd-udevd is built with LOG_REALM=LOG_REALM_UDEV.

However using LOG_REALM_UDEV (for libudev_core) reveals another similar bug for
udevadm which should also define LOG_REALM_UDEV.

6 years agoMerge pull request #7661 from keszybz/slice-cleanups
Lennart Poettering [Fri, 15 Dec 2017 19:55:39 +0000 (20:55 +0100)]
Merge pull request #7661 from keszybz/slice-cleanups

Slice cleanups and systemd-mount --owner

6 years agomain: add some more comments for the early initialization phase
Lennart Poettering [Fri, 15 Dec 2017 18:03:17 +0000 (19:03 +0100)]
main: add some more comments for the early initialization phase

6 years agomain: reorder variable declarations a bit
Lennart Poettering [Fri, 15 Dec 2017 18:02:35 +0000 (19:02 +0100)]
main: reorder variable declarations a bit

Let's remove a bit redundancy, and list variables of the same
type/category in one declaration line.

6 years agomain: split out 'skip_setup' check into its own functions
Lennart Poettering [Fri, 15 Dec 2017 17:53:03 +0000 (18:53 +0100)]
main: split out 'skip_setup' check into its own functions

And let's optimize it a tiny bit, by only iterating through the argument
list once, instead of twice.

6 years agomain: do bother with uid_to_name() unless we do debug logging
Lennart Poettering [Fri, 15 Dec 2017 17:51:54 +0000 (18:51 +0100)]
main: do bother with uid_to_name() unless we do debug logging

6 years agomain: conditionalize fixup_environment() internally
Lennart Poettering [Fri, 15 Dec 2017 16:54:20 +0000 (17:54 +0100)]
main: conditionalize fixup_environment() internally

This code is executed before we parse command line/configuration
parameters, hence let's not use arg_system to figure our how to clean up
things, but instead PID == 1. Let's move that check inside of the
function, to make things a bit more robust abstract from the outside.

Also, let's add a log message about this, that was so far missing.

6 years agomain: let's move ACTION_RUN test into initialize_runtime()
Lennart Poettering [Fri, 15 Dec 2017 16:52:33 +0000 (17:52 +0100)]
main: let's move ACTION_RUN test into initialize_runtime()

Let's hide this check inside the function and make it easier to follow
the general control flow of main().

6 years agomount-setup: fix MNT_CHECK_WRITABLE error handling, and log about the issue
Lennart Poettering [Fri, 15 Dec 2017 16:37:16 +0000 (17:37 +0100)]
mount-setup: fix MNT_CHECK_WRITABLE error handling, and log about the issue

Let's correct the error handling (the error is in errno, not r), and
let's add logging like the rest of the function has it.

6 years agomain: tweak timerslack message a bit
Lennart Poettering [Fri, 15 Dec 2017 16:36:19 +0000 (17:36 +0100)]
main: tweak timerslack message a bit

Let's clarify that this is a non-issue, by downgrading it to LOG_WARN
and saying "ignoring" in the message.

6 years agomain: move install_crash_handler() and mount_cgroup_controllers() invocations
Lennart Poettering [Fri, 15 Dec 2017 16:34:12 +0000 (17:34 +0100)]
main: move install_crash_handler() and mount_cgroup_controllers() invocations

Let's place them in initialize_runtime(), where they appear to fit best.
Effectively this is just a move a little bit down, swapping places with
log_execution_mode(), which should require neither call to be done
first.

Note that changes the conditionalization a bit for these calls, from
(PID == 1) to (arg_system && arg_action == ACTION_RUN). At this point this is pretty much the same
however, as we don't allow PID 1 without ACTION_RUN and without
arg_system set, safety_checks() ensures that.

6 years agocore: move arg_show_status fix-up into load_configuration()
Lennart Poettering [Fri, 15 Dec 2017 16:16:24 +0000 (17:16 +0100)]
core: move arg_show_status fix-up into load_configuration()

It's part of finalizing our runtime parameters, hence let's move this
into load_configuration() after we loaded everything else. This is safe,
since we don't use it between the location where it was and where we
place it now yet.

6 years agomain: split out code that sets up the console/terminal and stuff
Lennart Poettering [Fri, 15 Dec 2017 16:13:36 +0000 (17:13 +0100)]
main: split out code that sets up the console/terminal and stuff

More refactoring to make main() more digestable.

6 years agomain: split out code that collects passed fds
Lennart Poettering [Fri, 15 Dec 2017 16:09:18 +0000 (17:09 +0100)]
main: split out code that collects passed fds

More refactoring to make main() more digestable

6 years agomain: slight modernizations for status_welcome()
Lennart Poettering [Fri, 15 Dec 2017 16:03:55 +0000 (17:03 +0100)]
main: slight modernizations for status_welcome()

There's no point in duplicating the complex parse_env_file() invocation,
hence let's not do it.

6 years agomain: let's move the arg_show_status check into status_welcome()
Lennart Poettering [Fri, 15 Dec 2017 16:00:35 +0000 (17:00 +0100)]
main: let's move the arg_show_status check into status_welcome()

It's kinda nice to hide this check inside of status_welcome() itself, so
that it handles all this on its own.

6 years agomain: slightly rearrange serialization fdset, and logging/console setup
Lennart Poettering [Fri, 15 Dec 2017 15:53:13 +0000 (16:53 +0100)]
main: slightly rearrange serialization fdset, and logging/console setup

Let's merge two if blocks, and move log_close()/log_open() out of the
testing codepath, as there's no reason to have it there.

6 years agomain: move chdir("/") a bit earlier
Lennart Poettering [Fri, 15 Dec 2017 15:49:43 +0000 (16:49 +0100)]
main: move chdir("/") a bit earlier

There's no need to do this within the block where logging is closed,
hence move it earlier, so that this block can be kept as small as
possible.

6 years agomain: move initialize_join_controllers() invocation into load_configuration()
Lennart Poettering [Fri, 15 Dec 2017 15:48:07 +0000 (16:48 +0100)]
main: move initialize_join_controllers() invocation into load_configuration()

This just sets up some variables the loaded configuration will then
modify. Let's invoke it hence right before loading the configuration.

This moves the initialization just a tiny bit later, but that shouldn't
matter, since we never access it in-between.

6 years agomain: split out taint string logging into its own function
Lennart Poettering [Fri, 15 Dec 2017 15:38:57 +0000 (16:38 +0100)]
main: split out taint string logging into its own function

It's sufficiently complex now, let's add our own function for this too.

6 years agocore: add more safety check
Lennart Poettering [Fri, 15 Dec 2017 15:38:20 +0000 (16:38 +0100)]
core: add more safety check

Let's make sure that if we are PID 1 we are invoked in ACTION_RUN mode,
and in arg_system mode, as well as the opposite.

Everything else is untested and probably not worth supporting hence
let's bail out early if people try anyway.

6 years agocore: split out test summary output into its own function
Lennart Poettering [Fri, 15 Dec 2017 15:34:13 +0000 (16:34 +0100)]
core: split out test summary output into its own function

More refactoring to make main() shorter.

6 years agomain: split out security policy loading into its own function
Lennart Poettering [Fri, 15 Dec 2017 15:32:10 +0000 (16:32 +0100)]
main: split out security policy loading into its own function

More refactoring to make things more digestable.

6 years agomain: invoke pager_open() only at one place
Lennart Poettering [Fri, 15 Dec 2017 15:25:28 +0000 (16:25 +0100)]
main: invoke pager_open() only at one place

Let's just move this up a few lines and unify the invocation.

6 years agocore: split out various startup safety checks from main() into its own function
Lennart Poettering [Fri, 15 Dec 2017 15:23:09 +0000 (16:23 +0100)]
core: split out various startup safety checks from main() into its own function

No functional changes, just some refactoring to make main() more
digestable.

6 years agomain: split out all parsing of command line arguments/kernel arguments/configuration...
Lennart Poettering [Fri, 15 Dec 2017 15:14:19 +0000 (16:14 +0100)]
main: split out all parsing of command line arguments/kernel arguments/configuration files

Let's shorten main() a bit, and split out everything that loads our
configuration and runtime parameters into a function of its own.

No changes in behaviour.

6 years agomain: minor optimization
Lennart Poettering [Fri, 15 Dec 2017 15:13:44 +0000 (16:13 +0100)]
main: minor optimization

Let's remove one memory allocation in the common path.

6 years agotest: fix TEST-13-NSPAWN-SMOKE
Lennart Poettering [Fri, 15 Dec 2017 19:49:11 +0000 (20:49 +0100)]
test: fix TEST-13-NSPAWN-SMOKE

We need to specify a full path to the "ip" binary and busybox "ip" has a
slightly different output than the normal ip, and won't show "DOWN".
hence instead ensure that at lest not "UP" is in there.

6 years agotest: make sure "make" in the test directories works again
Lennart Poettering [Fri, 15 Dec 2017 18:47:16 +0000 (19:47 +0100)]
test: make sure "make" in the test directories works again

Fixes: #7648

6 years agogenerator: add helper function for writing unit files
Zbigniew Jędrzejewski-Szmek [Sat, 9 Dec 2017 18:23:26 +0000 (19:23 +0100)]
generator: add helper function for writing unit files

It doesn't save too much, but it's a common pattern so I think it's worth
to factor this out.

6 years agoFix logical error in meson.build (#7658)
Max Harmathy [Fri, 15 Dec 2017 15:05:25 +0000 (16:05 +0100)]
Fix logical error in meson.build (#7658)

sysvinit_path and sysvrcnd_path have to be set both to activate Sysv compatibility.

6 years agomount: add option to specify uid= and gid=
Zbigniew Jędrzejewski-Szmek [Sat, 9 Dec 2017 09:18:48 +0000 (10:18 +0100)]
mount: add option to specify uid= and gid=

The kernel needs two numbers, but for the user it's most convenient to provide the
user name and have that resolved to uid and gid.

Right now the primary group of the specified user is always used. That's the most
common case anyway. In the future we can extend the --owner option to allow a group
after a colon.

[I added this before realizing that this will not be enough to be used for user
runtime directory. But this seems useful on its own, so I'm keeping this commit.]

6 years agologind: use free_and_replace in one spot
Zbigniew Jędrzejewski-Szmek [Thu, 7 Dec 2017 21:16:16 +0000 (22:16 +0100)]
logind: use free_and_replace in one spot

No functional change.

6 years agotree-wide: use SPECIAL_ROOT_SLICE
Zbigniew Jędrzejewski-Szmek [Thu, 7 Dec 2017 13:28:00 +0000 (14:28 +0100)]
tree-wide: use SPECIAL_ROOT_SLICE

6 years agocore: reuse slice_build_parent_slice
Zbigniew Jędrzejewski-Szmek [Thu, 7 Dec 2017 13:23:58 +0000 (14:23 +0100)]
core: reuse slice_build_parent_slice

6 years agologind: fix misleading message
Zbigniew Jędrzejewski-Szmek [Thu, 7 Dec 2017 12:12:13 +0000 (13:12 +0100)]
logind: fix misleading message

This message would also be emitted at boot for any user with linger
enabled, so "logged in" is the wrong term to use.

6 years agologind: simplify one conditional
Zbigniew Jędrzejewski-Szmek [Thu, 7 Dec 2017 11:57:31 +0000 (12:57 +0100)]
logind: simplify one conditional

Don't bother with removing the directory if we didn't create it.

6 years agoman: Clarify when OnFailure= activates after restarts (#7646)
Ken (Bitsko) MacLeod [Fri, 15 Dec 2017 10:10:41 +0000 (04:10 -0600)]
man: Clarify when OnFailure= activates after restarts (#7646)

6 years agotree-wide: add DEBUG_LOGGING macro that checks whether debug logging is on (#7645)
Lennart Poettering [Fri, 15 Dec 2017 10:09:00 +0000 (11:09 +0100)]
tree-wide: add DEBUG_LOGGING macro that checks whether debug logging is on (#7645)

This makes things a bit easier to read I think, and also makes sure we
always use the _unlikely_ wrapper around it, which so far we used
sometimes and other times we didn't. Let's clean that up.

6 years agoMerge pull request #7637 from yuwata/transient-path
Lennart Poettering [Fri, 15 Dec 2017 09:53:49 +0000 (10:53 +0100)]
Merge pull request #7637 from yuwata/transient-path

core/path: implement transient path unit

6 years agoMerge pull request #7631 from cgwalters/systemctl-offline
Lennart Poettering [Fri, 15 Dec 2017 09:29:21 +0000 (10:29 +0100)]
Merge pull request #7631 from cgwalters/systemctl-offline

systemctl,verbs: Introduce SYSTEMCTL_OFFLINE environment variable

6 years agoMerge pull request #7644 from poettering/memzero
Lennart Poettering [Fri, 15 Dec 2017 09:27:31 +0000 (10:27 +0100)]
Merge pull request #7644 from poettering/memzero

add memzero()/zero() coccinelle scripts and use them

6 years agoCODING_STYLE: provide better explanation why /* */ over // (#7647)
Lennart Poettering [Fri, 15 Dec 2017 09:26:07 +0000 (10:26 +0100)]
CODING_STYLE: provide better explanation why /* */ over // (#7647)

Let's provide a real reason why /* */ should be used for commenting,
rather than //, beyond mere taste.

(This ultimately simply codifies how I use // vs. /* */ comments, and I
think this is useful as an explanation and reason hence.)

6 years agoTODO: update
Yu Watanabe [Thu, 14 Dec 2017 13:17:17 +0000 (22:17 +0900)]
TODO: update

6 years agodoc: update TRANSIENT-SETTINGS.md
Yu Watanabe [Thu, 14 Dec 2017 13:02:06 +0000 (22:02 +0900)]
doc: update TRANSIENT-SETTINGS.md

6 years agobus-unit-util: add path unit related options
Yu Watanabe [Fri, 15 Dec 2017 00:11:39 +0000 (09:11 +0900)]
bus-unit-util: add path unit related options

6 years agocore/path: implement transient path unit
Yu Watanabe [Mon, 11 Dec 2017 15:10:58 +0000 (00:10 +0900)]
core/path: implement transient path unit

6 years agocore/dbus-timer: improve error messages
Yu Watanabe [Thu, 14 Dec 2017 12:52:47 +0000 (21:52 +0900)]
core/dbus-timer: improve error messages

6 years agobus-unit-util: improve error messages
Yu Watanabe [Thu, 14 Dec 2017 07:34:26 +0000 (16:34 +0900)]
bus-unit-util: improve error messages

6 years agobus-unit-util: remove unnecessary oom check
Yu Watanabe [Thu, 14 Dec 2017 07:32:59 +0000 (16:32 +0900)]
bus-unit-util: remove unnecessary oom check

We cannot detect error by alloca().

6 years agofinal v236 update (#7649) v236
Lennart Poettering [Thu, 14 Dec 2017 22:09:57 +0000 (23:09 +0100)]
final v236 update (#7649)

6 years agoMerge pull request #7608 from poettering/more-news-v236
Lennart Poettering [Thu, 14 Dec 2017 21:58:22 +0000 (22:58 +0100)]
Merge pull request #7608 from poettering/more-news-v236

more v236 news improvements

6 years agoMerge pull request #6598 from kyle-walker/shutdown-limit
Lennart Poettering [Thu, 14 Dec 2017 21:57:57 +0000 (22:57 +0100)]
Merge pull request #6598 from kyle-walker/shutdown-limit

core: Limit the time and attempts in shutdown remount/umount efforts

6 years agoMerge pull request #7640 from keszybz/tainting-updates
Lennart Poettering [Thu, 14 Dec 2017 21:57:17 +0000 (22:57 +0100)]
Merge pull request #7640 from keszybz/tainting-updates

Tainting updates

6 years agoMerge pull request #7469 from kinvolk/dongsu/nspawn-netns
Zbigniew Jędrzejewski-Szmek [Thu, 14 Dec 2017 21:47:57 +0000 (22:47 +0100)]
Merge pull request #7469 from kinvolk/dongsu/nspawn-netns

nspawn: introduce an option for specifying network namespace path

6 years agoUpdate TODO
Zbigniew Jędrzejewski-Szmek [Thu, 14 Dec 2017 13:12:39 +0000 (14:12 +0100)]
Update TODO

6 years agomeson: restore --update-catalog call after install
Zbigniew Jędrzejewski-Szmek [Thu, 14 Dec 2017 13:12:31 +0000 (14:12 +0100)]
meson: restore --update-catalog call after install

This got dropped by mistake in 72cdb3e783174dcf9223a49f03e3b0e2ca95ddb8.