[systemd-commits] 6 commits - man/systemd.exec.xml man/systemd.socket.xml shell-completion/zsh src/core src/nspawn src/shared src/udev TODO
Zbigniew Jędrzejewski-Szmek
zbyszek at kemper.freedesktop.org
Fri Aug 23 09:48:39 PDT 2013
TODO | 6 +++---
man/systemd.exec.xml | 10 +++++++++-
man/systemd.socket.xml | 2 +-
shell-completion/zsh/_hostnamectl | 2 +-
shell-completion/zsh/_journalctl | 14 +++++++-------
shell-completion/zsh/_localectl | 2 +-
shell-completion/zsh/_loginctl | 6 +++---
shell-completion/zsh/_machinectl | 6 +++---
shell-completion/zsh/_systemctl | 12 ++++++------
shell-completion/zsh/_systemd | 8 ++++----
shell-completion/zsh/_systemd-coredumpctl | 4 ++--
shell-completion/zsh/_systemd-delta | 2 +-
shell-completion/zsh/_systemd-nspawn | 8 ++++----
shell-completion/zsh/_timedatectl | 2 +-
src/core/dbus-cgroup.c | 2 +-
src/core/namespace.c | 12 +++++++++++-
src/nspawn/nspawn.c | 2 +-
src/shared/conf-parser.c | 10 ++++++++--
src/udev/udev-rules.c | 2 +-
19 files changed, 68 insertions(+), 44 deletions(-)
New commits:
commit 862f4963c6f7778cea9e715eeb11ea959eba6db3
Author: William Giokas <1007380 at gmail.com>
Date: Tue Aug 20 22:06:54 2013 -0500
zsh_completion: Fix single letter args
Things like -n to specify the lines to show with systemctl and
journalctl accepts syntax like:
journalctl -n4
systemctl -n14
Previously, typing `-nXX <tab>` where XX is a number, zsh would try to
complete an integer. Now it will see the XX and use the _journalctl_none
completion. This is also how any of the single letter options that take
arguments work as well.
diff --git a/shell-completion/zsh/_hostnamectl b/shell-completion/zsh/_hostnamectl
index 9d01495..45b9597 100644
--- a/shell-completion/zsh/_hostnamectl
+++ b/shell-completion/zsh/_hostnamectl
@@ -28,5 +28,5 @@ _arguments -s \
'--static[Only set static hostname]' \
'--pretty[Only set pretty hostname]' \
'--no-ask-password[Do not prompt for password]' \
- {-H,--host=}'[Operate on remote host]:userathost:_sd_hosts_or_user_at_host' \
+ {-H+,--host=}'[Operate on remote host]:userathost:_sd_hosts_or_user_at_host' \
'*::hostnamectl commands:_hostnamectl_command'
diff --git a/shell-completion/zsh/_journalctl b/shell-completion/zsh/_journalctl
index 212bfdb..7c5cc13 100644
--- a/shell-completion/zsh/_journalctl
+++ b/shell-completion/zsh/_journalctl
@@ -62,26 +62,26 @@ _arguments -s \
{-a,--all}'[Show all fields, including long and unprintable]' \
{-f,--follow}'[Follow journal]' \
{-e,--pager-end}'[Jump to the end of the journal in the pager]' \
- {-n,--lines=}'[Number of journal entries to show]:integer' \
+ {-n+,--lines=}'[Number of journal entries to show]:integer' \
'--no-tail[Show all lines, even in follow mode]' \
{-r,--reverse}'[Reverse output]' \
- {-o,--output=}'[Change journal output mode]:output modes:_outputmodes' \
+ {-o+,--output=}'[Change journal output mode]:output modes:_outputmodes' \
{-x,--catalog}'[Show explanatory texts with each log line]' \
{-q,--quiet}"[Don't show privilege warning]" \
{-m,--merge}'[Show entries from all available journals]' \
- {-b,--boot=}'[Show data only from the specified boot or offset]:boot id or offset:_journal_boots' \
+ {-b+,--boot=}'[Show data only from the specified boot or offset]:boot id or offset:_journal_boots' \
{-k,--dmesg}'[Show only kernel messages, Implies -b]' \
- {-u,--unit=}'[Show data only from the specified unit]:units:_journal_fields _SYSTEMD_UNIT' \
+ {-u+,--unit=}'[Show data only from the specified unit]:units:_journal_fields _SYSTEMD_UNIT' \
'--user-unit[Show data only from the specified user session unit]:units:_journal_fields _SYSTEMD_USER_UNIT' \
- {-p,--priority=}'[Show only messages within the specified priority range]:priority:_journal_fields PRIORITY' \
- {-c,--cursor=}'[Start showing entries from specified cursor]:cursors:_journal_fields __CURSORS' \
+ {-p+,--priority=}'[Show only messages within the specified priority range]:priority:_journal_fields PRIORITY' \
+ {-c+,--cursor=}'[Start showing entries from specified cursor]:cursors:_journal_fields __CURSORS' \
'--after-cursor=[Start showing entries from the location in the journal after the cursor]:cursors:_journal_fields __CURSORS' \
'--since=[Start showing entries newer or of the specified date]:YYYY-MM-DD HH\:MM\:SS' \
'--until=[Stop showing entries older or of the specified date]:YYYY-MM-DD HH\:MM\:SS' \
{-F,--field=}'[List all values a certain field takes]:Fields:_list_fields' \
'--system[Show system and kernel messages]' \
'--user[Show messages from user services]' \
- {-D,--directory=}'[Show journal files from directory]:directories:_directories' \
+ {-D+,--directory=}'[Show journal files from directory]:directories:_directories' \
'--file=[Operate on specified journal files]:file:_files' \
'--root=[Operate on catalog hierarchy under specified directory]:directories:_directories' \
'--new-id128[Generate a new 128 Bit ID]' \
diff --git a/shell-completion/zsh/_localectl b/shell-completion/zsh/_localectl
index 321e418..3d76bb0 100644
--- a/shell-completion/zsh/_localectl
+++ b/shell-completion/zsh/_localectl
@@ -79,5 +79,5 @@ _arguments \
"--no-convert[Don't convert keyboard mappings]" \
'--no-pager[Do not pipe output into a pager]' \
'--no-ask-password[Do not prompt for password]' \
- {-H,--host=}'[Operate on remote host]:userathost:_sd_hosts_or_user_at_host' \
+ {-H+,--host=}'[Operate on remote host]:userathost:_sd_hosts_or_user_at_host' \
'*::localectl commands:_localectl_command'
diff --git a/shell-completion/zsh/_loginctl b/shell-completion/zsh/_loginctl
index 6d88685..ebf6b3a 100644
--- a/shell-completion/zsh/_loginctl
+++ b/shell-completion/zsh/_loginctl
@@ -95,12 +95,12 @@ done
_arguments -s \
{-h,--help}'[Show help]' \
'--version[Show package version]' \
- \*{-p,--property=}'[Show only properties by this name]:unit property' \
+ \*{-p+,--property=}'[Show only properties by this name]:unit property' \
{-a,--all}'[Show all properties, including empty ones]' \
'--kill-who=[Who to send signal to]:killwho:(main control all)' \
- {-s,--signal=}'[Which signal to send]:signal:_signals' \
+ {-s+,--signal=}'[Which signal to send]:signal:_signals' \
'--no-ask-password[Do not ask for system passwords]' \
- {-H,--host=}'[Show information for remote host]:userathost:_sd_hosts_or_user_at_host' \
+ {-H+,--host=}'[Show information for remote host]:userathost:_sd_hosts_or_user_at_host' \
{-P,--privileged}'[Acquire privileges before execution]' \
'--no-pager[Do not pipe output into a pager]' \
'*::loginctl command:_loginctl_command'
diff --git a/shell-completion/zsh/_machinectl b/shell-completion/zsh/_machinectl
index abdf46f..2e5e05c 100644
--- a/shell-completion/zsh/_machinectl
+++ b/shell-completion/zsh/_machinectl
@@ -35,13 +35,13 @@
_arguments \
{-h,--help}'[Prints a short help text and exits.]' \
'--version[Prints a short version string and exits.]' \
- \*{-p,--property=}'[Limit output to specified property.]:property:(Name Id Timestamp TimestampMonotonic Service Scope Leader Class State RootDirectory)' \
+ \*{-p+,--property=}'[Limit output to specified property.]:property:(Name Id Timestamp TimestampMonotonic Service Scope Leader Class State RootDirectory)' \
{-a,--all}'[Show all proerties]' \
(-l,--full)'[Do not ellipsize cgroup members]' \
'--no-pager[Do not pipe output into a pager]' \
'--no-ask-password[Do not ask for system passwords]' \
'--kill-who=[Who to send signal to]:killwho:(leader all)' \
- {-s,--signal=}'[Which signal to send]:signal:_signals' \
- {-H,--host=}'[Show information for remote host]:userathost:_sd_hosts_or_user_at_host' \
+ {-s+,--signal=}'[Which signal to send]:signal:_signals' \
+ {-H+,--host=}'[Show information for remote host]:userathost:_sd_hosts_or_user_at_host' \
{-P,--privileged}'[Acquire privileges before execution]' \
'*::machinectl command:_machinectl_command'
diff --git a/shell-completion/zsh/_systemctl b/shell-completion/zsh/_systemctl
index cc2df3c..3d5f2ff 100644
--- a/shell-completion/zsh/_systemctl
+++ b/shell-completion/zsh/_systemctl
@@ -309,9 +309,9 @@ _unit_types() {
_arguments -s \
{-h,--help}'[Show help]' \
'--version[Show package version]' \
- {-t,--type=}'[List only units of a particular type]:unit type:_unit_types' \
+ {-t+,--type=}'[List only units of a particular type]:unit type:_unit_types' \
'--state=[Display units in the specifyied state]:unit state:_unit_states' \
- \*{-p,--property=}'[Show only properties by specific name]:unit property' \
+ \*{-p+,--property=}'[Show only properties by specific name]:unit property' \
{-a,--all}'[Show all units/properties, including dead/empty ones]' \
'--reverse[Show reverse dependencies]' \
'--after[Show units ordered after]' \
@@ -334,13 +334,13 @@ _arguments -s \
"--no-reload[When enabling/disabling unit files, don't reload daemon configuration]" \
'--no-ask-password[Do not ask for system passwords]' \
'--kill-who=[Who to send signal to]:killwho:(main control all)' \
- {-s,--signal=}'[Which signal to send]:signal:_signals' \
+ {-s+,--signal=}'[Which signal to send]:signal:_signals' \
{-f,--force}'[When enabling unit files, override existing symlinks. When shutting down, execute action immediately]' \
'--root=[Enable unit files in the specified root directory]:directory:_directories' \
'--runtime[Enable unit files only temporarily until next reboot]' \
- {-H,--host=}'[Show information for remote host]:userathost:_sd_hosts_or_user_at_host' \
+ {-H+,--host=}'[Show information for remote host]:userathost:_sd_hosts_or_user_at_host' \
{-P,--privileged}'[Acquire privileges before execution]' \
- {-n,--lines=}'[Journal entries to show]:number of entries' \
- {-o,--output=}'[Change journal output mode]:modes:_outputmodes' \
+ {-n+,--lines=}'[Journal entries to show]:number of entries' \
+ {-o+,--output=}'[Change journal output mode]:modes:_outputmodes' \
'--plain[When used with list-dependencies, print output as a list]' \
'*::systemctl command:_systemctl_command'
diff --git a/shell-completion/zsh/_systemd b/shell-completion/zsh/_systemd
index e954c3e..06f03bd 100644
--- a/shell-completion/zsh/_systemd
+++ b/shell-completion/zsh/_systemd
@@ -15,8 +15,8 @@ case "$service" in
_arguments \
{-h,--help}'[Show this help]' \
'--version[Show package version.]' \
- {-t,--identifier=}'[Set syslog identifier.]' \
- {-p,--priority=}'[Set priority value.]:value:({0..7})' \
+ {-t+,--identifier=}'[Set syslog identifier.]' \
+ {-p+,--priority=}'[Set priority value.]:value:({0..7})' \
'--level-prefix=[Control whether level prefix shall be parsed.]:boolean:(1 0)' \
':Message'
;;
@@ -38,8 +38,8 @@ case "$service" in
'(-m -p -i -t)-c[Order by CPU load]' \
'(-c -p -i -t)-m[Order by memory load]' \
'(-c -m -p -t)-i[Order by IO load]' \
- {-d,--delay=}'[Specify delay]' \
- {-n,--iterations=}'[Run for N iterations before exiting]' \
+ {-d+,--delay=}'[Specify delay]' \
+ {-n+,--iterations=}'[Run for N iterations before exiting]' \
{-b,--batch}'[Run in batch mode, accepting no input]' \
'--depth=[Maximum traversal depth]'
;;
diff --git a/shell-completion/zsh/_systemd-coredumpctl b/shell-completion/zsh/_systemd-coredumpctl
index 1c67500..159e8ee 100644
--- a/shell-completion/zsh/_systemd-coredumpctl
+++ b/shell-completion/zsh/_systemd-coredumpctl
@@ -28,8 +28,8 @@ _systemd-coredumpctl_command(){
}
_arguments \
- {-o,--output=}'[Write output to FILE]:output file:_files' \
- {-F,--field=}'[Show field in list output]:field' \
+ {-o+,--output=}'[Write output to FILE]:output file:_files' \
+ {-F+,--field=}'[Show field in list output]:field' \
'--no-pager[Do not pipe output into a pager]' \
{-h,--help}'[Show this help]' \
'--version[Show package version]' \
diff --git a/shell-completion/zsh/_systemd-delta b/shell-completion/zsh/_systemd-delta
index 6abb6fc..757f1b6 100644
--- a/shell-completion/zsh/_systemd-delta
+++ b/shell-completion/zsh/_systemd-delta
@@ -11,5 +11,5 @@ _arguments \
'--version[Show package version]' \
'--no-pager[Do not pipe output into a pager]' \
'--diff=[Show a diff when overridden files differ]:boolean:(1 0)' \
- {-t,--type=}'[Only display a selected set of override types]:types:_delta_type' \
+ {-t+,--type=}'[Only display a selected set of override types]:types:_delta_type' \
':SUFFIX:(tmpfiles.d sysctl.d systemd/system)'
diff --git a/shell-completion/zsh/_systemd-nspawn b/shell-completion/zsh/_systemd-nspawn
index a5f345e..a8c2411 100644
--- a/shell-completion/zsh/_systemd-nspawn
+++ b/shell-completion/zsh/_systemd-nspawn
@@ -12,11 +12,11 @@ _nspawn-caps(){
_arguments \
{-h,--help}'[Show this help]' \
- {--directory=,-D}'[Directory to use as file system root for the namespace container. If omitted the current directory will be used.]:directories:_directories' \
- {--boot,-b}'[Automatically search for an init binary and invoke it instead of a shell or a user supplied program.]' \
- {--user=,-u}'[Run the command under specified user, create home directory and cd into it.]' \
+ {--directory=,-D+}'[Directory to use as file system root for the namespace container. If omitted the current directory will be used.]:directories:_directories' \
+ {--boot,-b+}'[Automatically search for an init binary and invoke it instead of a shell or a user supplied program.]' \
+ {--user=,-u+}'[Run the command under specified user, create home directory and cd into it.]' \
'--uuid=[Set the specified uuid for the container.]' \
- {--controllers=,-C}'[Makes the container appear in other hierarchies than the name=systemd:/ one. Takes a comma-separated list of controllers.]' \
+ {--controllers=,-C+}'[Makes the container appear in other hierarchies than the name=systemd:/ one. Takes a comma-separated list of controllers.]' \
'--private-network[Turn off networking in the container. This makes all network interfaces unavailable in the container, with the exception of the loopback device.]' \
'--read-only[Mount the root file system read only for the container.]' \
'--capability=[List one or more additional capabilities to grant the container.]:capabilities:_nspawn-caps' \
diff --git a/shell-completion/zsh/_timedatectl b/shell-completion/zsh/_timedatectl
index 9e24b86..987c2de 100644
--- a/shell-completion/zsh/_timedatectl
+++ b/shell-completion/zsh/_timedatectl
@@ -61,5 +61,5 @@ _arguments -s \
'--adjust-system-clock[Adjust system clock when changing local RTC mode]' \
'--no-pager[Do not pipe output into a pager]' \
'--no-ask-password[Do not prompt for password]' \
- {-H,--host=}'[Operate on remote host]:userathost:_sd_hosts_or_user_at_host' \
+ {-H+,--host=}'[Operate on remote host]:userathost:_sd_hosts_or_user_at_host' \
'*::timedatectl commands:_timedatectl_command'
commit ea92ae33e0fbbf8a98cd2e08ca5a850d83d57fae
Author: Maciej Wereski <m.wereski at partner.samsung.com>
Date: Wed Aug 21 16:43:55 2013 +0200
"-" prefix for InaccessibleDirectories and ReadOnlyDirectories
diff --git a/TODO b/TODO
index 3800ce4..fe305ec 100644
--- a/TODO
+++ b/TODO
@@ -23,6 +23,9 @@ Bugfixes:
- make the resulting line the requested number of *characters*, not *bytes*,
- avoid truncuating multi-byte sequences in the middle.
+* When we detect invalid UTF-8, we cant't use it in an error message:
+ log...("Path is not UTF-8 clean, ignoring assignment: %s", rvalue);
+
* shorten the message to sane length:
Cannot add dependency job for unit display-manager.service, ignoring: Unit display-manager.service failed to load: No such file or directory. See system logs and 'systemctl status display-manager.service' for details.
@@ -285,9 +288,6 @@ Features:
* timedate: have global on/off switches for auto-time (NTP), and auto-timezone that connman can subscribe to.
-* Honour "-" prefix for InaccessibleDirectories= and ReadOnlyDirectories= to
- suppress errors of the specified path doesn't exist
-
* dev-setup.c: when running in a container, create a tiny stub udev
database with the systemd tag set for all network interfaces found,
so that libudev reports them as present, and systemd's .device units
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index c0e1d86..b761832 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -828,7 +828,15 @@
the empty string is assigned to this
option the specific list is reset, and
all prior assignments have no
- effect.</para></listitem>
+ effect.</para>
+ <para>Paths in
+ <varname>ReadOnlyDirectories=</varname>
+ and
+ <varname>InaccessibleDirectories=</varname>
+ may be prefixed with
+ <literal>-</literal>, in which case
+ they will be ignored when they don't
+ exist.</para></listitem>
</varlistentry>
<varlistentry>
diff --git a/src/core/namespace.c b/src/core/namespace.c
index 7e33d84..16b132b 100644
--- a/src/core/namespace.c
+++ b/src/core/namespace.c
@@ -51,6 +51,7 @@ typedef struct BindMount {
const char *path;
MountMode mode;
bool done;
+ bool ignore;
} BindMount;
static int append_mounts(BindMount **p, char **strv, MountMode mode) {
@@ -58,6 +59,13 @@ static int append_mounts(BindMount **p, char **strv, MountMode mode) {
STRV_FOREACH(i, strv) {
+ (*p)->ignore = false;
+
+ if ((mode == INACCESSIBLE || mode == READONLY) && (*i)[0] == '-') {
+ (*p)->ignore = true;
+ (*i)++;
+ }
+
if (!path_is_absolute(*i))
return -EINVAL;
@@ -155,6 +163,8 @@ static int apply_mount(
r = mount(what, m->path, NULL, MS_BIND|MS_REC, NULL);
if (r >= 0)
log_debug("Successfully mounted %s to %s", what, m->path);
+ else if (m->ignore && errno == ENOENT)
+ r = 0;
return r;
}
@@ -168,7 +178,7 @@ static int make_read_only(BindMount *m) {
return 0;
r = mount(NULL, m->path, NULL, MS_BIND|MS_REMOUNT|MS_RDONLY|MS_REC, NULL);
- if (r < 0)
+ if (r < 0 && !(m->ignore && errno == ENOENT))
return -errno;
return 0;
diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
index 2303d9a..6085d33 100644
--- a/src/shared/conf-parser.c
+++ b/src/shared/conf-parser.c
@@ -599,6 +599,7 @@ int config_parse_path(const char *unit,
char **s = data;
char *n;
+ int offset;
assert(filename);
assert(lvalue);
@@ -611,7 +612,9 @@ int config_parse_path(const char *unit,
return 0;
}
- if (!path_is_absolute(rvalue)) {
+ offset = rvalue[0] == '-' && (streq(lvalue, "InaccessibleDirectories") ||
+ streq(lvalue, "ReadOnlyDirectories"));
+ if (!path_is_absolute(rvalue + offset)) {
log_syntax(unit, LOG_ERR, filename, line, EINVAL,
"Not an absolute path, ignoring: %s", rvalue);
return 0;
@@ -713,6 +716,7 @@ int config_parse_path_strv(const char *unit,
FOREACH_WORD_QUOTED(w, l, rvalue, state) {
_cleanup_free_ char *n;
+ int offset;
n = strndup(w, l);
if (!n)
@@ -724,7 +728,9 @@ int config_parse_path_strv(const char *unit,
continue;
}
- if (!path_is_absolute(n)) {
+ offset = n[0] == '-' && (streq(lvalue, "InaccessibleDirectories") ||
+ streq(lvalue, "ReadOnlyDirectories"));
+ if (!path_is_absolute(n + offset)) {
log_syntax(unit, LOG_ERR, filename, line, EINVAL,
"Not an absolute path, ignoring: %s", rvalue);
continue;
commit ac8e20c6e95975316279740778f381ad50a1a21a
Author: Shawn Landden <shawnlandden at gmail.com>
Date: Wed Aug 21 09:56:58 2013 -0700
man: make reference to bind(2) explicit
diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
index 852010b..1fc28c5 100644
--- a/man/systemd.socket.xml
+++ b/man/systemd.socket.xml
@@ -510,7 +510,7 @@
<varlistentry>
<term><varname>ReusePort=</varname></term>
<listitem><para>Takes a boolean
- value. If true, allows multiple bind()s
+ value. If true, allows multiple <citerefentry><refentrytitle>bind</refentrytitle><manvolnum>2</manvolnum></citerefentry>s
to this TCP or UDP port. This
controls the SO_REUSEPORT socket
option. See
commit 7c902b146815a74796bb65d34b27b036d88cba81
Author: Shawn Landden <shawnlandden at gmail.com>
Date: Thu Aug 22 21:17:16 2013 -0700
udev: fix printf(3) type specifier
src/udev/udev-rules.c: In function 'add_rule':
src/udev/udev-rules.c:1078:33: warning: format '%lu' expects argument of type 'long unsigned int', but argument 8 has type 'int' [-Wformat=]
log_error("invalid key/value pair in file %s on line %u,"
^
diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
index 1634812..f14158b 100644
--- a/src/udev/udev-rules.c
+++ b/src/udev/udev-rules.c
@@ -1076,7 +1076,7 @@ static int add_rule(struct udev_rules *rules, char *line,
tmp = cescape(buf);
log_error("invalid key/value pair in file %s on line %u,"
- "starting at character %lu ('%s')\n",
+ "starting at character %tu ('%s')\n",
filename, lineno, linepos - line + 1, tmp);
if (linepos[1] == '#')
log_info("hint: comments can only start at beginning of line");
commit f2369103655ccfd830b08cbc01fa776ba91a580d
Author: Gao feng <gaofeng at cn.fujitsu.com>
Date: Fri Aug 23 17:53:23 2013 +0800
blkio: fix incorrect setting of cpu_shares
We should set up blockio_weight not cpu_shares.
diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c
index 8ad3d11..9e97b20 100644
--- a/src/core/dbus-cgroup.c
+++ b/src/core/dbus-cgroup.c
@@ -216,7 +216,7 @@ int bus_cgroup_set_property(
return -EINVAL;
if (mode != UNIT_CHECK) {
- c->cpu_shares = ul;
+ c->blockio_weight = ul;
unit_write_drop_in_private_format(u, mode, name, "BlockIOWeight=%lu", ul);
}
commit d182614649b48c00615d744e2b7f4a14180a980d
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date: Wed Aug 21 19:35:32 2013 -0400
nspawn: trivial simplification
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index fc005d9..f820860 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -1602,7 +1602,7 @@ int main(int argc, char *argv[]) {
}
if ((asprintf((char **)(envp + n_env++), "LISTEN_FDS=%u", n_fd_passed) < 0) ||
- (asprintf((char **)(envp + n_env++), "LISTEN_PID=%lu", (unsigned long) 1) < 0)) {
+ (asprintf((char **)(envp + n_env++), "LISTEN_PID=1") < 0)) {
log_oom();
goto child_fail;
}
More information about the systemd-commits
mailing list