[packages/systemd] - updated to 220
baggins
baggins at pld-linux.org
Mon May 25 19:23:52 CEST 2015
commit 7edc51897a7cb9fd049042c7e88c972382708c31
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Mon May 25 19:23:36 2015 +0200
- updated to 220
no-configurable-runlevels.patch | 212 ----------------------------------------
pld-boot_efi_mount.patch | 24 +++--
systemd.spec | 47 +++++----
sysv-symlinks-warning.patch | 28 ------
target-pld.patch | 18 ++--
uids_gids.patch | 41 ++++----
6 files changed, 77 insertions(+), 293 deletions(-)
---
diff --git a/systemd.spec b/systemd.spec
index fe9071c..e082ee5 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -21,13 +21,13 @@ Summary: A System and Service Manager
Summary(pl.UTF-8): systemd - zarządca systemu i usług dla Linuksa
Name: systemd
# Verify ChangeLog and NEWS when updating (since there are incompatible/breaking changes very often)
-Version: 219
-Release: 2
+Version: 220
+Release: 0.1
Epoch: 1
License: GPL v2+ (udev), LGPL v2.1+ (the rest)
Group: Base
Source0: http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.xz
-# Source0-md5: e0d6c9a4b4f69f66932d2230298c9a34
+# Source0-md5: 60acd92b04c0f5faa806678abd433014
Source1: %{name}-sysv-convert
Source2: %{name}_booted.c
Source3: network.service
@@ -68,8 +68,6 @@ Patch16: systemd-configfs.patch
Patch17: pld-boot_efi_mount.patch
Patch18: optional-tmp-on-tmpfs.patch
Patch19: uids_gids.patch
-Patch20: sysv-symlinks-warning.patch
-Patch21: no-configurable-runlevels.patch
URL: http://www.freedesktop.org/wiki/Software/systemd
BuildRequires: acl-devel
BuildRequires: attr-devel
@@ -685,8 +683,6 @@ Uzupełnianie parametrów w zsh dla poleceń udev.
%patch17 -p1
%patch18 -p1
%patch19 -p1
-%patch20 -p1
-%patch21 -p1
cp -p %{SOURCE2} src/systemd_booted.c
%build
@@ -1170,9 +1166,11 @@ fi
%attr(755,root,root) /lib/systemd/systemd-cgroups-agent
%attr(755,root,root) /lib/systemd/systemd-coredump
%{?with_cryptsetup:%attr(755,root,root) /lib/systemd/systemd-cryptsetup}
+%attr(755,root,root) /lib/systemd/systemd-export
%attr(755,root,root) /lib/systemd/systemd-fsck
%attr(755,root,root) /lib/systemd/systemd-hibernate-resume
%attr(755,root,root) /lib/systemd/systemd-hostnamed
+%attr(755,root,root) /lib/systemd/systemd-import
%attr(755,root,root) /lib/systemd/systemd-importd
%attr(755,root,root) /lib/systemd/systemd-initctl
%attr(755,root,root) /lib/systemd/systemd-journald
@@ -1193,7 +1191,6 @@ fi
%attr(755,root,root) /lib/systemd/systemd-resolve-host
%attr(755,root,root) /lib/systemd/systemd-rfkill
%attr(755,root,root) /lib/systemd/systemd-shutdown
-%attr(755,root,root) /lib/systemd/systemd-shutdownd
%attr(755,root,root) /lib/systemd/systemd-sleep
%attr(755,root,root) /lib/systemd/systemd-socket-proxyd
%attr(755,root,root) /lib/systemd/systemd-sysctl
@@ -1236,6 +1233,7 @@ fi
%{_libexecdir}/sysusers.d/systemd-remote.conf
%endif
%{_libexecdir}/tmpfiles.d/etc.conf
+%{_libexecdir}/tmpfiles.d/home.conf
%{_libexecdir}/tmpfiles.d/legacy.conf
%{_libexecdir}/tmpfiles.d/systemd.conf
%{_libexecdir}/tmpfiles.d/systemd-nologin.conf
@@ -1302,6 +1300,10 @@ fi
%{_mandir}/man5/coredump.conf.5*
%{_mandir}/man5/coredump.conf.d.5*
%{_mandir}/man5/hostname.5*
+%if %{with microhttpd}
+%{_mandir}/man5/journal-remote.conf.5*
+%{_mandir}/man5/journal-remote.conf.d.5*
+%endif
%{_mandir}/man5/journald.conf.5*
%{_mandir}/man5/journald.conf.d.5*
%{_mandir}/man5/locale.conf.5*
@@ -1372,7 +1374,6 @@ fi
%{_mandir}/man8/systemd-rfkill.8*
%{_mandir}/man8/systemd-rfkill at .service.8*
%{_mandir}/man8/systemd-shutdown.8*
-%{_mandir}/man8/systemd-shutdownd.8*
%{_mandir}/man8/systemd-sleep.8*
%{_mandir}/man8/systemd-socket-proxyd.8*
%{_mandir}/man8/systemd-sysctl.8*
@@ -1464,7 +1465,7 @@ fi
%{_mandir}/man1/systemctl.1*
%{_mandir}/man5/tmpfiles.d.5*
%{_mandir}/man8/systemd-tmpfiles.8*
-%{_pkgconfigdir}/systemd.pc
+%{_npkgconfigdir}/systemd.pc
%{systemdunitdir}/proc-sys-fs-binfmt_misc.automount
%{systemdunitdir}/dev-hugepages.mount
@@ -1474,6 +1475,7 @@ fi
%{systemdunitdir}/sys-kernel-config.mount
%{systemdunitdir}/sys-kernel-debug.mount
%{systemdunitdir}/tmp.mount
+%{systemdunitdir}/var-lib-machines.mount
%{systemdunitdir}/var-lock.mount
%{systemdunitdir}/var-run.mount
%{systemdunitdir}/systemd-ask-password-console.path
@@ -1551,7 +1553,6 @@ fi
%{systemdunitdir}/systemd-reboot.service
%{systemdunitdir}/systemd-remount-fs.service
%{systemdunitdir}/systemd-rfkill at .service
-%{systemdunitdir}/systemd-shutdownd.service
%{systemdunitdir}/systemd-suspend.service
%{systemdunitdir}/systemd-sysctl.service
%{systemdunitdir}/systemd-sysusers.service
@@ -1580,7 +1581,6 @@ fi
%{systemdunitdir}/systemd-journald-audit.socket
%{systemdunitdir}/systemd-journald-dev-log.socket
%{systemdunitdir}/systemd-journald.socket
-%{systemdunitdir}/systemd-shutdownd.socket
%{systemdunitdir}/systemd-udevd-control.socket
%{systemdunitdir}/systemd-udevd-kernel.socket
%{systemdunitdir}/basic.target
@@ -1642,6 +1642,7 @@ fi
%{systemdunitdir}/systemd-tmpfiles-clean.timer
%dir %{systemdunitdir}/basic.target.wants
%dir %{systemdunitdir}/dbus.target.wants
+%dir %{systemdunitdir}/graphical.target.wants
%dir %{systemdunitdir}/halt.target.wants
%dir %{systemdunitdir}/initrd.target.wants
%dir %{systemdunitdir}/kexec.target.wants
@@ -1649,28 +1650,33 @@ fi
%dir %{systemdunitdir}/multi-user.target.wants
%dir %{systemdunitdir}/poweroff.target.wants
%dir %{systemdunitdir}/reboot.target.wants
+%dir %{systemdunitdir}/rescue.target.wants
%dir %{systemdunitdir}/runlevel[12345].target.wants
%dir %{systemdunitdir}/shutdown.target.wants
%dir %{systemdunitdir}/sockets.target.wants
%dir %{systemdunitdir}/sysinit.target.wants
%dir %{systemdunitdir}/syslog.target.wants
%dir %{systemdunitdir}/timers.target.wants
+%{systemdunitdir}/graphical.target.wants/display-manager.service
+%{systemdunitdir}/graphical.target.wants/systemd-update-utmp-runlevel.service
%{systemdunitdir}/local-fs.target.wants/pld-clean-tmp.service
%{systemdunitdir}/local-fs.target.wants/pld-storage-init-late.service
%{systemdunitdir}/local-fs.target.wants/pld-storage-init.service
%{systemdunitdir}/local-fs.target.wants/systemd-remount-fs.service
+%{systemdunitdir}/local-fs.target.wants/var-lib-machines.mount
%{systemdunitdir}/local-fs.target.wants/var-lock.mount
%{systemdunitdir}/local-fs.target.wants/var-run.mount
%{systemdunitdir}/multi-user.target.wants/getty.target
%{systemdunitdir}/multi-user.target.wants/rc-local.service
%{systemdunitdir}/multi-user.target.wants/systemd-ask-password-wall.path
%{systemdunitdir}/multi-user.target.wants/systemd-logind.service
+%{systemdunitdir}/multi-user.target.wants/systemd-update-utmp-runlevel.service
%{systemdunitdir}/multi-user.target.wants/systemd-user-sessions.service
+%{systemdunitdir}/rescue.target.wants/systemd-update-utmp-runlevel.service
%{systemdunitdir}/sockets.target.wants/systemd-initctl.socket
%{systemdunitdir}/sockets.target.wants/systemd-journald-audit.socket
%{systemdunitdir}/sockets.target.wants/systemd-journald-dev-log.socket
%{systemdunitdir}/sockets.target.wants/systemd-journald.socket
-%{systemdunitdir}/sockets.target.wants/systemd-shutdownd.socket
%{systemdunitdir}/sockets.target.wants/systemd-udevd-control.socket
%{systemdunitdir}/sockets.target.wants/systemd-udevd-kernel.socket
%{?with_cryptsetup:%{systemdunitdir}/sysinit.target.wants/cryptsetup.target}
@@ -1729,8 +1735,6 @@ fi
%{_mandir}/man8/systemd-random-seed.service.8*
%{_mandir}/man8/systemd-reboot.service.8*
%{_mandir}/man8/systemd-remount-fs.service.8*
-%{_mandir}/man8/systemd-shutdownd.service.8*
-%{_mandir}/man8/systemd-shutdownd.socket.8*
%{_mandir}/man8/systemd-suspend.service.8*
%{_mandir}/man8/systemd-sysctl.service.8*
%{_mandir}/man8/systemd-timedated.service.8*
@@ -1917,18 +1921,20 @@ fi
%attr(755,root,root) /lib/udev/accelerometer
%dir /lib/udev/hwdb.d
-/lib/udev/hwdb.d/20-OUI.hwdb
/lib/udev/hwdb.d/20-acpi-vendor.hwdb
/lib/udev/hwdb.d/20-bluetooth-vendor-product.hwdb
/lib/udev/hwdb.d/20-net-ifname.hwdb
+/lib/udev/hwdb.d/20-OUI.hwdb
/lib/udev/hwdb.d/20-pci-classes.hwdb
/lib/udev/hwdb.d/20-pci-vendor-model.hwdb
/lib/udev/hwdb.d/20-sdio-classes.hwdb
/lib/udev/hwdb.d/20-sdio-vendor-model.hwdb
/lib/udev/hwdb.d/20-usb-classes.hwdb
/lib/udev/hwdb.d/20-usb-vendor-model.hwdb
+/lib/udev/hwdb.d/60-evdev.hwdb
/lib/udev/hwdb.d/60-keyboard.hwdb
/lib/udev/hwdb.d/70-mouse.hwdb
+/lib/udev/hwdb.d/70-pointingstick.hwdb
/lib/udev/hwdb.d/70-touchpad.hwdb
%attr(755,root,root) %{_sbindir}/start_udev
@@ -1954,15 +1960,16 @@ fi
# rules below are NOT supposed to be changed by users
/lib/udev/rules.d/42-usb-hid-pm.rules
/lib/udev/rules.d/50-udev-default.rules
+/lib/udev/rules.d/60-block.rules
/lib/udev/rules.d/60-cdrom_id.rules
/lib/udev/rules.d/60-drm.rules
-/lib/udev/rules.d/60-keyboard.rules
+/lib/udev/rules.d/60-evdev.rules
/lib/udev/rules.d/60-persistent-alsa.rules
/lib/udev/rules.d/60-persistent-input.rules
-/lib/udev/rules.d/60-persistent-serial.rules
-/lib/udev/rules.d/60-persistent-storage-tape.rules
/lib/udev/rules.d/60-persistent-storage.rules
+/lib/udev/rules.d/60-persistent-storage-tape.rules
/lib/udev/rules.d/60-persistent-v4l.rules
+/lib/udev/rules.d/60-serial.rules
/lib/udev/rules.d/61-accelerometer.rules
/lib/udev/rules.d/64-btrfs.rules
/lib/udev/rules.d/70-mouse.rules
@@ -1970,12 +1977,10 @@ fi
/lib/udev/rules.d/70-touchpad.rules
/lib/udev/rules.d/75-net-description.rules
/lib/udev/rules.d/75-probe_mtd.rules
-/lib/udev/rules.d/75-tty-description.rules
/lib/udev/rules.d/78-sound-card.rules
/lib/udev/rules.d/80-drivers.rules
/lib/udev/rules.d/80-net-setup-link.rules
/lib/udev/rules.d/90-vconsole.rules
-/lib/udev/rules.d/95-udev-late.rules
%{_mandir}/man5/udev.conf.5*
%{_mandir}/man7/udev.7*
diff --git a/no-configurable-runlevels.patch b/no-configurable-runlevels.patch
deleted file mode 100644
index 8565534..0000000
--- a/no-configurable-runlevels.patch
+++ /dev/null
@@ -1,212 +0,0 @@
-From d5d8429a12c4b1ef0dcd226c0904f00f4fa4898a Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart at poettering.net>
-Date: Wed, 18 Feb 2015 20:17:49 +0100
-Subject: everywhere: remove configurability of sysv runlevel to target mapping
-
-With this change runlevel 2, 3, 4 are mapped to multi-user.target for
-good, and 5 to graphical.target. This was already the previous mapping
-but is now no longer reconfigurable, but hard-coded into the core.
-
-This should generally simplify things, but also fix one bug: the
-sysv-generator previously generated symlinks to runlevel[2-5].target
-units, which possibly weren't picked up if these aliases were otherwise
-only referenced by the real names "multi-user.target" and
-"graphical.target".
-
-We keep compat aliases "runlevel[2345].target" arround for cases where
-this target name is explicitly requested.
-
-diff --git a/Makefile.am b/Makefile.am
-index d9d71df..ba63f68 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -242,14 +242,11 @@ endef
-
- INSTALL_DIRS =
-
--RUNLEVEL1_TARGET_WANTS =
--RUNLEVEL2_TARGET_WANTS =
--RUNLEVEL3_TARGET_WANTS =
--RUNLEVEL4_TARGET_WANTS =
--RUNLEVEL5_TARGET_WANTS =
- SHUTDOWN_TARGET_WANTS =
- LOCAL_FS_TARGET_WANTS =
- MULTI_USER_TARGET_WANTS =
-+GRAPHICAL_TARGET_WANTS =
-+RESCUE_TARGET_WANTS =
- SYSINIT_TARGET_WANTS =
- SOCKETS_TARGET_WANTS =
- BUSNAMES_TARGET_WANTS =
-@@ -263,14 +260,11 @@ USER_UNIT_ALIASES =
- GENERAL_ALIASES =
-
- install-target-wants-hook:
-- what="$(RUNLEVEL1_TARGET_WANTS)" && wants=runlevel1.target && dir=$(systemunitdir) && $(add-wants)
-- what="$(RUNLEVEL2_TARGET_WANTS)" && wants=runlevel2.target && dir=$(systemunitdir) && $(add-wants)
-- what="$(RUNLEVEL3_TARGET_WANTS)" && wants=runlevel3.target && dir=$(systemunitdir) && $(add-wants)
-- what="$(RUNLEVEL4_TARGET_WANTS)" && wants=runlevel4.target && dir=$(systemunitdir) && $(add-wants)
-- what="$(RUNLEVEL5_TARGET_WANTS)" && wants=runlevel5.target && dir=$(systemunitdir) && $(add-wants)
- what="$(SHUTDOWN_TARGET_WANTS)" && wants=shutdown.target && dir=$(systemunitdir) && $(add-wants)
- what="$(LOCAL_FS_TARGET_WANTS)" && wants=local-fs.target && dir=$(systemunitdir) && $(add-wants)
- what="$(MULTI_USER_TARGET_WANTS)" && wants=multi-user.target && dir=$(systemunitdir) && $(add-wants)
-+ what="$(GRAPHICAL_TARGET_WANTS)" && wants=graphical.target && dir=$(systemunitdir) && $(add-wants)
-+ what="$(RESCUE_TARGET_WANTS)" && wants=rescue.target && dir=$(systemunitdir) && $(add-wants)
- what="$(SYSINIT_TARGET_WANTS)" && wants=sysinit.target && dir=$(systemunitdir) && $(add-wants)
- what="$(SOCKETS_TARGET_WANTS)" && wants=sockets.target && dir=$(systemunitdir) && $(add-wants)
- what="$(TIMERS_TARGET_WANTS)" && wants=timers.target && dir=$(systemunitdir) && $(add-wants)
-@@ -6572,15 +6566,11 @@ SOCKETS_TARGET_WANTS += \
-
- if HAVE_UTMP
- if HAVE_SYSV_COMPAT
--RUNLEVEL1_TARGET_WANTS += \
-- systemd-update-utmp-runlevel.service
--RUNLEVEL2_TARGET_WANTS += \
-- systemd-update-utmp-runlevel.service
--RUNLEVEL3_TARGET_WANTS += \
-+MULTI_USER_TARGET_WANTS += \
- systemd-update-utmp-runlevel.service
--RUNLEVEL4_TARGET_WANTS += \
-+GRAPHICAL_TARGET_WANTS += \
- systemd-update-utmp-runlevel.service
--RUNLEVEL5_TARGET_WANTS += \
-+RESCUE_TARGET_WANTS += \
- systemd-update-utmp-runlevel.service
- endif
-
-diff --git a/src/core/main.c b/src/core/main.c
-index ba2de85..08f46f5 100644
---- a/src/core/main.c
-+++ b/src/core/main.c
-@@ -280,10 +280,10 @@ static int parse_proc_cmdline_item(const char *key, const char *value) {
- "s", SPECIAL_RESCUE_TARGET,
- "S", SPECIAL_RESCUE_TARGET,
- "1", SPECIAL_RESCUE_TARGET,
-- "2", SPECIAL_RUNLEVEL2_TARGET,
-- "3", SPECIAL_RUNLEVEL3_TARGET,
-- "4", SPECIAL_RUNLEVEL4_TARGET,
-- "5", SPECIAL_RUNLEVEL5_TARGET,
-+ "2", SPECIAL_MULTI_USER_TARGET,
-+ "3", SPECIAL_MULTI_USER_TARGET,
-+ "4", SPECIAL_MULTI_USER_TARGET,
-+ "5", SPECIAL_GRAPHICAL_TARGET,
- };
- int r;
-
-diff --git a/src/initctl/initctl.c b/src/initctl/initctl.c
-index 7a6a383..8b632e8 100644
---- a/src/initctl/initctl.c
-+++ b/src/initctl/initctl.c
-@@ -78,15 +78,15 @@ static const char *translate_runlevel(int runlevel, bool *isolate) {
- const char *special;
- bool isolate;
- } table[] = {
-- { '0', SPECIAL_POWEROFF_TARGET, false },
-- { '1', SPECIAL_RESCUE_TARGET, true },
-- { 's', SPECIAL_RESCUE_TARGET, true },
-- { 'S', SPECIAL_RESCUE_TARGET, true },
-- { '2', SPECIAL_RUNLEVEL2_TARGET, true },
-- { '3', SPECIAL_RUNLEVEL3_TARGET, true },
-- { '4', SPECIAL_RUNLEVEL4_TARGET, true },
-- { '5', SPECIAL_RUNLEVEL5_TARGET, true },
-- { '6', SPECIAL_REBOOT_TARGET, false },
-+ { '0', SPECIAL_POWEROFF_TARGET, false },
-+ { '1', SPECIAL_RESCUE_TARGET, true },
-+ { 's', SPECIAL_RESCUE_TARGET, true },
-+ { 'S', SPECIAL_RESCUE_TARGET, true },
-+ { '2', SPECIAL_MULTI_USER_TARGET, true },
-+ { '3', SPECIAL_MULTI_USER_TARGET, true },
-+ { '4', SPECIAL_MULTI_USER_TARGET, true },
-+ { '5', SPECIAL_GRAPHICAL_TARGET, true },
-+ { '6', SPECIAL_REBOOT_TARGET, false },
- };
-
- unsigned i;
-diff --git a/src/shared/special.h b/src/shared/special.h
-index b045047..e51310e 100644
---- a/src/shared/special.h
-+++ b/src/shared/special.h
-@@ -42,6 +42,8 @@
- /* Special boot targets */
- #define SPECIAL_RESCUE_TARGET "rescue.target"
- #define SPECIAL_EMERGENCY_TARGET "emergency.target"
-+#define SPECIAL_MULTI_USER_TARGET "multi-user.target"
-+#define SPECIAL_GRAPHICAL_TARGET "graphical.target"
-
- /* Early boot targets */
- #define SPECIAL_SYSINIT_TARGET "sysinit.target"
-@@ -108,13 +110,6 @@
- #define SPECIAL_SIGPWR_TARGET "sigpwr.target"
- #define SPECIAL_CTRL_ALT_DEL_TARGET "ctrl-alt-del.target"
-
--/* For SysV compatibility. Usually an alias for a saner target. On
-- * SysV-free systems this doesn't exist. */
--#define SPECIAL_RUNLEVEL2_TARGET "runlevel2.target"
--#define SPECIAL_RUNLEVEL3_TARGET "runlevel3.target"
--#define SPECIAL_RUNLEVEL4_TARGET "runlevel4.target"
--#define SPECIAL_RUNLEVEL5_TARGET "runlevel5.target"
--
- /* Where we add all our system units, users and machines by default */
- #define SPECIAL_SYSTEM_SLICE "system.slice"
- #define SPECIAL_USER_SLICE "user.slice"
-diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
-index afd4b71..9b08313 100644
---- a/src/systemctl/systemctl.c
-+++ b/src/systemctl/systemctl.c
-@@ -2650,10 +2650,10 @@ static const struct {
- [ACTION_POWEROFF] = { SPECIAL_POWEROFF_TARGET, "poweroff", "replace-irreversibly" },
- [ACTION_REBOOT] = { SPECIAL_REBOOT_TARGET, "reboot", "replace-irreversibly" },
- [ACTION_KEXEC] = { SPECIAL_KEXEC_TARGET, "kexec", "replace-irreversibly" },
-- [ACTION_RUNLEVEL2] = { SPECIAL_RUNLEVEL2_TARGET, NULL, "isolate" },
-- [ACTION_RUNLEVEL3] = { SPECIAL_RUNLEVEL3_TARGET, NULL, "isolate" },
-- [ACTION_RUNLEVEL4] = { SPECIAL_RUNLEVEL4_TARGET, NULL, "isolate" },
-- [ACTION_RUNLEVEL5] = { SPECIAL_RUNLEVEL5_TARGET, NULL, "isolate" },
-+ [ACTION_RUNLEVEL2] = { SPECIAL_MULTI_USER_TARGET, NULL, "isolate" },
-+ [ACTION_RUNLEVEL3] = { SPECIAL_MULTI_USER_TARGET, NULL, "isolate" },
-+ [ACTION_RUNLEVEL4] = { SPECIAL_MULTI_USER_TARGET, NULL, "isolate" },
-+ [ACTION_RUNLEVEL5] = { SPECIAL_GRAPHICAL_TARGET, NULL, "isolate" },
- [ACTION_RESCUE] = { SPECIAL_RESCUE_TARGET, "rescue", "isolate" },
- [ACTION_EMERGENCY] = { SPECIAL_EMERGENCY_TARGET, "emergency", "isolate" },
- [ACTION_DEFAULT] = { SPECIAL_DEFAULT_TARGET, "default", "isolate" },
-diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c
-index 6e39b44..2091854 100644
---- a/src/sysv-generator/sysv-generator.c
-+++ b/src/sysv-generator/sysv-generator.c
-@@ -51,11 +51,11 @@ static const struct {
- const RunlevelType type;
- } rcnd_table[] = {
- /* Standard SysV runlevels for start-up */
-- { "rc1.d", SPECIAL_RESCUE_TARGET, RUNLEVEL_UP },
-- { "rc2.d", SPECIAL_RUNLEVEL2_TARGET, RUNLEVEL_UP },
-- { "rc3.d", SPECIAL_RUNLEVEL3_TARGET, RUNLEVEL_UP },
-- { "rc4.d", SPECIAL_RUNLEVEL4_TARGET, RUNLEVEL_UP },
-- { "rc5.d", SPECIAL_RUNLEVEL5_TARGET, RUNLEVEL_UP },
-+ { "rc1.d", SPECIAL_RESCUE_TARGET, RUNLEVEL_UP },
-+ { "rc2.d", SPECIAL_MULTI_USER_TARGET, RUNLEVEL_UP },
-+ { "rc3.d", SPECIAL_MULTI_USER_TARGET, RUNLEVEL_UP },
-+ { "rc4.d", SPECIAL_MULTI_USER_TARGET, RUNLEVEL_UP },
-+ { "rc5.d", SPECIAL_GRAPHICAL_TARGET, RUNLEVEL_UP },
-
- /* Standard SysV runlevels for shutdown */
- { "rc0.d", SPECIAL_POWEROFF_TARGET, RUNLEVEL_DOWN },
-diff --git a/src/update-utmp/update-utmp.c b/src/update-utmp/update-utmp.c
-index 15da831..5e7498c 100644
---- a/src/update-utmp/update-utmp.c
-+++ b/src/update-utmp/update-utmp.c
-@@ -80,11 +80,9 @@ static int get_current_runlevel(Context *c) {
- * here over the others, since these are the main
- * runlevels used on Fedora. It might make sense to
- * change the order on some distributions. */
-- { '5', SPECIAL_RUNLEVEL5_TARGET },
-- { '3', SPECIAL_RUNLEVEL3_TARGET },
-- { '4', SPECIAL_RUNLEVEL4_TARGET },
-- { '2', SPECIAL_RUNLEVEL2_TARGET },
-- { '1', SPECIAL_RESCUE_TARGET },
-+ { '5', SPECIAL_GRAPHICAL_TARGET },
-+ { '3', SPECIAL_MULTI_USER_TARGET },
-+ { '1', SPECIAL_RESCUE_TARGET },
- };
-
- _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
---
-cgit v0.10.2
-
diff --git a/pld-boot_efi_mount.patch b/pld-boot_efi_mount.patch
index a5cd9b6..19e75af 100644
--- a/pld-boot_efi_mount.patch
+++ b/pld-boot_efi_mount.patch
@@ -1,15 +1,23 @@
diff -dur -x '*~' -x '*.orig' -x '*.rej' systemd-218.orig/src/efi-boot-generator/efi-boot-generator.c systemd-218/src/efi-boot-generator/efi-boot-generator.c
--- systemd-218.orig/src/efi-boot-generator/efi-boot-generator.c 2014-12-05 01:26:51.000000000 +0100
+++ systemd-218/src/efi-boot-generator/efi-boot-generator.c 2015-04-02 15:45:18.000000000 +0200
-@@ -69,9 +69,9 @@
+@@ -69,15 +69,15 @@
return EXIT_SUCCESS;
}
-- if (path_is_mount_point("/boot", true) <= 0 &&
-- dir_is_empty("/boot") <= 0) {
+- r = path_is_mount_point("/boot", true);
++ r = path_is_mount_point("/boot/efi", true);
+ if (r > 0) {
+- log_debug("/boot is already a mount point, exiting.");
++ log_debug("/boot/efi is already a mount point, exiting.");
+ return EXIT_SUCCESS;
+ }
+ if (r == -ENOENT)
+- log_debug("/boot does not exist, continuing.");
+- else if (dir_is_empty("/boot") <= 0) {
- log_debug("/boot already populated, exiting.");
-+ if (path_is_mount_point("/boot/efi", true) <= 0 &&
-+ dir_is_empty("/boot/efi") <= 0) {
++ log_debug("/boot/efi does not exist, continuing.");
++ else if (dir_is_empty("/boot/efi") <= 0) {
+ log_debug("/boot/efi already populated, exiting.");
return EXIT_SUCCESS;
}
@@ -54,11 +62,11 @@ diff -dur -x '*~' -x '*.orig' -x '*.rej' systemd-218.orig/src/efi-boot-generator
"[Unit]\n"
"Description=EFI System Partition Automount\n\n"
"[Automount]\n"
-- "Where=/boot\n", f);
-+ "Where=/boot/efi\n", f);
+- "Where=/boot\n"
++ "Where=/boot/efi\n"
+ "TimeoutIdleSec=120\n", f);
fflush(f);
- if (ferror(f)) {
@@ -144,10 +144,10 @@
return EXIT_FAILURE;
}
diff --git a/sysv-symlinks-warning.patch b/sysv-symlinks-warning.patch
deleted file mode 100644
index 77a02bf..0000000
--- a/sysv-symlinks-warning.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-
-based on:
-
-From 4e5589836c9e143796c3f3d81e67ab7a9209e2b0 Mon Sep 17 00:00:00 2001
-From: Martin Pitt <martin.pitt at ubuntu.com>
-Date: Thu, 19 Feb 2015 11:06:24 +0100
-Subject: sysv-generator: fix wrong "Overwriting existing symlink" warnings
-
-Fix result testing of is_symlink() to ignore negative results, which happen if
-the file name does not exist at all. In this case we do not want a warning and
-unlink the non-existing link.
-
-https://bugs.debian.org/778700
-
-diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c
-index 2091854..bd67f32 100644
---- a/src/sysv-generator/sysv-generator.c
-+++ b/src/sysv-generator/sysv-generator.c
-@@ -166,7 +166,7 @@ static int generate_unit_file(SysvStub *s) {
- /* We might already have a symlink with the same name from a Provides:,
- * or from backup files like /etc/init.d/foo.bak. Real scripts always win,
- * so remove an existing link */
-- if (is_symlink(unit)) {
-+ if (is_symlink(unit) > 0) {
- log_warning("Overwriting existing symlink %s with real service", unit);
- (void) unlink(unit);
- }
-
diff --git a/target-pld.patch b/target-pld.patch
index fbaa208..ca3ba69 100644
--- a/target-pld.patch
+++ b/target-pld.patch
@@ -19,13 +19,12 @@ diff -dur -x '*~' -x '*.orig' systemd-208.orig/Makefile.am systemd-208/Makefile.
define add-wants
[ -z "$$what" ] || ( \
-@@ -4001,9 +4005,16 @@
+@@ -4001,8 +4005,15 @@
$(systemdstatedir)
MULTI_USER_TARGET_WANTS += \
+ rc-local.service \
- systemd-logind.service \
- systemd-user-sessions.service
+ systemd-logind.service
+FINAL_TARGET_WANTS += \
+ halt-local.service
@@ -114,7 +113,7 @@ diff -dur -x '*~' -x '*.orig' systemd-208.orig/src/core/hostname-setup.c systemd
+ /* First, try to load the generic hostname configuration file,
+ * that we support on all distributions */
+
-+ r = read_and_strip_hostname("/etc/hostname", hn);
++ r = read_hostname_config("/etc/hostname", hn);
+ if (r < 0) {
+ if (r == -ENOENT)
+ return read_distro_hostname(hn);
@@ -131,7 +130,7 @@ diff -dur -x '*~' -x '*.orig' systemd-208.orig/src/core/hostname-setup.c systemd
const char *hn;
bool enoent = false;
-- r = read_and_strip_hostname("/etc/hostname", &b);
+- r = read_hostname_config("/etc/hostname", &b);
+ r = read_hostname(&b);
if (r < 0) {
if (r == -ENOENT)
@@ -166,7 +165,11 @@ diff -dur -x '*~' -x '*.orig' systemd-208.orig/src/core/locale-setup.c systemd-2
diff -dur -x '*~' -x '*.orig' systemd-208.orig/src/timedate/timedated.c systemd-208/src/timedate/timedated.c
--- systemd-208.orig/src/timedate/timedated.c 2013-08-13 22:02:47.000000000 +0200
+++ systemd-208/src/timedate/timedated.c 2014-01-09 15:15:41.000000000 +0100
-@@ -183,6 +183,14 @@
+@@ -183,9 +183,19 @@
+ c->zone = strdup(e);
+ if (!c->zone)
+ return log_oom();
++ goto have_timezone;
}
}
@@ -178,9 +181,10 @@ diff -dur -x '*~' -x '*.orig' systemd-208.orig/src/timedate/timedated.c systemd-
+ log_warning("Failed to read /etc/sysconfig/timezone: %s", strerror(-r));
+ }
+
- have_timezone:
++have_timezone:
if (isempty(c->zone)) {
free(c->zone);
+ c->zone = NULL;
diff -dur -x '*~' -x '*.orig' systemd-208.orig/src/vconsole/vconsole-setup.c systemd-208/src/vconsole/vconsole-setup.c
--- systemd-208.orig/src/vconsole/vconsole-setup.c 2013-08-13 22:02:47.000000000 +0200
+++ systemd-208/src/vconsole/vconsole-setup.c 2014-01-09 15:17:49.000000000 +0100
diff --git a/uids_gids.patch b/uids_gids.patch
index f3bb417..d215e7d 100644
--- a/uids_gids.patch
+++ b/uids_gids.patch
@@ -42,23 +42,6 @@ diff -dur systemd-218.orig/sysusers.d/basic.conf.in systemd-218/sysusers.d/basic
# Default group for normal users
-g users - - -
+g users 1000 - -
-diff -dur systemd-218.orig/sysusers.d/systemd.conf systemd-218/sysusers.d/systemd.conf
---- systemd-218.orig/sysusers.d/systemd.conf 2014-12-05 01:31:29.000000000 +0100
-+++ systemd-218/sysusers.d/systemd.conf 2015-04-20 08:49:13.000000000 +0200
-@@ -5,8 +5,8 @@
- # the Free Software Foundation; either version 2.1 of the License, or
- # (at your option) any later version.
-
--g systemd-journal - -
--u systemd-bus-proxy - "systemd Bus Proxy"
--u systemd-network - "systemd Network Management"
--u systemd-resolve - "systemd Resolver"
--u systemd-timesync - "systemd Time Synchronization"
-+g systemd-journal 288 -
-+u systemd-bus-proxy 315 "systemd Bus Proxy"
-+u systemd-network 316 "systemd Network Management"
-+u systemd-resolve 317 "systemd Resolver"
-+u systemd-timesync 318 "systemd Time Synchronization"
diff -dur systemd-218.orig/sysusers.d/systemd-remote.conf systemd-218/sysusers.d/systemd-remote.conf
--- systemd-218.orig/sysusers.d/systemd-remote.conf 2014-12-05 01:26:51.000000000 +0100
+++ systemd-218/sysusers.d/systemd-remote.conf 2015-04-20 08:48:22.000000000 +0200
@@ -72,3 +55,27 @@ diff -dur systemd-218.orig/sysusers.d/systemd-remote.conf systemd-218/sysusers.d
+u systemd-journal-gateway 287 "systemd Journal Gateway"
+u systemd-journal-remote 319 "systemd Journal Remote"
+u systemd-journal-upload 320 "systemd Journal Upload"
+--- systemd-220/sysusers.d/systemd.conf.m4~ 2014-12-05 01:26:51.000000000 +0100
++++ systemd-220/sysusers.d/systemd.conf.m4 2015-05-25 17:34:30.699429304 +0200
+@@ -5,16 +5,16 @@
+ # the Free Software Foundation; either version 2.1 of the License, or
+ # (at your option) any later version.
+
+-g systemd-journal - -
++g systemd-journal 288 -
+ m4_ifdef(`ENABLE_KDBUS',
+-u systemd-bus-proxy - "systemd Bus Proxy"
++u systemd-bus-proxy 315 "systemd Bus Proxy"
+ )m4_dnl
+ m4_ifdef(`ENABLE_NETWORKD',
+-u systemd-network - "systemd Network Management"
++u systemd-network 316 "systemd Network Management"
+ )m4_dnl
+ m4_ifdef(`ENABLE_RESOLVED',
+-u systemd-resolve - "systemd Resolver"
++u systemd-resolve 317 "systemd Resolver"
+ )m4_dnl
+ m4_ifdef(`ENABLE_TIMESYNCD',
+-u systemd-timesync - "systemd Time Synchronization"
++u systemd-timesync 318 "systemd Time Synchronization"
+ )m4_dnl
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/systemd.git/commitdiff/7edc51897a7cb9fd049042c7e88c972382708c31
More information about the pld-cvs-commit
mailing list