summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.am238
-rw-r--r--README2
-rwxr-xr-xautogen.sh2
-rw-r--r--configure.ac25
-rw-r--r--src/core/manager.c3
-rw-r--r--src/libsystemd/sd-bus/bus-kernel.c26
-rw-r--r--src/libsystemd/sd-bus/bus-kernel.h2
-rw-r--r--src/libsystemd/sd-bus/test-bus-kernel.c2
-rw-r--r--src/shared/util.c2
-rw-r--r--src/test/test-unit-file.c2
-rw-r--r--src/test/test-util.c5
11 files changed, 106 insertions, 203 deletions
diff --git a/Makefile.am b/Makefile.am
index c1348b472c..7603b2c0e1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -916,7 +916,42 @@ libsystemd_shared_la_SOURCES = \
src/shared/sysctl-util.c \
src/shared/sysctl-util.h \
src/shared/hostname-util.h \
- src/shared/hostname-util.c
+ src/shared/hostname-util.c \
+ src/shared/socket-label.c \
+ src/shared/label.c \
+ src/shared/label.h \
+ src/shared/selinux-util.c \
+ src/shared/selinux-util.h \
+ src/shared/mkdir-label.c \
+ src/shared/ask-password-api.c \
+ src/shared/ask-password-api.h \
+ src/shared/switch-root.h \
+ src/shared/switch-root.c \
+ src/shared/fileio-label.c \
+ src/shared/fileio-label.h \
+ src/shared/dev-setup.c \
+ src/shared/dev-setup.h \
+ src/shared/dropin.c \
+ src/shared/dropin.h \
+ src/shared/condition.c \
+ src/shared/condition.h \
+ src/shared/generator.h \
+ src/shared/generator.c \
+ src/shared/btrfs-util.c \
+ src/shared/btrfs-util.h \
+ src/shared/btrfs-ctree.h \
+ src/shared/rm-rf.c \
+ src/shared/rm-rf.h \
+ src/shared/copy.c \
+ 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 += \
@@ -935,74 +970,27 @@ nodist_libsystemd_shared_la_SOURCES = \
libsystemd_shared_la_CFLAGS = \
$(AM_CFLAGS) \
+ $(SELINUX_CFLAGS) \
$(CAP_CFLAGS) \
$(SECCOMP_CFLAGS) \
-pthread
libsystemd_shared_la_LIBADD = \
+ $(SELINUX_LIBS) \
$(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-machine.la
-libsystemd_label_la_SOURCES = \
- src/shared/socket-label.c \
- src/shared/label.c \
- src/shared/label.h \
- src/shared/selinux-util.c \
- src/shared/selinux-util.h \
- src/shared/mkdir-label.c \
- src/shared/ask-password-api.c \
- src/shared/ask-password-api.h \
- src/shared/switch-root.h \
- src/shared/switch-root.c \
- src/shared/fileio-label.c \
- src/shared/fileio-label.h \
- src/shared/dev-setup.c \
- src/shared/dev-setup.h \
- src/shared/dropin.c \
- src/shared/dropin.h \
- src/shared/condition.c \
- src/shared/condition.h \
- src/shared/generator.h \
- src/shared/generator.c \
- src/shared/btrfs-util.c \
- src/shared/btrfs-util.h \
- src/shared/btrfs-ctree.h \
- src/shared/rm-rf.c \
- src/shared/rm-rf.h \
+libsystemd_machine_la_SOURCES = \
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
-
-libsystemd_label_la_CFLAGS = \
- $(AM_CFLAGS) \
- $(SELINUX_CFLAGS)
-
-libsystemd_label_la_LIBADD = \
- $(SELINUX_LIBS)
+ src/shared/machine-pool.h
# -----------------------------------------------------------------------------
-
if HAVE_LIBIPTC
noinst_LTLIBRARIES += \
libsystemd-fw.la
@@ -1020,7 +1008,6 @@ libsystemd_fw_la_LIBADD = \
endif
# -----------------------------------------------------------------------------
-
if ENABLE_LDCONFIG
dist_systemunit_DATA += \
units/ldconfig.service
@@ -1213,8 +1200,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 +1638,6 @@ test_copy_SOURCES = \
src/test/test-copy.c
test_copy_LDADD = \
- libsystemd-label.la \
libsystemd-shared.la
test_sigbus_SOURCES = \
@@ -1666,9 +1650,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 +1676,6 @@ test_util_SOURCES = \
src/test/test-util.c
test_util_LDADD = \
- libsystemd-label.la \
libsystemd-shared.la
test_process_util_SOURCES = \
@@ -1713,8 +1695,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 +1868,6 @@ test_btrfs_SOURCES = \
src/test/test-btrfs.c
test_btrfs_LDADD = \
- libsystemd-label.la \
libsystemd-shared.la
if HAVE_LIBIPTC
@@ -1964,7 +1943,6 @@ test_cgroup_SOURCES = \
src/test/test-cgroup.c
test_cgroup_LDADD = \
- libsystemd-label.la \
libsystemd-shared.la \
libsystemd-internal.la
@@ -1986,9 +1964,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 +1983,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 +2020,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 +2047,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 +2060,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 +2114,8 @@ systemd_analyze_CFLAGS = \
systemd_analyze_LDADD = \
libsystemd-core.la \
- libsystemd-internal.la \
libsystemd-shared.la \
+ libsystemd-internal.la \
$(RT_LIBS)
# ------------------------------------------------------------------------------
@@ -2172,9 +2144,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 +2158,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 +2203,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 +2266,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 +2307,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 +2331,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 +2353,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 +2364,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 +2376,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 +2401,6 @@ systemd_getty_generator_SOURCES = \
src/getty-generator/getty-generator.c
systemd_getty_generator_LDADD = \
- libsystemd-label.la \
libsystemd-shared.la
# ------------------------------------------------------------------------------
@@ -2448,7 +2408,6 @@ systemd_debug_generator_SOURCES = \
src/debug-generator/debug-generator.c
systemd_debug_generator_LDADD = \
- libsystemd-label.la \
libsystemd-shared.la
# ------------------------------------------------------------------------------
@@ -2457,7 +2416,6 @@ systemd_fstab_generator_SOURCES = \
src/core/mount-setup.c
systemd_fstab_generator_LDADD = \
- libsystemd-label.la \
libsystemd-shared.la
# ------------------------------------------------------------------------------
@@ -2465,7 +2423,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 +2437,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 +2470,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 +2487,6 @@ bootctl_CFLAGS = \
$(BLKID_CFLAGS)
bootctl_LDADD = \
- libsystemd-label.la \
libsystemd-shared.la \
libsystemd-internal.la \
$(BLKID_LIBS)
@@ -2711,7 +2665,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,7 +2684,6 @@ systemd_dbus1_generator_SOURCES = \
src/dbus1-generator/dbus1-generator.c
systemd_dbus1_generator_LDADD = \
- libsystemd-label.la \
libsystemd-internal.la \
libsystemd-shared.la
@@ -2756,7 +2708,6 @@ systemd_sysv_generator_SOURCES = \
systemd_sysv_generator_LDADD = \
libsystemd-core.la \
- libsystemd-label.la \
libsystemd-shared.la
# ------------------------------------------------------------------------------
@@ -2764,7 +2715,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 +2724,6 @@ systemd_remount_fs_SOURCES = \
src/core/mount-setup.h
systemd_remount_fs_LDADD = \
- libsystemd-label.la \
libsystemd-shared.la
# ------------------------------------------------------------------------------
@@ -2797,11 +2746,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 +2756,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,9 +2810,9 @@ systemd_nspawn_CFLAGS = \
$(BLKID_CFLAGS)
systemd_nspawn_LDADD = \
- libsystemd-label.la \
libudev-internal.la \
libsystemd-internal.la \
+ libsystemd-machine.la \
libsystemd-shared.la \
$(BLKID_LIBS)
@@ -2886,7 +2832,6 @@ systemd_run_SOURCES = \
src/run/run.c
systemd_run_LDADD = \
- libsystemd-label.la \
libsystemd-internal.la \
libsystemd-shared.la
@@ -2962,7 +2907,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 +3359,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 +3381,6 @@ test_dhcp_client_SOURCES = \
test_dhcp_client_LDADD = \
libsystemd-network.la \
- libsystemd-label.la \
libsystemd-internal.la \
libsystemd-shared.la
@@ -3457,7 +3399,6 @@ test_ipv4ll_SOURCES = \
test_ipv4ll_LDADD = \
libsystemd-network.la \
- libsystemd-label.la \
libsystemd-internal.la \
libsystemd-shared.la
@@ -3838,7 +3779,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 +3910,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 +4068,6 @@ systemd_activate_SOURCES = \
src/activate/activate.c
systemd_activate_LDADD = \
- libsystemd-label.la \
libsystemd-internal.la \
libsystemd-shared.la
@@ -4399,7 +4337,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 +4438,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 +4587,6 @@ systemd_coredump_SOURCES = \
systemd_coredump_LDADD = \
libsystemd-journal-internal.la \
- libsystemd-label.la \
libsystemd-internal.la \
libsystemd-shared.la
@@ -4830,7 +4765,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 +4787,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 +4807,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 +4835,6 @@ systemd_cryptsetup_CFLAGS = \
$(LIBCRYPTSETUP_CFLAGS)
systemd_cryptsetup_LDADD = \
- libsystemd-label.la \
libudev-internal.la \
libsystemd-internal.la \
libsystemd-shared.la \
@@ -4913,7 +4844,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 +4857,6 @@ systemd_hostnamed_SOURCES = \
src/hostname/hostnamed.c
systemd_hostnamed_LDADD = \
- libsystemd-label.la \
libsystemd-internal.la \
libsystemd-shared.la
@@ -4992,7 +4921,6 @@ systemd_localed_SOURCES = \
src/locale/localed.c
systemd_localed_LDADD = \
- libsystemd-label.la \
libsystemd-internal.la \
libsystemd-shared.la \
$(XKBCOMMON_LIBS)
@@ -5061,7 +4989,6 @@ systemd_timedated_SOURCES = \
src/timedate/timedated.c
systemd_timedated_LDADD = \
- libsystemd-label.la \
libsystemd-internal.la \
libsystemd-shared.la
@@ -5132,7 +5059,6 @@ gperf_gperf_sources += \
systemd_timesyncd_LDADD = \
libsystemd-resolve.la \
libsystemd-network.la \
- libsystemd-label.la \
libsystemd-internal.la \
libsystemd-shared.la
@@ -5200,9 +5126,9 @@ 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-machine.la \
libsystemd-shared.la
noinst_LTLIBRARIES += \
@@ -5215,7 +5141,6 @@ machinectl_LDADD = \
libsystemd-internal.la \
libsystemd-logs.la \
libsystemd-journal-internal.la \
- libsystemd-units.la \
libsystemd-shared.la
rootbin_PROGRAMS += \
@@ -5314,8 +5239,8 @@ systemd_importd_CFLAGS = \
-D SYSTEMD_EXPORT_PATH=\"$(rootlibexecdir)/systemd-export\"
systemd_importd_LDADD = \
+ libsystemd-machine.la \
libsystemd-internal.la \
- libsystemd-label.la \
libsystemd-shared.la
systemd_pull_SOURCES = \
@@ -5351,7 +5276,7 @@ systemd_pull_CFLAGS = \
-D USER_KEYRING_PATH=\"$(pkgsysconfdir)/import-pubring.gpg\"
systemd_pull_LDADD = \
- libsystemd-label.la \
+ libsystemd-machine.la \
libsystemd-internal.la \
libsystemd-shared.la \
$(LIBCURL_LIBS) \
@@ -5379,7 +5304,7 @@ systemd_import_CFLAGS = \
$(ZLIB_CFLAGS)
systemd_import_LDADD = \
- libsystemd-label.la \
+ libsystemd-machine.la \
libsystemd-internal.la \
libsystemd-shared.la \
$(XZ_LIBS) \
@@ -5403,7 +5328,7 @@ systemd_export_CFLAGS = \
$(ZLIB_CFLAGS)
systemd_export_LDADD = \
- libsystemd-label.la \
+ libsystemd-machine.la \
libsystemd-internal.la \
libsystemd-shared.la \
$(XZ_LIBS) \
@@ -5451,7 +5376,6 @@ test_qcow2_CFLAGS = \
test_qcow2_LDADD = \
libsystemd-internal.la \
- libsystemd-label.la \
libsystemd-shared.la \
$(ZLIB_LIBS)
@@ -5521,7 +5445,6 @@ gperf_txt_sources += \
systemd_resolved_LDADD = \
libsystemd-network.la \
- libsystemd-label.la \
libsystemd-internal.la \
libsystemd-shared.la \
$(LIBIDN_LIBS)
@@ -5563,7 +5486,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 +5612,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 +5748,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
@@ -6629,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/README b/README
index b8100446cf..777b34335e 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:
@@ -130,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/autogen.sh b/autogen.sh
index 3027f83153..2d4acdfef1 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
diff --git a/configure.ac b/configure.ac
index 0532c542f6..2625e0d15b 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])
@@ -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 \
@@ -1378,6 +1387,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],
@@ -1542,7 +1558,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}
diff --git a/src/core/manager.c b/src/core/manager.c
index ae473d05c2..a1c54339ea 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 d5cc8100ce..417e4d5903 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 b9f31ba790..bb4dff6d82 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 8f4f60b65f..6506eaab2e 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;
diff --git a/src/shared/util.c b/src/shared/util.c
index 8a6107969a..311acbb349 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-unit-file.c b/src/test/test-unit-file.c
index 31b12d50d7..a8025c825b 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,
diff --git a/src/test/test-util.c b/src/test/test-util.c
index e0269821d7..9d5516a18d 100644
--- a/src/test/test-util.c
+++ b/src/test/test-util.c
@@ -460,6 +460,11 @@ 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, ";"));
}
static void test_foreach_word(void) {
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2025-01-03 03:38:53 +0000