[systemd-commits] 23 commits - autogen.sh configure.ac hwdb/70-mouse.hwdb Makefile.am man/systemctl.xml README rules/60-persistent-storage.rules src/core src/libsystemd src/libudev src/shared src/systemctl src/test
David Herrmann
dvdhrm at kemper.freedesktop.org
Thu Jun 4 00:09:57 PDT 2015
Makefile.am | 238 ++++++++-------------------
README | 2
autogen.sh | 2
configure.ac | 25 ++
hwdb/70-mouse.hwdb | 10 +
man/systemctl.xml | 1
rules/60-persistent-storage.rules | 2
src/core/manager.c | 3
src/libsystemd/sd-bus/bus-kernel.c | 26 --
src/libsystemd/sd-bus/bus-kernel.h | 2
src/libsystemd/sd-bus/test-bus-kernel.c | 2
src/libsystemd/sd-device/device-enumerator.c | 18 +-
src/libudev/libudev-enumerate.c | 21 ++
src/shared/util.c | 2
src/systemctl/systemctl.c | 2
src/test/test-unit-file.c | 2
src/test/test-util.c | 5
17 files changed, 150 insertions(+), 213 deletions(-)
New commits:
commit 1cf548925de9c6d12200f491963b977c9db538e3
Merge: e2fa715 68a6ac9
Author: Martin Pitt <martin.pitt at ubuntu.com>
Date: Thu Jun 4 08:45:11 2015 +0200
Merge pull request #68 from whot/hwdb-updates
hwdb: add Apple MagicMouse entry
commit 68a6ac91a1b8454a5f21846ffef3e1f024707b27
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date: Thu Jun 4 16:05:08 2015 +1000
hwdb: add Apple MagicMouse entry
diff --git a/hwdb/70-mouse.hwdb b/hwdb/70-mouse.hwdb
index 8174f27..2784b94 100644
--- a/hwdb/70-mouse.hwdb
+++ b/hwdb/70-mouse.hwdb
@@ -102,6 +102,16 @@
# For mice with switchable resolution, sort by the starred entry.
##########################################
+# Apple
+##########################################
+
+# Apple MagicMouse
+# Note: this device changes name once connected to a mac, the name ends up
+# as $username`s mouse
+mouse:bluetooth:v05acp030d:name:*:
+ MOUSE_DPI=1300 at 1000
+
+##########################################
# Chicony
##########################################
commit e2fa7159431b9a11ccc341df9256f01b5f8695a1
Merge: f9748d8 ff2aa01
Author: Kay Sievers <kay at vrfy.org>
Date: Wed Jun 3 23:13:40 2015 +0200
Merge pull request #59 from eswierk/master
Add /dev/xvd* to 60-persistent-storage whitelist
commit f9748d814899f0add06cbfdb4e5c53d6bab1aac5
Merge: 21ee915 54f0b4d
Author: Kay Sievers <kay at vrfy.org>
Date: Wed Jun 3 22:48:01 2015 +0200
Merge pull request #65 from teg/enumerate-accept-null
libudev: enumerate - accept NULL parameters in add_match()
commit 21ee915614bbc35f4211a48f903a425caf386dbd
Merge: 6517217 9391a1c
Author: Tom Gundersen <teg at jklm.no>
Date: Wed Jun 3 22:34:11 2015 +0200
Merge pull request #52 from mbiebl/systemctl-edit-default-editor
systemctl: Use /usr/bin/editor if available
commit 6517217d49e59938611b6c00965f44d46a255a1d
Author: Kay Sievers <kay at vrfy.org>
Date: Wed Jun 3 22:24:16 2015 +0200
kdbus: remove attach_flags_mask module parameter setting
diff --git a/src/core/manager.c b/src/core/manager.c
index ae473d0..a1c5433 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -741,9 +741,6 @@ static int manager_setup_kdbus(Manager *m) {
if (!is_kdbus_available())
return -ESOCKTNOSUPPORT;
- if (m->running_as == MANAGER_SYSTEM && detect_container(NULL) <= 0)
- bus_kernel_fix_attach_mask();
-
m->kdbus_fd = bus_kernel_create_bus(
m->running_as == MANAGER_SYSTEM ? "system" : "user",
m->running_as == MANAGER_SYSTEM, &p);
diff --git a/src/libsystemd/sd-bus/bus-kernel.c b/src/libsystemd/sd-bus/bus-kernel.c
index d5cc810..417e4d5 100644
--- a/src/libsystemd/sd-bus/bus-kernel.c
+++ b/src/libsystemd/sd-bus/bus-kernel.c
@@ -1770,32 +1770,6 @@ int bus_kernel_realize_attach_flags(sd_bus *bus) {
return 0;
}
-int bus_kernel_fix_attach_mask(void) {
- _cleanup_free_ char *mask = NULL;
- uint64_t m = (uint64_t) -1;
- char buf[2+16+2];
- int r;
-
- /* By default we don't want any kdbus metadata fields to be
- * suppressed, hence we reset the kernel mask for it to
- * (uint64_t) -1. If the module argument was overwritten by
- * the kernel cmdline, we leave it as is. */
-
- r = get_proc_cmdline_key("kdbus.attach_flags_mask=", &mask);
- if (r < 0)
- return log_warning_errno(r, "Failed to read kernel command line: %m");
-
- if (r == 0) {
- sprintf(buf, "0x%" PRIx64 "\n", m);
- r = write_string_file("/sys/module/kdbus/parameters/attach_flags_mask", buf);
- if (r < 0)
- return log_full_errno(IN_SET(r, -ENOENT, -EROFS) ? LOG_DEBUG : LOG_WARNING, r,
- "Failed to write kdbus attach mask: %m");
- }
-
- return 0;
-}
-
int bus_kernel_get_bus_name(sd_bus *bus, char **name) {
struct kdbus_cmd_info cmd = {
.size = sizeof(struct kdbus_cmd_info),
diff --git a/src/libsystemd/sd-bus/bus-kernel.h b/src/libsystemd/sd-bus/bus-kernel.h
index b9f31ba..bb4dff6 100644
--- a/src/libsystemd/sd-bus/bus-kernel.h
+++ b/src/libsystemd/sd-bus/bus-kernel.h
@@ -90,8 +90,6 @@ int bus_kernel_drop_one(int fd);
int bus_kernel_realize_attach_flags(sd_bus *bus);
-int bus_kernel_fix_attach_mask(void);
-
int bus_kernel_get_bus_name(sd_bus *bus, char **name);
int bus_kernel_cmd_free(sd_bus *bus, uint64_t offset);
diff --git a/src/libsystemd/sd-bus/test-bus-kernel.c b/src/libsystemd/sd-bus/test-bus-kernel.c
index 8f4f60b..6506eaa 100644
--- a/src/libsystemd/sd-bus/test-bus-kernel.c
+++ b/src/libsystemd/sd-bus/test-bus-kernel.c
@@ -43,8 +43,6 @@ int main(int argc, char *argv[]) {
assert_se(asprintf(&name, "deine-mutter-%u", (unsigned) getpid()) >= 0);
- bus_kernel_fix_attach_mask();
-
bus_ref = bus_kernel_create_bus(name, false, &bus_name);
if (bus_ref == -ENOENT)
return EXIT_TEST_SKIP;
commit 54f0b4d9a3e3e1b955d0b0021d9678571d91a5ef
Author: Tom Gundersen <teg at jklm.no>
Date: Wed Jun 3 22:08:46 2015 +0200
libudev: enumerate - accept NULL parameters in add_match()
This was a regression introduced when moving to sd-device.
diff --git a/src/libsystemd/sd-device/device-enumerator.c b/src/libsystemd/sd-device/device-enumerator.c
index 3692d46..7fd77e9 100644
--- a/src/libsystemd/sd-device/device-enumerator.c
+++ b/src/libsystemd/sd-device/device-enumerator.c
@@ -137,7 +137,6 @@ _public_ int sd_device_enumerator_add_match_sysattr(sd_device_enumerator *enumer
assert_return(enumerator, -EINVAL);
assert_return(_sysattr, -EINVAL);
- assert_return(_value, -EINVAL);
if (match)
hashmap = &enumerator->match_sysattr;
@@ -152,9 +151,11 @@ _public_ int sd_device_enumerator_add_match_sysattr(sd_device_enumerator *enumer
if (!sysattr)
return -ENOMEM;
- value = strdup(_value);
- if (!value)
- return -ENOMEM;
+ if (_value) {
+ value = strdup(_value);
+ if (!value)
+ return -ENOMEM;
+ }
r = hashmap_put(*hashmap, sysattr, value);
if (r < 0)
@@ -174,7 +175,6 @@ _public_ int sd_device_enumerator_add_match_property(sd_device_enumerator *enume
assert_return(enumerator, -EINVAL);
assert_return(_property, -EINVAL);
- assert_return(_value, -EINVAL);
r = hashmap_ensure_allocated(&enumerator->match_property, NULL);
if (r < 0)
@@ -184,9 +184,11 @@ _public_ int sd_device_enumerator_add_match_property(sd_device_enumerator *enume
if (!property)
return -ENOMEM;
- value = strdup(_value);
- if (!value)
- return -ENOMEM;
+ if (_value) {
+ value = strdup(_value);
+ if (!value)
+ return -ENOMEM;
+ }
r = hashmap_put(enumerator->match_property, property, value);
if (r < 0)
diff --git a/src/libudev/libudev-enumerate.c b/src/libudev/libudev-enumerate.c
index 255fbe8..df08894 100644
--- a/src/libudev/libudev-enumerate.c
+++ b/src/libudev/libudev-enumerate.c
@@ -196,6 +196,9 @@ _public_ struct udev_list_entry *udev_enumerate_get_list_entry(struct udev_enume
_public_ int udev_enumerate_add_match_subsystem(struct udev_enumerate *udev_enumerate, const char *subsystem) {
assert_return(udev_enumerate, -EINVAL);
+ if (!subsystem)
+ return 0;
+
return sd_device_enumerator_add_match_subsystem(udev_enumerate->enumerator, subsystem, true);
}
@@ -211,6 +214,9 @@ _public_ int udev_enumerate_add_match_subsystem(struct udev_enumerate *udev_enum
_public_ int udev_enumerate_add_nomatch_subsystem(struct udev_enumerate *udev_enumerate, const char *subsystem) {
assert_return(udev_enumerate, -EINVAL);
+ if (!subsystem)
+ return 0;
+
return sd_device_enumerator_add_match_subsystem(udev_enumerate->enumerator, subsystem, false);
}
@@ -227,6 +233,9 @@ _public_ int udev_enumerate_add_nomatch_subsystem(struct udev_enumerate *udev_en
_public_ int udev_enumerate_add_match_sysattr(struct udev_enumerate *udev_enumerate, const char *sysattr, const char *value) {
assert_return(udev_enumerate, -EINVAL);
+ if (!sysattr)
+ return 0;
+
return sd_device_enumerator_add_match_sysattr(udev_enumerate->enumerator, sysattr, value, true);
}
@@ -243,6 +252,9 @@ _public_ int udev_enumerate_add_match_sysattr(struct udev_enumerate *udev_enumer
_public_ int udev_enumerate_add_nomatch_sysattr(struct udev_enumerate *udev_enumerate, const char *sysattr, const char *value) {
assert_return(udev_enumerate, -EINVAL);
+ if (!sysattr)
+ return 0;
+
return sd_device_enumerator_add_match_sysattr(udev_enumerate->enumerator, sysattr, value, false);
}
@@ -259,6 +271,9 @@ _public_ int udev_enumerate_add_nomatch_sysattr(struct udev_enumerate *udev_enum
_public_ int udev_enumerate_add_match_property(struct udev_enumerate *udev_enumerate, const char *property, const char *value) {
assert_return(udev_enumerate, -EINVAL);
+ if (!property)
+ return 0;
+
return sd_device_enumerator_add_match_property(udev_enumerate->enumerator, property, value);
}
@@ -274,6 +289,9 @@ _public_ int udev_enumerate_add_match_property(struct udev_enumerate *udev_enume
_public_ int udev_enumerate_add_match_tag(struct udev_enumerate *udev_enumerate, const char *tag) {
assert_return(udev_enumerate, -EINVAL);
+ if (!tag)
+ return 0;
+
return sd_device_enumerator_add_match_tag(udev_enumerate->enumerator, tag);
}
@@ -335,6 +353,9 @@ _public_ int udev_enumerate_add_match_is_initialized(struct udev_enumerate *udev
_public_ int udev_enumerate_add_match_sysname(struct udev_enumerate *udev_enumerate, const char *sysname) {
assert_return(udev_enumerate, -EINVAL);
+ if (!sysname)
+ return 0;
+
return sd_device_enumerator_add_match_sysname(udev_enumerate->enumerator, sysname);
}
commit 602ee553e40571eeb92e7a6f397550355ba0228b
Author: Thomas Hindoe Paaboel Andersen <phomes at gmail.com>
Date: Wed Jun 3 19:49:04 2015 +0200
test-util: fix a memleak
diff --git a/src/test/test-util.c b/src/test/test-util.c
index 7a398fa..9d5516a 100644
--- a/src/test/test-util.c
+++ b/src/test/test-util.c
@@ -460,6 +460,8 @@ static void test_cunescape(void) {
assert_se(cunescape("\\u0000", 0, &unescaped) < 0);
assert_se(cunescape("\\u00DF\\U000000df\\u03a0\\U00000041", UNESCAPE_RELAX, &unescaped) >= 0);
assert_se(streq_ptr(unescaped, "ßßΠA"));
+ free(unescaped);
+ unescaped = NULL;
assert_se(cunescape("\\073", 0, &unescaped) >= 0);
assert_se(streq_ptr(unescaped, ";"));
commit eb71a33158ecae7f0ba8499bc4f3c674ceaebfd5
Merge: 75db28c c7b13c6
Author: Daniel Mack <github at zonque.org>
Date: Wed Jun 3 18:02:18 2015 +0200
Merge pull request #60 from Keruspe/master
build-sys: drop references to gobject-introspection
commit 75db28c8f2a874d74579eb08ebce78fa0290277c
Merge: 2b4919a e013d21
Author: Daniel Mack <github at zonque.org>
Date: Wed Jun 3 18:01:21 2015 +0200
Merge pull request #55 from filbranden/rootprefix_empty1
Fix --with-rootprefix= (empty) with a workaround for now.
commit 2b4919a68cf826efbe939291e6dc4f08e824dc41
Author: Kay Sievers <kay at vrfy.org>
Date: Wed Jun 3 17:17:08 2015 +0200
build-sys: disable gc-sections if optimization is disabled
This way, development builds will not rely on gc-sections to
paper over cyclic link dependencies. Newly introduced broken
link requirements will immediatley fail.
diff --git a/Makefile.am b/Makefile.am
index 2e2abae..7603b2c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6549,9 +6549,7 @@ clean-local: $(CLEAN_LOCAL_HOOKS)
rm -f $(abs_srcdir)/hwdb/usb.ids $(abs_srcdir)/hwdb/pci.ids $(abs_srcdir)/hwdb/oui.txt \
$(abs_srcdir)/hwdb/iab.txt
-# disable gc-sections to check limited toolchains for link breakage
DISTCHECK_CONFIGURE_FLAGS = \
- CFLAGS='-fno-lto' LDFLAGS='-Wl,--as-needed -Wl,--no-gc-sections' \
--with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
--with-dbussessionservicedir=$$dc_install_base/$(dbussessionservicedir) \
--with-dbussystemservicedir=$$dc_install_base/$(dbussystemservicedir) \
diff --git a/configure.ac b/configure.ac
index deafcc1..ea29ab4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -183,8 +183,6 @@ CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\
-fdiagnostics-show-option \
-fno-strict-aliasing \
-fvisibility=hidden \
- -ffunction-sections \
- -fdata-sections \
-fstack-protector \
-fstack-protector-strong \
-fPIE \
@@ -208,10 +206,21 @@ AS_CASE([$CFLAGS], [*-O[[12345sz\ ]]*],
[AC_MSG_RESULT([skipping -D_FORTIFY_SOURCE, optimization not enabled])])
AC_SUBST([OUR_CPPFLAGS], "$with_cppflags $sanitizer_cppflags")
+AS_CASE([$CFLAGS], [*-O[[12345sz\ ]]*],
+ [CC_CHECK_FLAGS_APPEND([with_ldflags], [LDFLAGS], [\
+ -Wl,--gc-sections])],
+ [AC_MSG_RESULT([skipping --gc-sections, optimization not enabled])])
+AC_SUBST([OUR_CFLAGS], "$with_ldflags $sanitizer_cflags")
+
+AS_CASE([$CFLAGS], [*-O[[12345sz\ ]]*],
+ [CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\
+ -ffunction-sections -fdata-sections])],
+ [AC_MSG_RESULT([skipping -ffunction/data-section, optimization not enabled])])
+AC_SUBST([OUR_CFLAGS], "$with_cflags $sanitizer_cflags")
+
CC_CHECK_FLAGS_APPEND([with_ldflags], [LDFLAGS], [\
-Wl,--as-needed \
-Wl,--no-undefined \
- -Wl,--gc-sections \
-Wl,-z,relro \
-Wl,-z,now \
-pie \
commit c7b13c64b3cd36f912d658a9c21fc4277bed55e7
Author: Marc-Antoine Perennou <Marc-Antoine at Perennou.com>
Date: Wed Jun 3 17:24:23 2015 +0200
build-sys: drop references to gobject-introspection
It has been removed alongside gudev
diff --git a/README b/README
index a0ee487..777b343 100644
--- a/README
+++ b/README
@@ -129,7 +129,6 @@ REQUIREMENTS:
libmicrohttpd (optional)
libpython (optional)
libidn (optional)
- gobject-introspection > 1.40.0 (optional)
elfutils >= 158 (optional)
make, gcc, and similar tools
diff --git a/configure.ac b/configure.ac
index deafcc1..9551131 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1542,7 +1542,6 @@ AC_MSG_RESULT([
dbus: ${have_dbus}
nss-myhostname: ${have_myhostname}
hwdb: ${enable_hwdb}
- gintrospection: ${enable_introspection}
terminal: ${have_terminal}
kdbus: ${have_kdbus}
Python: ${have_python}
commit ff2aa01e61f8aff149b63231365f1cef008296a2
Author: Ed Swierk <eswierk at skyportsystems.com>
Date: Wed Jun 3 08:08:37 2015 -0700
Add /dev/xvd* to 60-persistent-storage whitelist
Without this, systemd-udevd does not create persistent storage symlinks
for xen block devices.
diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules
index 2aa15f3..64c5f1c 100644
--- a/rules/60-persistent-storage.rules
+++ b/rules/60-persistent-storage.rules
@@ -6,7 +6,7 @@
ACTION=="remove", GOTO="persistent_storage_end"
SUBSYSTEM!="block", GOTO="persistent_storage_end"
-KERNEL!="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|sr*|vd*|bcache*", GOTO="persistent_storage_end"
+KERNEL!="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|sr*|vd*|bcache*|xvd*", GOTO="persistent_storage_end"
# ignore partitions that span the entire disk
TEST=="whole_disk", GOTO="persistent_storage_end"
commit ce54255fa599d32738a311c77331fa611e6cfa5e
Author: Harald Hoyer <harald at redhat.com>
Date: Wed Jun 3 16:36:20 2015 +0200
test-unit-file.c: fixup the test for commit 3b51f8ddd5
diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c
index 31b12d5..a8025c8 100644
--- a/src/test/test-unit-file.c
+++ b/src/test/test-unit-file.c
@@ -232,7 +232,7 @@ static void test_config_parse_exec(void) {
&c, NULL);
assert_se(r >= 0);
c1 = c1->command_next;
- check_execcommand(c1, "/bin/find", NULL, "\\073", NULL, false);
+ check_execcommand(c1, "/bin/find", NULL, ";", NULL, false);
log_info("/* spaces in the filename */");
r = config_parse_exec(NULL, "fake", 5, "section", 1,
commit e013d21b6218011c99dbbcd4c61fc73a24490a94
Author: Filipe Brandenburger <filbranden at google.com>
Date: Wed Jun 3 07:31:12 2015 -0700
build-sys: Work around --with-rootprefix= (empty) not producing /
Since we introduced AX_NORMALIZE_PATH, using --with-rootprefix=/ does
produce an empty string, but using --with-rootprefix= (empty) now
produces "." instead which is wrong.
Work around it until we can find a better solution for AX_NORMALIZE_PATH
upstream at autoconf-archive.
Bug: https://github.com/systemd/systemd/issues/54
diff --git a/configure.ac b/configure.ac
index deafcc1..18e0ac9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1378,6 +1378,13 @@ AX_NORMALIZE_PATH([with_zshcompletiondir])
AC_ARG_WITH([rootprefix],
AS_HELP_STRING([--with-rootprefix=DIR], [rootfs directory prefix for config files and kernel modules]),
[], [with_rootprefix=${ac_default_prefix}])
+# --with-rootprefix= (empty) should default to "/" but AX_NORMALIZE_PATH
+# defaults those to ".", solve that here for now until we can find a suitable
+# fix for AX_NORMALIZE_PATH upstream at autoconf-archive.
+# See: https://github.com/systemd/systemd/issues/54
+if test "x${with_rootprefix}" = "x"; then
+ with_rootprefix="/"
+fi
AX_NORMALIZE_PATH([with_rootprefix])
AC_ARG_WITH([rootlibdir],
commit 759b98c5682171e6d5bf4d71f6ff038ae0115956
Author: Filipe Brandenburger <filbranden at google.com>
Date: Wed Jun 3 07:33:06 2015 -0700
build-sys: Recommend --with-rootprefix=/ for split-usr
Since we started using AX_NORMALIZE_PATH, that is a valid supported
setup and is more explicit than --with-rootprefix= (empty) which is
actually currently broken.
Let's advocate for it in the ./configure suggestion from autogen.sh.
diff --git a/autogen.sh b/autogen.sh
index 3027f83..2d4acdf 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -47,7 +47,7 @@ fi
if [ ! -L /bin ]; then
args="$args \
---with-rootprefix= \
+--with-rootprefix=/ \
--with-rootlibdir=$(libdir /lib) \
"
fi
commit ea344aec104771c11b2008e54943d7c108ecb0d0
Merge: 1a43508 3b51f8d
Author: Harald Hoyer <harald at redhat.com>
Date: Wed Jun 3 15:55:28 2015 +0200
Merge pull request #51 from zonque/unquote
util: fix another cunescape() regression
compiled and test-util exited with 0
commit 1a435084b7f55bc24042f9bc47c18e4e2381f667
Author: Kay Sievers <kay at vrfy.org>
Date: Wed Jun 3 14:50:58 2015 +0200
configure.ac: add missing komma
diff --git a/configure.ac b/configure.ac
index c8f8658..deafcc1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ AC_PREREQ([2.64])
AC_INIT([systemd],
[220],
- [http://github.com/systemd/systemd/issues]
+ [http://github.com/systemd/systemd/issues],
[systemd],
[http://www.freedesktop.org/wiki/Software/systemd])
commit 29d01b70640878f63e74ce20cb45fd747311fa18
Author: Kay Sievers <kay at vrfy.org>
Date: Wed Jun 3 14:48:55 2015 +0200
point to github issues instead of freedesktop bugzilla
diff --git a/README b/README
index b810044..a0ee487 100644
--- a/README
+++ b/README
@@ -21,7 +21,6 @@ IRC:
#systemd on irc.freenode.org
BUG REPORTS:
- https://bugs.freedesktop.org/enter_bug.cgi?product=systemd
https://github.com/systemd/systemd/issues
AUTHOR:
diff --git a/configure.ac b/configure.ac
index 0532c54..c8f8658 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ AC_PREREQ([2.64])
AC_INIT([systemd],
[220],
- [http://bugs.freedesktop.org/enter_bug.cgi?product=systemd],
+ [http://github.com/systemd/systemd/issues]
[systemd],
[http://www.freedesktop.org/wiki/Software/systemd])
commit 4142554fcdd3dba1acb01f2866b526c1dd605def
Author: Kay Sievers <kay at vrfy.org>
Date: Wed Jun 3 14:46:11 2015 +0200
build-sys: split off libsystemd-machine convenience lib
Break the link order cycle by splitting off the machine parts which
use sd-bus but live in shared/.
diff --git a/Makefile.am b/Makefile.am
index 64038a5..2e2abae 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -942,10 +942,6 @@ libsystemd_shared_la_SOURCES = \
src/shared/btrfs-ctree.h \
src/shared/rm-rf.c \
src/shared/rm-rf.h \
- src/shared/machine-image.c \
- src/shared/machine-image.h \
- src/shared/machine-pool.c \
- src/shared/machine-pool.h \
src/shared/copy.c \
src/shared/copy.h \
src/shared/install.c \
@@ -985,6 +981,16 @@ libsystemd_shared_la_LIBADD = \
-lm
# -----------------------------------------------------------------------------
+noinst_LTLIBRARIES += \
+ libsystemd-machine.la
+
+libsystemd_machine_la_SOURCES = \
+ src/shared/machine-image.c \
+ src/shared/machine-image.h \
+ src/shared/machine-pool.c \
+ src/shared/machine-pool.h
+
+# -----------------------------------------------------------------------------
if HAVE_LIBIPTC
noinst_LTLIBRARIES += \
libsystemd-fw.la
@@ -2678,8 +2684,8 @@ systemd_dbus1_generator_SOURCES = \
src/dbus1-generator/dbus1-generator.c
systemd_dbus1_generator_LDADD = \
- libsystemd-shared.la \
- libsystemd-internal.la
+ libsystemd-internal.la \
+ libsystemd-shared.la
dbus1-generator-install-hook:
$(AM_V_at)$(MKDIR_P) $(DESTDIR)$(usergeneratordir)
@@ -2806,6 +2812,7 @@ systemd_nspawn_CFLAGS = \
systemd_nspawn_LDADD = \
libudev-internal.la \
libsystemd-internal.la \
+ libsystemd-machine.la \
libsystemd-shared.la \
$(BLKID_LIBS)
@@ -5121,6 +5128,7 @@ libsystemd_machine_core_la_SOURCES = \
libsystemd_machine_core_la_LIBADD = \
libudev-internal.la \
libsystemd-internal.la \
+ libsystemd-machine.la \
libsystemd-shared.la
noinst_LTLIBRARIES += \
@@ -5231,6 +5239,7 @@ systemd_importd_CFLAGS = \
-D SYSTEMD_EXPORT_PATH=\"$(rootlibexecdir)/systemd-export\"
systemd_importd_LDADD = \
+ libsystemd-machine.la \
libsystemd-internal.la \
libsystemd-shared.la
@@ -5267,6 +5276,7 @@ systemd_pull_CFLAGS = \
-D USER_KEYRING_PATH=\"$(pkgsysconfdir)/import-pubring.gpg\"
systemd_pull_LDADD = \
+ libsystemd-machine.la \
libsystemd-internal.la \
libsystemd-shared.la \
$(LIBCURL_LIBS) \
@@ -5294,6 +5304,7 @@ systemd_import_CFLAGS = \
$(ZLIB_CFLAGS)
systemd_import_LDADD = \
+ libsystemd-machine.la \
libsystemd-internal.la \
libsystemd-shared.la \
$(XZ_LIBS) \
@@ -5317,6 +5328,7 @@ systemd_export_CFLAGS = \
$(ZLIB_CFLAGS)
systemd_export_LDADD = \
+ libsystemd-machine.la \
libsystemd-internal.la \
libsystemd-shared.la \
$(XZ_LIBS) \
commit 42fcc4d258cbcd53a7a3d38b9c12bc7b9b0f27dd
Author: Kay Sievers <kay at vrfy.org>
Date: Wed Jun 3 14:16:36 2015 +0200
build-sys: merge libsystemd-label convenience lib
Stop to pretend that we can split selinux related code from other.
We have too many cross-references and it breaks all the time and
I am no longer willing to maintain that mess for no real benefit.
We currently have cyclic dependencies which are only resolved on
machines with gc-sections toolchains. We need a simpler and at the
same time more strict model to manage our convenienc libraries and
linking.
The first thing to give up is the "optimization" of not linking
libselinux for a very few tools. If that is an issue, please fix
the mess that libselinux creates in selinux itself, and do not ask
consumers to work around it.
diff --git a/Makefile.am b/Makefile.am
index c1348b4..64038a5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -916,52 +916,7 @@ libsystemd_shared_la_SOURCES = \
src/shared/sysctl-util.c \
src/shared/sysctl-util.h \
src/shared/hostname-util.h \
- src/shared/hostname-util.c
-
-if HAVE_UTMP
-libsystemd_shared_la_SOURCES += \
- src/shared/utmp-wtmp.c
-endif
-
-nodist_libsystemd_shared_la_SOURCES = \
- src/shared/errno-from-name.h \
- src/shared/errno-to-name.h \
- src/shared/af-from-name.h \
- src/shared/af-to-name.h \
- src/shared/arphrd-from-name.h \
- src/shared/arphrd-to-name.h \
- src/shared/cap-from-name.h \
- src/shared/cap-to-name.h
-
-libsystemd_shared_la_CFLAGS = \
- $(AM_CFLAGS) \
- $(CAP_CFLAGS) \
- $(SECCOMP_CFLAGS) \
- -pthread
-
-libsystemd_shared_la_LIBADD = \
- $(CAP_LIBS) \
- -lm
-
-# ------------------------------------------------------------------------------
-noinst_LTLIBRARIES += \
- libsystemd-units.la
-
-libsystemd_units_la_SOURCES = \
- src/shared/install.c \
- src/shared/install.h \
- src/shared/install-printf.c \
- src/shared/install-printf.h \
- src/shared/path-lookup.c \
- src/shared/path-lookup.h \
- src/shared/specifier.c \
- src/shared/specifier.h
-
-# ------------------------------------------------------------------------------
-noinst_LTLIBRARIES += \
- libsystemd-label.la
-
-libsystemd_label_la_SOURCES = \
+ src/shared/hostname-util.c \
src/shared/socket-label.c \
src/shared/label.c \
src/shared/label.h \
@@ -992,17 +947,44 @@ libsystemd_label_la_SOURCES = \
src/shared/machine-pool.c \
src/shared/machine-pool.h \
src/shared/copy.c \
- src/shared/copy.h
+ src/shared/copy.h \
+ src/shared/install.c \
+ src/shared/install.h \
+ src/shared/install-printf.c \
+ src/shared/install-printf.h \
+ src/shared/path-lookup.c \
+ src/shared/path-lookup.h \
+ src/shared/specifier.c \
+ src/shared/specifier.h
+
+if HAVE_UTMP
+libsystemd_shared_la_SOURCES += \
+ src/shared/utmp-wtmp.c
+endif
-libsystemd_label_la_CFLAGS = \
+nodist_libsystemd_shared_la_SOURCES = \
+ src/shared/errno-from-name.h \
+ src/shared/errno-to-name.h \
+ src/shared/af-from-name.h \
+ src/shared/af-to-name.h \
+ src/shared/arphrd-from-name.h \
+ src/shared/arphrd-to-name.h \
+ src/shared/cap-from-name.h \
+ src/shared/cap-to-name.h
+
+libsystemd_shared_la_CFLAGS = \
$(AM_CFLAGS) \
- $(SELINUX_CFLAGS)
+ $(SELINUX_CFLAGS) \
+ $(CAP_CFLAGS) \
+ $(SECCOMP_CFLAGS) \
+ -pthread
-libsystemd_label_la_LIBADD = \
- $(SELINUX_LIBS)
+libsystemd_shared_la_LIBADD = \
+ $(SELINUX_LIBS) \
+ $(CAP_LIBS) \
+ -lm
# -----------------------------------------------------------------------------
-
if HAVE_LIBIPTC
noinst_LTLIBRARIES += \
libsystemd-fw.la
@@ -1020,7 +1002,6 @@ libsystemd_fw_la_LIBADD = \
endif
# -----------------------------------------------------------------------------
-
if ENABLE_LDCONFIG
dist_systemunit_DATA += \
units/ldconfig.service
@@ -1213,8 +1194,6 @@ libsystemd_core_la_CFLAGS = \
-pthread
libsystemd_core_la_LIBADD = \
- libsystemd-units.la \
- libsystemd-label.la \
libudev-internal.la \
libsystemd-shared.la \
libsystemd-internal.la \
@@ -1653,7 +1632,6 @@ test_copy_SOURCES = \
src/test/test-copy.c
test_copy_LDADD = \
- libsystemd-label.la \
libsystemd-shared.la
test_sigbus_SOURCES = \
@@ -1666,9 +1644,8 @@ test_condition_SOURCES = \
src/test/test-condition.c
test_condition_LDADD = \
- libsystemd-label.la \
- libsystemd-internal.la \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ libsystemd-internal.la
test_fdset_SOURCES = \
src/test/test-fdset.c
@@ -1693,7 +1670,6 @@ test_util_SOURCES = \
src/test/test-util.c
test_util_LDADD = \
- libsystemd-label.la \
libsystemd-shared.la
test_process_util_SOURCES = \
@@ -1713,8 +1689,6 @@ test_path_lookup_SOURCES = \
test_path_lookup_LDADD = \
-lm \
- libsystemd-units.la \
- libsystemd-label.la \
libsystemd-shared.la
test_uid_range_SOURCES = \
@@ -1888,7 +1862,6 @@ test_btrfs_SOURCES = \
src/test/test-btrfs.c
test_btrfs_LDADD = \
- libsystemd-label.la \
libsystemd-shared.la
if HAVE_LIBIPTC
@@ -1964,7 +1937,6 @@ test_cgroup_SOURCES = \
src/test/test-cgroup.c
test_cgroup_LDADD = \
- libsystemd-label.la \
libsystemd-shared.la \
libsystemd-internal.la
@@ -1986,9 +1958,8 @@ test_cgroup_util_SOURCES = \
src/test/test-cgroup-util.c
test_cgroup_util_LDADD = \
- libsystemd-label.la \
- libsystemd-internal.la \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ libsystemd-internal.la
test_env_replace_SOURCES = \
src/test/test-env-replace.c
@@ -2006,15 +1977,13 @@ test_strv_SOURCES = \
src/test/test-strv.c
test_strv_LDADD = \
- libsystemd-units.la \
- libsystemd-internal.la \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ libsystemd-internal.la
test_path_util_SOURCES = \
src/test/test-path-util.c
test_path_util_LDADD = \
- libsystemd-label.la \
libsystemd-shared.la
test_path_SOURCES = \
@@ -2045,8 +2014,6 @@ test_install_SOURCES = \
src/test/test-install.c
test_install_LDADD = \
- libsystemd-units.la \
- libsystemd-label.la \
libsystemd-shared.la \
libsystemd-internal.la
@@ -2074,7 +2041,6 @@ test_conf_files_SOURCES = \
src/test/test-conf-files.c
test_conf_files_LDADD = \
- libsystemd-label.la \
libsystemd-shared.la
test_conf_parser_SOURCES = \
@@ -2088,8 +2054,8 @@ test_bus_policy_SOURCES = \
test_bus_policy_LDADD = \
libsystemd-proxy.la \
- libsystemd-internal.la \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ libsystemd-internal.la
# ------------------------------------------------------------------------------
## .PHONY so it always rebuilds it
@@ -2142,8 +2108,8 @@ systemd_analyze_CFLAGS = \
systemd_analyze_LDADD = \
libsystemd-core.la \
- libsystemd-internal.la \
libsystemd-shared.la \
+ libsystemd-internal.la \
$(RT_LIBS)
# ------------------------------------------------------------------------------
@@ -2172,9 +2138,8 @@ systemd_update_done_SOURCES = \
src/update-done/update-done.c
systemd_update_done_LDADD = \
- libsystemd-internal.la \
- libsystemd-label.la \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ libsystemd-internal.la
# ------------------------------------------------------------------------------
systemd_shutdown_SOURCES = \
@@ -2187,7 +2152,6 @@ systemd_shutdown_SOURCES = \
src/core/killall.c
systemd_shutdown_LDADD = \
- libsystemd-label.la \
libudev-internal.la \
libsystemd-internal.la \
libsystemd-shared.la
@@ -2233,10 +2197,8 @@ systemd_tmpfiles_SOURCES = \
src/tmpfiles/tmpfiles.c
systemd_tmpfiles_LDADD = \
- libsystemd-units.la \
- libsystemd-label.la \
- libsystemd-internal.la \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ libsystemd-internal.la
if HAVE_ACL
systemd_tmpfiles_LDADD += \
@@ -2298,10 +2260,8 @@ systemd_sysusers_SOURCES = \
src/sysusers/sysusers.c
systemd_sysusers_LDADD = \
- libsystemd-units.la \
- libsystemd-label.la \
- libsystemd-internal.la \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ libsystemd-internal.la
rootbin_PROGRAMS += \
systemd-sysusers
@@ -2341,10 +2301,8 @@ systemd_firstboot_SOURCES = \
src/firstboot/firstboot.c
systemd_firstboot_LDADD = \
- libsystemd-units.la \
- libsystemd-label.la \
- libsystemd-internal.la \
libsystemd-shared.la \
+ libsystemd-internal.la \
-lcrypt
rootbin_PROGRAMS += \
@@ -2367,9 +2325,8 @@ systemd_machine_id_setup_SOURCES = \
src/core/machine-id-setup.h
systemd_machine_id_setup_LDADD = \
- libsystemd-label.la \
- libsystemd-internal.la \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ libsystemd-internal.la
# ------------------------------------------------------------------------------
systemd_sysctl_SOURCES = \
@@ -2390,7 +2347,6 @@ systemd_fsck_SOURCES = \
src/fsck/fsck.c
systemd_fsck_LDADD = \
- libsystemd-internal.la \
libudev-internal.la \
libsystemd-internal.la \
libsystemd-shared.la
@@ -2402,9 +2358,8 @@ systemd_machine_id_commit_SOURCES = \
src/core/machine-id-setup.h
systemd_machine_id_commit_LDADD = \
- libsystemd-label.la \
- libsystemd-internal.la \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ libsystemd-internal.la
SYSINIT_TARGET_WANTS += \
systemd-machine-id-commit.service
@@ -2415,8 +2370,8 @@ systemd_ac_power_SOURCES = \
systemd_ac_power_LDADD = \
libudev-internal.la \
- libsystemd-internal.la \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ libsystemd-internal.la
# ------------------------------------------------------------------------------
systemd_detect_virt_SOURCES = \
@@ -2440,7 +2395,6 @@ systemd_getty_generator_SOURCES = \
src/getty-generator/getty-generator.c
systemd_getty_generator_LDADD = \
- libsystemd-label.la \
libsystemd-shared.la
# ------------------------------------------------------------------------------
@@ -2448,7 +2402,6 @@ systemd_debug_generator_SOURCES = \
src/debug-generator/debug-generator.c
systemd_debug_generator_LDADD = \
- libsystemd-label.la \
libsystemd-shared.la
# ------------------------------------------------------------------------------
@@ -2457,7 +2410,6 @@ systemd_fstab_generator_SOURCES = \
src/core/mount-setup.c
systemd_fstab_generator_LDADD = \
- libsystemd-label.la \
libsystemd-shared.la
# ------------------------------------------------------------------------------
@@ -2465,7 +2417,6 @@ systemd_system_update_generator_SOURCES = \
src/system-update-generator/system-update-generator.c
systemd_system_update_generator_LDADD = \
- libsystemd-label.la \
libsystemd-shared.la
# ------------------------------------------------------------------------------
@@ -2480,14 +2431,13 @@ systemd_hibernate_resume_SOURCES = \
src/hibernate-resume/hibernate-resume.c
systemd_hibernate_resume_LDADD = \
- libsystemd-internal.la \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ libsystemd-internal.la
systemd_hibernate_resume_generator_SOURCES = \
src/hibernate-resume/hibernate-resume-generator.c
systemd_hibernate_resume_generator_LDADD = \
- libsystemd-label.la \
libsystemd-shared.la
dist_systemunit_DATA += \
@@ -2514,7 +2464,6 @@ systemd_efi_boot_generator_SOURCES = \
src/efi-boot-generator/efi-boot-generator.c
systemd_efi_boot_generator_LDADD = \
- libsystemd-label.la \
libsystemd-shared.la
# ------------------------------------------------------------------------------
@@ -2532,7 +2481,6 @@ bootctl_CFLAGS = \
$(BLKID_CFLAGS)
bootctl_LDADD = \
- libsystemd-label.la \
libsystemd-shared.la \
libsystemd-internal.la \
$(BLKID_LIBS)
@@ -2711,7 +2659,6 @@ systemd_gpt_auto_generator_SOURCES = \
src/shared/blkid-util.h
systemd_gpt_auto_generator_LDADD = \
- libsystemd-label.la \
libudev-internal.la \
libsystemd-internal.la \
libsystemd-shared.la \
@@ -2731,9 +2678,8 @@ systemd_dbus1_generator_SOURCES = \
src/dbus1-generator/dbus1-generator.c
systemd_dbus1_generator_LDADD = \
- libsystemd-label.la \
- libsystemd-internal.la \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ libsystemd-internal.la
dbus1-generator-install-hook:
$(AM_V_at)$(MKDIR_P) $(DESTDIR)$(usergeneratordir)
@@ -2756,7 +2702,6 @@ systemd_sysv_generator_SOURCES = \
systemd_sysv_generator_LDADD = \
libsystemd-core.la \
- libsystemd-label.la \
libsystemd-shared.la
# ------------------------------------------------------------------------------
@@ -2764,7 +2709,6 @@ systemd_rc_local_generator_SOURCES = \
src/rc-local-generator/rc-local-generator.c
systemd_rc_local_generator_LDADD = \
- libsystemd-label.la \
libsystemd-shared.la
# ------------------------------------------------------------------------------
@@ -2774,7 +2718,6 @@ systemd_remount_fs_SOURCES = \
src/core/mount-setup.h
systemd_remount_fs_LDADD = \
- libsystemd-label.la \
libsystemd-shared.la
# ------------------------------------------------------------------------------
@@ -2797,11 +2740,9 @@ systemctl_SOURCES = \
src/systemctl/systemctl.c
systemctl_LDADD = \
- libsystemd-units.la \
- libsystemd-label.la \
- libsystemd-internal.la \
libsystemd-logs.la \
libsystemd-journal-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la
# ------------------------------------------------------------------------------
@@ -2809,23 +2750,22 @@ systemd_notify_SOURCES = \
src/notify/notify.c
systemd_notify_LDADD = \
- libsystemd-internal.la \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ libsystemd-internal.la
# ------------------------------------------------------------------------------
systemd_path_SOURCES = \
src/path/path.c
systemd_path_LDADD = \
- libsystemd-internal.la \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ libsystemd-internal.la
# ------------------------------------------------------------------------------
systemd_ask_password_SOURCES = \
src/ask-password/ask-password.c
systemd_ask_password_LDADD = \
- libsystemd-label.la \
libsystemd-shared.la
# ------------------------------------------------------------------------------
@@ -2864,7 +2804,6 @@ systemd_nspawn_CFLAGS = \
$(BLKID_CFLAGS)
systemd_nspawn_LDADD = \
- libsystemd-label.la \
libudev-internal.la \
libsystemd-internal.la \
libsystemd-shared.la \
@@ -2886,7 +2825,6 @@ systemd_run_SOURCES = \
src/run/run.c
systemd_run_LDADD = \
- libsystemd-label.la \
libsystemd-internal.la \
libsystemd-shared.la
@@ -2962,7 +2900,6 @@ systemd_tty_ask_password_agent_SOURCES = \
src/tty-ask-password-agent/tty-ask-password-agent.c
systemd_tty_ask_password_agent_LDADD = \
- libsystemd-label.la \
libsystemd-shared.la
# ------------------------------------------------------------------------------
@@ -3415,7 +3352,6 @@ libsystemd_network_la_SOURCES = \
libsystemd_network_la_LIBADD = \
libudev-internal.la \
- libsystemd-label.la \
libsystemd-internal.la \
libsystemd-shared.la \
$(KMOD_LIBS)
@@ -3438,7 +3374,6 @@ test_dhcp_client_SOURCES = \
test_dhcp_client_LDADD = \
libsystemd-network.la \
- libsystemd-label.la \
libsystemd-internal.la \
libsystemd-shared.la
@@ -3457,7 +3392,6 @@ test_ipv4ll_SOURCES = \
test_ipv4ll_LDADD = \
libsystemd-network.la \
- libsystemd-label.la \
libsystemd-internal.la \
libsystemd-shared.la
@@ -3838,7 +3772,6 @@ libudev_core_la_CFLAGS = \
libudev_core_la_LIBADD = \
libudev-internal.la \
- libsystemd-label.la \
libsystemd-internal.la \
libsystemd-network.la \
libsystemd-shared.la \
@@ -3970,7 +3903,6 @@ test_libudev_SOURCES = \
src/test/test-libudev.c
test_libudev_LDADD = \
- libsystemd-label.la \
libudev-internal.la \
libsystemd-internal.la \
libsystemd-shared.la
@@ -4129,7 +4061,6 @@ systemd_activate_SOURCES = \
src/activate/activate.c
systemd_activate_LDADD = \
- libsystemd-label.la \
libsystemd-internal.la \
libsystemd-shared.la
@@ -4399,7 +4330,6 @@ nodist_libsystemd_journal_core_la_SOURCES = \
libsystemd_journal_core_la_LIBADD = \
libsystemd-journal-internal.la \
libudev-internal.la \
- libsystemd-label.la \
libsystemd-internal.la \
libsystemd-shared.la
@@ -4501,8 +4431,7 @@ gperf_txt_sources += \
libsystemd_journal_internal_la_CFLAGS = \
$(AM_CFLAGS)
-libsystemd_journal_internal_la_LIBADD = \
- libsystemd-label.la
+libsystemd_journal_internal_la_LIBADD =
if HAVE_XZ
libsystemd_journal_internal_la_CFLAGS += \
@@ -4651,7 +4580,6 @@ systemd_coredump_SOURCES = \
systemd_coredump_LDADD = \
libsystemd-journal-internal.la \
- libsystemd-label.la \
libsystemd-internal.la \
libsystemd-shared.la
@@ -4830,7 +4758,6 @@ systemd_random_seed_SOURCES = \
src/random-seed/random-seed.c
systemd_random_seed_LDADD = \
- libsystemd-label.la \
libsystemd-shared.la
SYSINIT_TARGET_WANTS += \
@@ -4853,7 +4780,6 @@ systemd_backlight_SOURCES = \
src/backlight/backlight.c
systemd_backlight_LDADD = \
- libsystemd-label.la \
libudev-internal.la \
libsystemd-internal.la \
libsystemd-shared.la
@@ -4874,7 +4800,6 @@ systemd_rfkill_SOURCES = \
src/rfkill/rfkill.c
systemd_rfkill_LDADD = \
- libsystemd-label.la \
libudev-internal.la \
libsystemd-internal.la \
libsystemd-shared.la
@@ -4903,7 +4828,6 @@ systemd_cryptsetup_CFLAGS = \
$(LIBCRYPTSETUP_CFLAGS)
systemd_cryptsetup_LDADD = \
- libsystemd-label.la \
libudev-internal.la \
libsystemd-internal.la \
libsystemd-shared.la \
@@ -4913,7 +4837,6 @@ systemd_cryptsetup_generator_SOURCES = \
src/cryptsetup/cryptsetup-generator.c
systemd_cryptsetup_generator_LDADD = \
- libsystemd-label.la \
libsystemd-shared.la
SYSINIT_TARGET_WANTS += \
@@ -4927,7 +4850,6 @@ systemd_hostnamed_SOURCES = \
src/hostname/hostnamed.c
systemd_hostnamed_LDADD = \
- libsystemd-label.la \
libsystemd-internal.la \
libsystemd-shared.la
@@ -4992,7 +4914,6 @@ systemd_localed_SOURCES = \
src/locale/localed.c
systemd_localed_LDADD = \
- libsystemd-label.la \
libsystemd-internal.la \
libsystemd-shared.la \
$(XKBCOMMON_LIBS)
@@ -5061,7 +4982,6 @@ systemd_timedated_SOURCES = \
src/timedate/timedated.c
systemd_timedated_LDADD = \
- libsystemd-label.la \
libsystemd-internal.la \
libsystemd-shared.la
@@ -5132,7 +5052,6 @@ gperf_gperf_sources += \
systemd_timesyncd_LDADD = \
libsystemd-resolve.la \
libsystemd-network.la \
- libsystemd-label.la \
libsystemd-internal.la \
libsystemd-shared.la
@@ -5200,7 +5119,6 @@ libsystemd_machine_core_la_SOURCES = \
src/machine/image-dbus.h
libsystemd_machine_core_la_LIBADD = \
- libsystemd-label.la \
libudev-internal.la \
libsystemd-internal.la \
libsystemd-shared.la
@@ -5215,7 +5133,6 @@ machinectl_LDADD = \
libsystemd-internal.la \
libsystemd-logs.la \
libsystemd-journal-internal.la \
- libsystemd-units.la \
libsystemd-shared.la
rootbin_PROGRAMS += \
@@ -5315,7 +5232,6 @@ systemd_importd_CFLAGS = \
systemd_importd_LDADD = \
libsystemd-internal.la \
- libsystemd-label.la \
libsystemd-shared.la
systemd_pull_SOURCES = \
@@ -5351,7 +5267,6 @@ systemd_pull_CFLAGS = \
-D USER_KEYRING_PATH=\"$(pkgsysconfdir)/import-pubring.gpg\"
systemd_pull_LDADD = \
- libsystemd-label.la \
libsystemd-internal.la \
libsystemd-shared.la \
$(LIBCURL_LIBS) \
@@ -5379,7 +5294,6 @@ systemd_import_CFLAGS = \
$(ZLIB_CFLAGS)
systemd_import_LDADD = \
- libsystemd-label.la \
libsystemd-internal.la \
libsystemd-shared.la \
$(XZ_LIBS) \
@@ -5403,7 +5317,6 @@ systemd_export_CFLAGS = \
$(ZLIB_CFLAGS)
systemd_export_LDADD = \
- libsystemd-label.la \
libsystemd-internal.la \
libsystemd-shared.la \
$(XZ_LIBS) \
@@ -5451,7 +5364,6 @@ test_qcow2_CFLAGS = \
test_qcow2_LDADD = \
libsystemd-internal.la \
- libsystemd-label.la \
libsystemd-shared.la \
$(ZLIB_LIBS)
@@ -5521,7 +5433,6 @@ gperf_txt_sources += \
systemd_resolved_LDADD = \
libsystemd-network.la \
- libsystemd-label.la \
libsystemd-internal.la \
libsystemd-shared.la \
$(LIBIDN_LIBS)
@@ -5563,7 +5474,6 @@ test_dns_domain_SOURCES = \
test_dns_domain_LDADD = \
libsystemd-network.la \
- libsystemd-label.la \
libsystemd-internal.la \
libsystemd-shared.la \
$(LIBIDN_LIBS)
@@ -5690,7 +5600,6 @@ libsystemd_networkd_core_la_LIBADD = \
libudev-internal.la \
libsystemd-internal.la \
libsystemd-network.la \
- libsystemd-label.la \
libsystemd-shared.la
rootlibexec_PROGRAMS += \
@@ -5827,7 +5736,6 @@ libsystemd_logind_core_la_SOURCES = \
src/login/logind-acl.h
libsystemd_logind_core_la_LIBADD = \
- libsystemd-label.la \
libudev-internal.la \
libsystemd-internal.la \
libsystemd-shared.la
commit 9391a1c3d6c94c478b0016a81df3f874fd99260e
Author: Michael Biebl <biebl at debian.org>
Date: Wed Jun 3 14:00:59 2015 +0200
systemctl: Use /usr/bin/editor if available
If the EDITOR environment variable is not set, the Debian policy
recommends to use the /usr/bin/editor program as default editor.
This file is managed via the dpkg alternatives mechanism and typically
used in Debian/Ubuntu and derivatives to configure the default editor.
See section 11.4 of the Debian policy [1].
Therefor prefer /usr/bin/editor over specific editors if available.
[1] https://www.debian.org/doc/debian-policy/ch-customized-programs.html
diff --git a/man/systemctl.xml b/man/systemctl.xml
index 35f47de..409b6f0 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -1733,6 +1733,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
<varname>$VISUAL</varname> are present or if it is set to an empty
string or if their execution failed, systemctl will try to execute well
known editors in this order:
+ <citerefentry project='die-net'><refentrytitle>editor</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry project='die-net'><refentrytitle>nano</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry project='die-net'><refentrytitle>vim</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry project='die-net'><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></citerefentry>.
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index a7b8e54..b3d90d2 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -5879,7 +5879,7 @@ static int run_editor(char **paths) {
execvp(editor, (char* const*) args);
}
- FOREACH_STRING(p, "nano", "vim", "vi") {
+ FOREACH_STRING(p, "editor", "nano", "vim", "vi") {
args[0] = p;
execvp(p, (char* const*) args);
/* We do not fail if the editor doesn't exist
commit 3b51f8ddd5408eaae06e774e40144c7788748000
Author: Daniel Mack <daniel at zonque.org>
Date: Wed Jun 3 13:33:26 2015 +0200
util: fix another cunescape() regression
Fix a regression caused by 4034a06d ("util: rework word parsing and c
unescaping code") which broke octal escape sequences.
The reason for this breakage is that cunescape_one() expects 4 characters
in an octal encoding, which is a stray left-over from the old code which
operated on different variables to make the length check.
While at it, add a test case to prevent the same thing from happening
again.
diff --git a/src/shared/util.c b/src/shared/util.c
index 8a61079..311acbb 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -1152,7 +1152,7 @@ static int cunescape_one(const char *p, size_t length, char *ret, uint32_t *ret_
int a, b, c;
uint32_t m;
- if (length != (size_t) -1 && length < 4)
+ if (length != (size_t) -1 && length < 3)
return -EINVAL;
a = unoctchar(p[0]);
diff --git a/src/test/test-util.c b/src/test/test-util.c
index e026982..7a398fa 100644
--- a/src/test/test-util.c
+++ b/src/test/test-util.c
@@ -460,6 +460,9 @@ static void test_cunescape(void) {
assert_se(cunescape("\\u0000", 0, &unescaped) < 0);
assert_se(cunescape("\\u00DF\\U000000df\\u03a0\\U00000041", UNESCAPE_RELAX, &unescaped) >= 0);
assert_se(streq_ptr(unescaped, "ßßΠA"));
+
+ assert_se(cunescape("\\073", 0, &unescaped) >= 0);
+ assert_se(streq_ptr(unescaped, ";"));
}
static void test_foreach_word(void) {
More information about the systemd-commits
mailing list