From bc3c70f5ecf22018224f20ed9add8799de133194 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 7 Aug 2015 18:56:23 +0000 Subject: systemd: update to 224 --- ...ng-references-to-var-lib-backlight-random.patch | 54 --- ...ator-When-parsing-the-root-cmdline-option.patch | 29 -- ...-stop-a-running-user-manager-from-garbage.patch | 36 -- ...unt-check-for-NULL-before-reading-pm-what.patch | 29 -- ...-fix-off-by-one-error-in-tag_to_udev_node.patch | 50 --- ...ator-Generate-explicit-dependencies-on-sy.patch | 102 ------ ...nerator-Generate-explicit-dependencies-on.patch | 55 ---- ...FsckPassNo-from-systemd-fsck-root.service.patch | 22 -- ...005-mount-service-drop-FsckPassNo-support.patch | 364 --------------------- .../0006-efi-boot-generator-hookup-to-fsck.patch | 81 ----- ...sck-root-only-run-when-requested-in-fstab.patch | 95 ------ abs/core/systemd/PKGBUILD | 171 +++++----- abs/core/systemd/__changelog | 4 + abs/core/systemd/arch.conf | 7 + abs/core/systemd/initcpio-hook-udev | 2 +- abs/core/systemd/initcpio-install-systemd | 39 ++- abs/core/systemd/initcpio-install-udev | 1 - abs/core/systemd/loader.conf | 1 + abs/core/systemd/splash-arch.bmp | Bin 0 -> 378226 bytes abs/core/systemd/systemd.install | 225 +++++++++---- 20 files changed, 278 insertions(+), 1089 deletions(-) delete mode 100644 abs/core/systemd/0001-fix-lingering-references-to-var-lib-backlight-random.patch delete mode 100644 abs/core/systemd/0001-fstab-generator-When-parsing-the-root-cmdline-option.patch delete mode 100644 abs/core/systemd/0001-login-Don-t-stop-a-running-user-manager-from-garbage.patch delete mode 100644 abs/core/systemd/0001-mount-check-for-NULL-before-reading-pm-what.patch delete mode 100644 abs/core/systemd/0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch delete mode 100644 abs/core/systemd/0002-fstab-generator-Generate-explicit-dependencies-on-sy.patch delete mode 100644 abs/core/systemd/0003-gpt-auto-generator-Generate-explicit-dependencies-on.patch delete mode 100644 abs/core/systemd/0004-Remove-FsckPassNo-from-systemd-fsck-root.service.patch delete mode 100644 abs/core/systemd/0005-mount-service-drop-FsckPassNo-support.patch delete mode 100644 abs/core/systemd/0006-efi-boot-generator-hookup-to-fsck.patch delete mode 100644 abs/core/systemd/0007-fsck-root-only-run-when-requested-in-fstab.patch mode change 100755 => 100644 abs/core/systemd/PKGBUILD create mode 100644 abs/core/systemd/__changelog create mode 100644 abs/core/systemd/arch.conf create mode 100644 abs/core/systemd/loader.conf create mode 100644 abs/core/systemd/splash-arch.bmp diff --git a/abs/core/systemd/0001-fix-lingering-references-to-var-lib-backlight-random.patch b/abs/core/systemd/0001-fix-lingering-references-to-var-lib-backlight-random.patch deleted file mode 100644 index 49b960c..0000000 --- a/abs/core/systemd/0001-fix-lingering-references-to-var-lib-backlight-random.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 6c8c92fef72cf6a7ef7109a424ef82dbdc4f6952 Mon Sep 17 00:00:00 2001 -From: Dave Reisner -Date: Wed, 2 Oct 2013 07:46:24 -0400 -Subject: [PATCH] fix lingering references to /var/lib/{backlight,random-seed} - -This should have been part of ef5bfcf668e6029faa78534dfe. ---- - man/systemd-backlight@.service.xml | 2 +- - man/systemd-random-seed.service.xml | 2 +- - units/systemd-backlight@.service.in | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/man/systemd-backlight@.service.xml b/man/systemd-backlight@.service.xml -index 2b73625..4318964 100644 ---- a/man/systemd-backlight@.service.xml -+++ b/man/systemd-backlight@.service.xml -@@ -58,7 +58,7 @@ - is a service that restores the display backlight - brightness at early-boot and saves it at shutdown. On - disk, the backlight brightness is stored in -- /var/lib/backlight/. Note that by -+ /var/lib/systemd/backlight/. Note that by - default, only firmware backlight devices are - saved/restored. - -diff --git a/man/systemd-random-seed.service.xml b/man/systemd-random-seed.service.xml -index 8cd14b7..e5cd037 100644 ---- a/man/systemd-random-seed.service.xml -+++ b/man/systemd-random-seed.service.xml -@@ -61,7 +61,7 @@ - for details. Saving/restoring the random seed across - boots increases the amount of available entropy early - at boot. On disk the random seed is stored in -- /var/lib/random-seed. -+ /var/lib/systemd/random-seed. - - - -diff --git a/units/systemd-backlight@.service.in b/units/systemd-backlight@.service.in -index b0e75db..5caa5d5 100644 ---- a/units/systemd-backlight@.service.in -+++ b/units/systemd-backlight@.service.in -@@ -9,7 +9,7 @@ - Description=Load/Save Screen Backlight Brightness of %I - Documentation=man:systemd-backlight@.service(8) - DefaultDependencies=no --RequiresMountsFor=/var/lib/backlight -+RequiresMountsFor=/var/lib/systemd/backlight - Conflicts=shutdown.target - After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-remount-fs.service - Before=sysinit.target shutdown.target --- -1.8.4 - diff --git a/abs/core/systemd/0001-fstab-generator-When-parsing-the-root-cmdline-option.patch b/abs/core/systemd/0001-fstab-generator-When-parsing-the-root-cmdline-option.patch deleted file mode 100644 index 3cdbcf0..0000000 --- a/abs/core/systemd/0001-fstab-generator-When-parsing-the-root-cmdline-option.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 7f5806d7095a197e4788a7803642831beec295bf Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Thomas=20B=C3=A4chler?= -Date: Mon, 30 Sep 2013 00:32:33 +0200 -Subject: [PATCH 1/7] fstab-generator: When parsing the root= cmdline option, - set FsckPassNo to 1 - -[tomegun: without this we would never fsck the rootfs if it was directly -mounted 'rw' from the initrd. We now risk fsck'ing it twice in the case it -is mounted 'ro', so that should be addressed in a separate patch.] ---- - src/fstab-generator/fstab-generator.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c -index 9e7d55d..a7536f8 100644 ---- a/src/fstab-generator/fstab-generator.c -+++ b/src/fstab-generator/fstab-generator.c -@@ -442,7 +442,7 @@ static int parse_new_root_from_proc_cmdline(void) { - } - - log_debug("Found entry what=%s where=/sysroot type=%s", what, type); -- r = add_mount(what, "/sysroot", type, opts, 0, noauto, nofail, false, -+ r = add_mount(what, "/sysroot", type, opts, 1, noauto, nofail, false, - SPECIAL_INITRD_ROOT_FS_TARGET, "/proc/cmdline"); - - return (r < 0) ? r : 0; --- -1.8.5.1 - diff --git a/abs/core/systemd/0001-login-Don-t-stop-a-running-user-manager-from-garbage.patch b/abs/core/systemd/0001-login-Don-t-stop-a-running-user-manager-from-garbage.patch deleted file mode 100644 index 9a92209..0000000 --- a/abs/core/systemd/0001-login-Don-t-stop-a-running-user-manager-from-garbage.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 95842c3f552072c9d153b3c0200f1bbb5bc3c2fb Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Thomas=20B=C3=A4chler?= -Date: Sun, 15 Dec 2013 12:18:00 +0100 -Subject: [PATCH] login: Don't stop a running user manager from - garbage-collecting the user. - -With the current logic, a user will never be garbage-collected, since its -manager will always be around. Change the logic such that a user is -garbage-collected when it has no sessions and linger is disabled. - -This is a backport from the master branch to 208 which also backports -the improved handling of running slice and service jobs. ---- - src/login/logind-user.c | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/src/login/logind-user.c b/src/login/logind-user.c -index adbe638..e2fce5c 100644 ---- a/src/login/logind-user.c -+++ b/src/login/logind-user.c -@@ -629,12 +629,6 @@ int user_check_gc(User *u, bool drop_not_started) { - if (u->slice_job || u->service_job) - return 1; - -- if (u->slice && manager_unit_is_active(u->manager, u->slice) != 0) -- return 1; -- -- if (u->service && manager_unit_is_active(u->manager, u->service) != 0) -- return 1; -- - return 0; - } - --- -1.8.5.1 - diff --git a/abs/core/systemd/0001-mount-check-for-NULL-before-reading-pm-what.patch b/abs/core/systemd/0001-mount-check-for-NULL-before-reading-pm-what.patch deleted file mode 100644 index 2725648..0000000 --- a/abs/core/systemd/0001-mount-check-for-NULL-before-reading-pm-what.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 9c03872bc8fb2a381eafe7301ef9811b641686dd Mon Sep 17 00:00:00 2001 -From: Dave Reisner -Date: Fri, 4 Oct 2013 18:22:40 -0400 -Subject: [PATCH] mount: check for NULL before reading pm->what - -Since a57f7e2c828b85, a mount unit with garbage in it would cause -systemd to crash on loading it. - -ref: https://bugs.freedesktop.org/show_bug.cgi?id=70148 ---- - src/core/mount.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/core/mount.c b/src/core/mount.c -index 93bfa99..db055f0 100644 ---- a/src/core/mount.c -+++ b/src/core/mount.c -@@ -182,7 +182,7 @@ static int mount_add_mount_links(Mount *m) { - * for the source path (if this is a bind mount) to be - * available. */ - pm = get_mount_parameters_fragment(m); -- if (pm && path_is_absolute(pm->what)) { -+ if (pm && pm->what && path_is_absolute(pm->what)) { - r = unit_require_mounts_for(UNIT(m), pm->what); - if (r < 0) - return r; --- -1.8.4.1 - diff --git a/abs/core/systemd/0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch b/abs/core/systemd/0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch deleted file mode 100644 index 8c8ea46..0000000 --- a/abs/core/systemd/0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 1d5989fd803d2019de0f6aaaf3cfb1cb2bbc3cdb Mon Sep 17 00:00:00 2001 -From: Dave Reisner -Date: Sun, 6 Oct 2013 18:26:23 -0400 -Subject: [PATCH] shared/util: fix off-by-one error in tag_to_udev_node - -Triggered false negatives when encoding a string which needed every -character to be escaped, e.g. "LABEL=/". ---- - src/shared/util.c | 2 +- - src/test/test-device-nodes.c | 4 +++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/shared/util.c b/src/shared/util.c -index 82f4221..31cea79 100644 ---- a/src/shared/util.c -+++ b/src/shared/util.c -@@ -3527,7 +3527,7 @@ static char *tag_to_udev_node(const char *tagvalue, const char *by) { - if (u == NULL) - return NULL; - -- enc_len = strlen(u) * 4; -+ enc_len = strlen(u) * 4 + 1; - t = new(char, enc_len); - if (t == NULL) - return NULL; -diff --git a/src/test/test-device-nodes.c b/src/test/test-device-nodes.c -index 2f3dedb..59ba4be 100644 ---- a/src/test/test-device-nodes.c -+++ b/src/test/test-device-nodes.c -@@ -26,7 +26,7 @@ - - /* helpers for test_encode_devnode_name */ - static char *do_encode_string(const char *in) { -- size_t out_len = strlen(in) * 4; -+ size_t out_len = strlen(in) * 4 + 1; - char *out = malloc(out_len); - - assert_se(out); -@@ -46,6 +46,8 @@ static void test_encode_devnode_name(void) { - assert_se(expect_encoded_as("pinkiepie", "pinkiepie")); - assert_se(expect_encoded_as("valíd\\ųtf8", "valíd\\x5cųtf8")); - assert_se(expect_encoded_as("s/ash/ng", "s\\x2fash\\x2fng")); -+ assert_se(expect_encoded_as("/", "\\x2f")); -+ assert_se(expect_encoded_as("!", "\\x21")); - } - - int main(int argc, char *argv[]) { --- -1.8.4.1 - diff --git a/abs/core/systemd/0002-fstab-generator-Generate-explicit-dependencies-on-sy.patch b/abs/core/systemd/0002-fstab-generator-Generate-explicit-dependencies-on-sy.patch deleted file mode 100644 index 57edf64..0000000 --- a/abs/core/systemd/0002-fstab-generator-Generate-explicit-dependencies-on-sy.patch +++ /dev/null @@ -1,102 +0,0 @@ -From 64e70e4b86d3f732d3513189312f6220d1d5cfbc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Thomas=20B=C3=A4chler?= -Date: Mon, 30 Sep 2013 01:34:44 +0200 -Subject: [PATCH 2/7] fstab-generator: Generate explicit dependencies on - systemd-fsck@.service instead of using FsckPassNo - -[tomegun: - * order all fsck instances after fsck-root - * check for OOM - * added notes in the manpages] ---- - man/systemd-fsck@.service.xml | 3 ++- - man/systemd-fstab-generator.xml | 5 +++++ - src/fstab-generator/fstab-generator.c | 21 +++++++++++++++++---- - units/systemd-fsck@.service.in | 2 +- - 4 files changed, 25 insertions(+), 6 deletions(-) - -diff --git a/man/systemd-fsck@.service.xml b/man/systemd-fsck@.service.xml -index e934352..17bd1c0 100644 ---- a/man/systemd-fsck@.service.xml -+++ b/man/systemd-fsck@.service.xml -@@ -62,7 +62,8 @@ - system - check. systemd-fsck-root.service is - responsible for file system checks on the root -- file system. -+ file system. The root file system check is performed -+ before the other file systems. - - systemd-fsck will - forward file system checking progress to the -diff --git a/man/systemd-fstab-generator.xml b/man/systemd-fstab-generator.xml -index 9ca16c7..740db8f 100644 ---- a/man/systemd-fstab-generator.xml -+++ b/man/systemd-fstab-generator.xml -@@ -61,6 +61,11 @@ - reloaded. This will instantiate mount and swap units - as necessary. - -+ The passno field -+ is treated like a simlpe boolean, and the ordering information -+ is discarded. However, the root filesystem is checked -+ before all the other filesystems. -+ - See - systemd.mount5 - and -diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c -index a7536f8..77247de 100644 ---- a/src/fstab-generator/fstab-generator.c -+++ b/src/fstab-generator/fstab-generator.c -@@ -209,17 +209,30 @@ static int add_mount( - "Before=%s\n", - post); - -+ if (passno > 0) { -+ _cleanup_free_ char *fsck = NULL; -+ -+ fsck = unit_name_from_path_instance("systemd-fsck", what, ".service"); -+ if (!fsck) -+ return log_oom(); -+ -+ fprintf(f, -+ "Requires=%s\n" -+ "After=%s\n", -+ fsck, -+ fsck); -+ } -+ -+ - fprintf(f, - "\n" - "[Mount]\n" - "What=%s\n" - "Where=%s\n" -- "Type=%s\n" -- "FsckPassNo=%i\n", -+ "Type=%s\n", - what, - where, -- type, -- passno); -+ type); - - if (!isempty(opts) && - !streq(opts, "defaults")) -diff --git a/units/systemd-fsck@.service.in b/units/systemd-fsck@.service.in -index e229cdc..c12efa8 100644 ---- a/units/systemd-fsck@.service.in -+++ b/units/systemd-fsck@.service.in -@@ -10,7 +10,7 @@ Description=File System Check on %f - Documentation=man:systemd-fsck@.service(8) - DefaultDependencies=no - BindsTo=%i.device --After=systemd-readahead-collect.service systemd-readahead-replay.service %i.device -+After=systemd-readahead-collect.service systemd-readahead-replay.service %i.device systemd-fsck-root.service - Before=shutdown.target - - [Service] --- -1.8.5.1 - diff --git a/abs/core/systemd/0003-gpt-auto-generator-Generate-explicit-dependencies-on.patch b/abs/core/systemd/0003-gpt-auto-generator-Generate-explicit-dependencies-on.patch deleted file mode 100644 index c1b3aa0..0000000 --- a/abs/core/systemd/0003-gpt-auto-generator-Generate-explicit-dependencies-on.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 4c8bda2442bfc6d84a5deb241dc29efcb81bf3af Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Thomas=20B=C3=A4chler?= -Date: Mon, 30 Sep 2013 01:34:45 +0200 -Subject: [PATCH 3/7] gpt-auto-generator: Generate explicit dependencies on - systemd-fsck@.service instead of using FsckPassNo - -[tomegun: check for OOM] ---- - src/gpt-auto-generator/gpt-auto-generator.c | 14 +++++++++----- - 1 file changed, 9 insertions(+), 5 deletions(-) - -diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c -index fae4b71..25440e7 100644 ---- a/src/gpt-auto-generator/gpt-auto-generator.c -+++ b/src/gpt-auto-generator/gpt-auto-generator.c -@@ -182,7 +182,7 @@ static int add_swap(const char *path, const char *fstype) { - } - - static int add_home(const char *path, const char *fstype) { -- _cleanup_free_ char *unit = NULL, *lnk = NULL; -+ _cleanup_free_ char *unit = NULL, *lnk = NULL, *fsck = NULL; - _cleanup_fclose_ FILE *f = NULL; - - if (dir_is_empty("/home") <= 0) -@@ -200,19 +200,23 @@ static int add_home(const char *path, const char *fstype) { - return -errno; - } - -+ fsck = unit_name_from_path_instance("systemd-fsck", path, ".service"); -+ if (!fsck) -+ return log_oom(); -+ - fprintf(f, - "# Automatically generated by systemd-gpt-auto-generator\n\n" - "[Unit]\n" - "DefaultDependencies=no\n" -- "After=" SPECIAL_LOCAL_FS_PRE_TARGET "\n" -+ "Requires=%s\n" -+ "After=" SPECIAL_LOCAL_FS_PRE_TARGET " %s\n" - "Conflicts=" SPECIAL_UMOUNT_TARGET "\n" - "Before=" SPECIAL_UMOUNT_TARGET " " SPECIAL_LOCAL_FS_TARGET "\n\n" - "[Mount]\n" - "What=%s\n" - "Where=/home\n" -- "Type=%s\n" -- "FsckPassNo=2\n", -- path, fstype); -+ "Type=%s\n", -+ fsck, fsck, path, fstype); - - fflush(f); - if (ferror(f)) { --- -1.8.5.1 - diff --git a/abs/core/systemd/0004-Remove-FsckPassNo-from-systemd-fsck-root.service.patch b/abs/core/systemd/0004-Remove-FsckPassNo-from-systemd-fsck-root.service.patch deleted file mode 100644 index 90ff545..0000000 --- a/abs/core/systemd/0004-Remove-FsckPassNo-from-systemd-fsck-root.service.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 4952a9beff339b75641a7a84c226c11d6bd680c4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Thomas=20B=C3=A4chler?= -Date: Mon, 30 Sep 2013 01:34:46 +0200 -Subject: [PATCH 4/7] Remove FsckPassNo from systemd-fsck-root.service - ---- - units/systemd-fsck-root.service.in | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/units/systemd-fsck-root.service.in b/units/systemd-fsck-root.service.in -index 4388314..4162983 100644 ---- a/units/systemd-fsck-root.service.in -+++ b/units/systemd-fsck-root.service.in -@@ -19,5 +19,4 @@ Type=oneshot - RemainAfterExit=yes - ExecStart=@rootlibexecdir@/systemd-fsck - StandardOutput=journal+console --FsckPassNo=1 - TimeoutSec=0 --- -1.8.5.1 - diff --git a/abs/core/systemd/0005-mount-service-drop-FsckPassNo-support.patch b/abs/core/systemd/0005-mount-service-drop-FsckPassNo-support.patch deleted file mode 100644 index 9758c46..0000000 --- a/abs/core/systemd/0005-mount-service-drop-FsckPassNo-support.patch +++ /dev/null @@ -1,364 +0,0 @@ -From accdd018ede77ef1c057775396c18c73406cbcb4 Mon Sep 17 00:00:00 2001 -From: Tom Gundersen -Date: Sat, 5 Oct 2013 17:28:09 +0200 -Subject: [PATCH 5/7] mount/service: drop FsckPassNo support - -We now treat passno as boleans in the generators, and don't need this any more. fsck itself -is able to sequentialize checks on the same local media, so in the common case the ordering -is redundant. - -It is still possible to force an order by using .d fragments, in case that is desired. ---- - TODO | 4 --- - man/systemd.mount.xml | 22 --------------- - man/systemd.service.xml | 27 ------------------- - src/core/load-fragment-gperf.gperf.m4 | 2 -- - src/core/load-fragment.c | 30 --------------------- - src/core/load-fragment.h | 1 - - src/core/mount.c | 32 +--------------------- - src/core/mount.h | 1 - - src/core/service.c | 51 ----------------------------------- - src/core/service.h | 2 -- - 10 files changed, 1 insertion(+), 171 deletions(-) - -diff --git a/TODO b/TODO -index 29a76ef..f0060d9 100644 ---- a/TODO -+++ b/TODO -@@ -84,8 +84,6 @@ Features: - - * ensure scope units may be started only a single time - --* document that in instead of FsckPassNo= people should just add a manual dep to systemd-fsck@.service to their mount units. -- - * better error message if you run systemctl without systemd running - - * systemctl status output should should include list of triggering units and their status -@@ -562,8 +560,6 @@ Features: - - * when breaking cycles drop sysv services first, then services from /run, then from /etc, then from /usr - --* move passno parsing to fstab generator -- - * automount: implement expire: - - set superblock timeout AUTOFS_DEV_IOCTL_TIMEOUT_CMD - - periodically run AUTOFS_DEV_IOCTL_EXPIRE_CMD -diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml -index 48af1ca..217289a 100644 ---- a/man/systemd.mount.xml -+++ b/man/systemd.mount.xml -@@ -273,28 +273,6 @@ - - - -- Compatibility Options -- -- The following option is also available in the -- [Mount] section, but exists purely -- for compatibility reasons and should not be used in -- newly written mount files. -- -- -- -- FsckPassNo= -- -- The pass number for -- the file system checking service for -- this mount. See -- systemd.service5 -- for more information on this setting. -- -- -- -- -- -- - See Also - - systemd1, -diff --git a/man/systemd.service.xml b/man/systemd.service.xml -index 81a4078..b1e3af2 100644 ---- a/man/systemd.service.xml -+++ b/man/systemd.service.xml -@@ -970,33 +970,6 @@ - range 0-99. - - -- -- FsckPassNo= -- Set the fsck passno -- priority to use to order this service -- in relation to other file system -- checking services. This option is only -- necessary to fix ordering in relation -- to fsck jobs automatically created for -- all /etc/fstab -- entries with a value in the fs_passno -- column > 0. As such it should only be -- used as option for fsck -- services. Almost always it is a better -- choice to add explicit ordering -- directives via -- After= or -- Before=, -- instead. For more details see -- systemd.unit5. If -- used, pass an integer value in the -- same range as -- /etc/fstab's -- fs_passno column. See -- fstab5 -- for details. -- -- - - - -diff --git a/src/core/load-fragment-gperf.gperf.m4 b/src/core/load-fragment-gperf.gperf.m4 -index 31fb7bc..e3025d2 100644 ---- a/src/core/load-fragment-gperf.gperf.m4 -+++ b/src/core/load-fragment-gperf.gperf.m4 -@@ -173,7 +173,6 @@ Service.NonBlocking, config_parse_bool, 0, - Service.BusName, config_parse_unit_string_printf, 0, offsetof(Service, bus_name) - Service.NotifyAccess, config_parse_notify_access, 0, offsetof(Service, notify_access) - Service.Sockets, config_parse_service_sockets, 0, 0 --Service.FsckPassNo, config_parse_fsck_passno, 0, offsetof(Service, fsck_passno) - EXEC_CONTEXT_CONFIG_ITEMS(Service)m4_dnl - CGROUP_CONTEXT_CONFIG_ITEMS(Service)m4_dnl - KILL_CONTEXT_CONFIG_ITEMS(Service)m4_dnl -@@ -225,7 +224,6 @@ Mount.What, config_parse_string, 0, - Mount.Where, config_parse_path, 0, offsetof(Mount, where) - Mount.Options, config_parse_string, 0, offsetof(Mount, parameters_fragment.options) - Mount.Type, config_parse_string, 0, offsetof(Mount, parameters_fragment.fstype) --Mount.FsckPassNo, config_parse_fsck_passno, 0, offsetof(Mount, parameters_fragment.passno) - Mount.TimeoutSec, config_parse_sec, 0, offsetof(Mount, timeout_usec) - Mount.DirectoryMode, config_parse_mode, 0, offsetof(Mount, directory_mode) - EXEC_CONTEXT_CONFIG_ITEMS(Mount)m4_dnl -diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c -index fb7efca..4067930 100644 ---- a/src/core/load-fragment.c -+++ b/src/core/load-fragment.c -@@ -1033,35 +1033,6 @@ int config_parse_sysv_priority(const char *unit, - } - #endif - --int config_parse_fsck_passno(const char *unit, -- const char *filename, -- unsigned line, -- const char *section, -- const char *lvalue, -- int ltype, -- const char *rvalue, -- void *data, -- void *userdata) { -- -- int *passno = data; -- int i, r; -- -- assert(filename); -- assert(lvalue); -- assert(rvalue); -- assert(data); -- -- r = safe_atoi(rvalue, &i); -- if (r || i < 0) { -- log_syntax(unit, LOG_ERR, filename, line, -r, -- "Failed to parse fsck pass number, ignoring: %s", rvalue); -- return 0; -- } -- -- *passno = (int) i; -- return 0; --} -- - DEFINE_CONFIG_PARSE_ENUM(config_parse_kill_mode, kill_mode, KillMode, "Failed to parse kill mode"); - - int config_parse_kill_signal(const char *unit, -@@ -2708,7 +2679,6 @@ void unit_dump_config_items(FILE *f) { - { config_parse_start_limit_action, "ACTION" }, - { config_parse_set_status, "STATUS" }, - { config_parse_service_sockets, "SOCKETS" }, -- { config_parse_fsck_passno, "PASSNO" }, - { config_parse_environ, "ENVIRON" }, - { config_parse_syscall_filter, "SYSCALL" }, - { config_parse_cpu_shares, "SHARES" }, -diff --git a/src/core/load-fragment.h b/src/core/load-fragment.h -index 90e5e3a..404df76 100644 ---- a/src/core/load-fragment.h -+++ b/src/core/load-fragment.h -@@ -56,7 +56,6 @@ int config_parse_exec_secure_bits(const char *unit, const char *filename, unsign - int config_parse_bounding_set(const char *unit, const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); - int config_parse_limit(const char *unit, const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); - int config_parse_sysv_priority(const char *unit, const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); --int config_parse_fsck_passno(const char *unit, const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); - int config_parse_kill_signal(const char *unit, const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); - int config_parse_exec_mount_flags(const char *unit, const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); - int config_parse_timer(const char *unit, const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); -diff --git a/src/core/mount.c b/src/core/mount.c -index 70cd372..88563b3 100644 ---- a/src/core/mount.c -+++ b/src/core/mount.c -@@ -313,33 +313,6 @@ static int mount_add_device_links(Mount *m) { - if (r < 0) - return r; - -- if (p->passno > 0 && -- UNIT(m)->manager->running_as == SYSTEMD_SYSTEM) { -- char *name; -- Unit *fsck; -- /* Let's add in the fsck service */ -- -- /* aka SPECIAL_FSCK_SERVICE */ -- name = unit_name_from_path_instance("systemd-fsck", p->what, ".service"); -- if (!name) -- return -ENOMEM; -- -- r = manager_load_unit_prepare(UNIT(m)->manager, name, NULL, NULL, &fsck); -- if (r < 0) { -- log_warning_unit(name, -- "Failed to prepare unit %s: %s", name, strerror(-r)); -- free(name); -- return r; -- } -- free(name); -- -- SERVICE(fsck)->fsck_passno = p->passno; -- -- r = unit_add_two_dependencies(UNIT(m), UNIT_AFTER, UNIT_REQUIRES, fsck, true); -- if (r < 0) -- return r; -- } -- - return 0; - } - -@@ -1410,7 +1383,6 @@ static int mount_add_one( - const char *where, - const char *options, - const char *fstype, -- int passno, - bool set_flags) { - int r; - Unit *u; -@@ -1530,8 +1502,6 @@ static int mount_add_one( - free(p->fstype); - p->fstype = f; - -- p->passno = passno; -- - if (load_extras) { - r = mount_add_extras(MOUNT(u)); - if (r < 0) -@@ -1601,7 +1571,7 @@ static int mount_load_proc_self_mountinfo(Manager *m, bool set_flags) { - if (!d || !p) - return log_oom(); - -- k = mount_add_one(m, d, p, o, fstype, 0, set_flags); -+ k = mount_add_one(m, d, p, o, fstype, set_flags); - if (k < 0) - r = k; - } -diff --git a/src/core/mount.h b/src/core/mount.h -index 7cd4320..a955069 100644 ---- a/src/core/mount.h -+++ b/src/core/mount.h -@@ -58,7 +58,6 @@ typedef struct MountParameters { - char *what; - char *options; - char *fstype; -- int passno; - } MountParameters; - - typedef enum MountResult { -diff --git a/src/core/service.c b/src/core/service.c -index 96ed2d3..ce75757 100644 ---- a/src/core/service.c -+++ b/src/core/service.c -@@ -1056,48 +1056,6 @@ static int service_load_sysv(Service *s) { - } - #endif - --static int fsck_fix_order(Service *s) { -- Unit *other; -- int r; -- -- assert(s); -- -- if (s->fsck_passno <= 0) -- return 0; -- -- /* For each pair of services where both have an fsck priority -- * we order things based on it. */ -- -- LIST_FOREACH(units_by_type, other, UNIT(s)->manager->units_by_type[UNIT_SERVICE]) { -- Service *t; -- UnitDependency d; -- -- t = SERVICE(other); -- -- if (s == t) -- continue; -- -- if (UNIT(t)->load_state != UNIT_LOADED) -- continue; -- -- if (t->fsck_passno <= 0) -- continue; -- -- if (t->fsck_passno < s->fsck_passno) -- d = UNIT_AFTER; -- else if (t->fsck_passno > s->fsck_passno) -- d = UNIT_BEFORE; -- else -- continue; -- -- r = unit_add_dependency(UNIT(s), d, UNIT(t), true); -- if (r < 0) -- return r; -- } -- -- return 0; --} -- - static int service_verify(Service *s) { - assert(s); - -@@ -1254,10 +1212,6 @@ static int service_load(Unit *u) { - return r; - #endif - -- r = fsck_fix_order(s); -- if (r < 0) -- return r; -- - if (s->bus_name) - if ((r = unit_watch_bus_name(u, s->bus_name)) < 0) - return r; -@@ -1381,11 +1335,6 @@ static void service_dump(Unit *u, FILE *f, const char *prefix) { - prefix, s->sysv_runlevels); - #endif - -- if (s->fsck_passno > 0) -- fprintf(f, -- "%sFsckPassNo: %i\n", -- prefix, s->fsck_passno); -- - if (s->status_text) - fprintf(f, "%sStatus Text: %s\n", - prefix, s->status_text); -diff --git a/src/core/service.h b/src/core/service.h -index ce5b5e0..37fa6ff 100644 ---- a/src/core/service.h -+++ b/src/core/service.h -@@ -157,8 +157,6 @@ struct Service { - pid_t main_pid, control_pid; - int socket_fd; - -- int fsck_passno; -- - bool permissions_start_only; - bool root_directory_start_only; - bool remain_after_exit; --- -1.8.5.1 - diff --git a/abs/core/systemd/0006-efi-boot-generator-hookup-to-fsck.patch b/abs/core/systemd/0006-efi-boot-generator-hookup-to-fsck.patch deleted file mode 100644 index 3830ecf..0000000 --- a/abs/core/systemd/0006-efi-boot-generator-hookup-to-fsck.patch +++ /dev/null @@ -1,81 +0,0 @@ -From d09ee17da21b7ca2259067ac4e54f8a1cc3c0fc0 Mon Sep 17 00:00:00 2001 -From: Tom Gundersen -Date: Sat, 5 Oct 2013 17:32:21 +0200 -Subject: [PATCH 6/7] efi-boot-generator: hookup to fsck - ---- - TODO | 1 - - src/efi-boot-generator/efi-boot-generator.c | 26 ++++++++++++++++++++++---- - 2 files changed, 22 insertions(+), 5 deletions(-) - -diff --git a/TODO b/TODO -index f0060d9..814d82d 100644 ---- a/TODO -+++ b/TODO -@@ -308,7 +308,6 @@ Features: - * introduce ExecCondition= in services - - * EFI: -- - fsck hookup for the ESP mount is missing - - write man page for efi boot generator - - honor language efi variables for default language selection (if there are any?) - - honor timezone efi variables for default timezone selection (if there are any?) -diff --git a/src/efi-boot-generator/efi-boot-generator.c b/src/efi-boot-generator/efi-boot-generator.c -index 05b95ed..e20d325 100644 ---- a/src/efi-boot-generator/efi-boot-generator.c -+++ b/src/efi-boot-generator/efi-boot-generator.c -@@ -26,13 +26,14 @@ - #include "path-util.h" - #include "util.h" - #include "mkdir.h" -+#include "unit-name.h" - - static const char *arg_dest = "/tmp"; - - int main(int argc, char *argv[]) { - int r = EXIT_SUCCESS; - sd_id128_t id; -- _cleanup_free_ char *name = NULL; -+ _cleanup_free_ char *name = NULL, *what = NULL, *fsck = NULL; - _cleanup_fclose_ FILE *f = NULL; - - if (argc > 1 && argc != 4) { -@@ -75,15 +76,32 @@ int main(int argc, char *argv[]) { - return EXIT_FAILURE; - } - -+ r = asprintf(&what, -+ "/dev/disk/by-partuuid/%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x", -+ SD_ID128_FORMAT_VAL(id)); -+ if (r < 0) { -+ log_oom(); -+ return EXIT_FAILURE; -+ } -+ -+ fsck = unit_name_from_path_instance("systemd-fsck", what, ".service"); -+ if (!fsck) { -+ log_oom(); -+ return EXIT_FAILURE; -+ } -+ - fprintf(f, - "# Automatially generated by systemd-efi-boot-generator\n\n" - "[Unit]\n" -- "Description=EFI System Partition\n\n" -+ "Description=EFI System Partition\n" -+ "Requires=%s\n" -+ "After=%s\n" -+ "\n" - "[Mount]\n" - "Where=/boot\n" -- "What=/dev/disk/by-partuuid/%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x\n" -+ "What=%s\n" - "Options=umask=0077\n", -- SD_ID128_FORMAT_VAL(id)); -+ fsck, fsck, what); - - free(name); - name = strjoin(arg_dest, "/boot.automount", NULL); --- -1.8.5.1 - diff --git a/abs/core/systemd/0007-fsck-root-only-run-when-requested-in-fstab.patch b/abs/core/systemd/0007-fsck-root-only-run-when-requested-in-fstab.patch deleted file mode 100644 index 112b5b5..0000000 --- a/abs/core/systemd/0007-fsck-root-only-run-when-requested-in-fstab.patch +++ /dev/null @@ -1,95 +0,0 @@ -From a7623afb7a48ab1d7b5b24fbd5f1033acfb2301c Mon Sep 17 00:00:00 2001 -From: Tom Gundersen -Date: Sat, 19 Oct 2013 11:38:42 +0200 -Subject: [PATCH 7/7] fsck-root: only run when requested in fstab - -fsck-root is redundant in case an initrd is used, or in case the rootfs -is never remounted 'rw', so the new default is the correct behavior for -most users. For the rest, they should enable it in fstab. ---- - Makefile.am | 1 - - man/systemd-fsck@.service.xml | 4 +++- - src/fstab-generator/fstab-generator.c | 31 ++++++++++++++++++++++--------- - 3 files changed, 25 insertions(+), 11 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index ca01179..a29a32a 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -4447,7 +4447,6 @@ SYSINIT_TARGET_WANTS += \ - systemd-update-utmp.service - LOCAL_FS_TARGET_WANTS += \ - systemd-remount-fs.service \ -- systemd-fsck-root.service \ - tmp.mount - MULTI_USER_TARGET_WANTS += \ - getty.target \ -diff --git a/man/systemd-fsck@.service.xml b/man/systemd-fsck@.service.xml -index 17bd1c0..811392b 100644 ---- a/man/systemd-fsck@.service.xml -+++ b/man/systemd-fsck@.service.xml -@@ -63,7 +63,9 @@ - check. systemd-fsck-root.service is - responsible for file system checks on the root - file system. The root file system check is performed -- before the other file systems. -+ before the other file systems. Either service is enabled -+ at boot if passno in /etc/fstab for -+ the filesystem is set to a value greater than zero. - - systemd-fsck will - forward file system checking progress to the -diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c -index 77247de..78d7609 100644 ---- a/src/fstab-generator/fstab-generator.c -+++ b/src/fstab-generator/fstab-generator.c -@@ -210,17 +210,29 @@ static int add_mount( - post); - - if (passno > 0) { -- _cleanup_free_ char *fsck = NULL; -+ if (streq(where, "/")) { -+ lnk = strjoin(arg_dest, "/", SPECIAL_LOCAL_FS_TARGET, ".wants/", "systemd-fsck-root.service", NULL); -+ if (!lnk) -+ return log_oom(); - -- fsck = unit_name_from_path_instance("systemd-fsck", what, ".service"); -- if (!fsck) -- return log_oom(); -+ mkdir_parents_label(lnk, 0755); -+ if (symlink("systemd-fsck-root.service", lnk) < 0) { -+ log_error("Failed to create symlink %s: %m", lnk); -+ return -errno; -+ } -+ } else { -+ _cleanup_free_ char *fsck = NULL; - -- fprintf(f, -- "Requires=%s\n" -- "After=%s\n", -- fsck, -- fsck); -+ fsck = unit_name_from_path_instance("systemd-fsck", what, ".service"); -+ if (!fsck) -+ return log_oom(); -+ -+ fprintf(f, -+ "Requires=%s\n" -+ "After=%s\n", -+ fsck, -+ fsck); -+ } - } - - -@@ -248,6 +260,7 @@ static int add_mount( - - if (!noauto) { - if (post) { -+ free(lnk); - lnk = strjoin(arg_dest, "/", post, nofail || automount ? ".wants/" : ".requires/", name, NULL); - if (!lnk) - return log_oom(); --- -1.8.5.1 - diff --git a/abs/core/systemd/PKGBUILD b/abs/core/systemd/PKGBUILD old mode 100755 new mode 100644 index 59b0955..6e4bc37 --- a/abs/core/systemd/PKGBUILD +++ b/abs/core/systemd/PKGBUILD @@ -2,149 +2,163 @@ # Maintainer: Tom Gundersen pkgbase=systemd -pkgname=('systemd' 'systemd-sysvcompat') -pkgver=208 -pkgrel=6 +pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat') +pkgver=224 +pkgrel=1 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" -makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf' - 'gtk-doc' 'intltool' 'kmod' 'libcap' 'libgcrypt' 'libmicrohttpd' 'libxslt' - 'linux-api-headers' 'pam' 'python2' 'quota-tools' 'xz') +makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' + 'intltool' 'iptables' 'kmod' 'libcap' 'libidn' 'libgcrypt' + 'libmicrohttpd' 'libxslt' 'util-linux' 'linux-api-headers' + 'python2-lxml' 'quota-tools' 'shadow' 'gnu-efi-libs' 'git') options=('strip' 'debug') -source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" +source=("git://github.com/systemd/systemd.git#tag=v$pkgver" 'initcpio-hook-udev' 'initcpio-install-systemd' 'initcpio-install-udev' - '0001-fix-lingering-references-to-var-lib-backlight-random.patch' - '0001-mount-check-for-NULL-before-reading-pm-what.patch' - '0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch' - '0001-login-Don-t-stop-a-running-user-manager-from-garbage.patch' - '0001-fstab-generator-When-parsing-the-root-cmdline-option.patch' - '0002-fstab-generator-Generate-explicit-dependencies-on-sy.patch' - '0003-gpt-auto-generator-Generate-explicit-dependencies-on.patch' - '0004-Remove-FsckPassNo-from-systemd-fsck-root.service.patch' - '0005-mount-service-drop-FsckPassNo-support.patch' - '0006-efi-boot-generator-hookup-to-fsck.patch' - '0007-fsck-root-only-run-when-requested-in-fstab.patch') + 'arch.conf' + 'loader.conf' + 'splash-arch.bmp') +md5sums=('SKIP' + '90ea67a7bb237502094914622a39e281' + '976c5511b6493715e381f43f16cdb151' + '1b3aa3a0551b08af9305d33f85b5c2fc' + '20ead378f5d6df4b2a3e670301510a7d' + 'ddaef54f68f6c86c6c07835fc668f62a' + '1e2f9a8b0fa32022bf0a8f39123e5f4e') prepare() { - cd "$pkgname-$pkgver" - patch -Np1 < "$srcdir"/0001-fix-lingering-references-to-var-lib-backlight-random.patch - patch -Np1 < "$srcdir"/0001-mount-check-for-NULL-before-reading-pm-what.patch - patch -Np1 < "$srcdir"/0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch - # Fix lingering user managers - patch -Np1 < "$srcdir"/0001-login-Don-t-stop-a-running-user-manager-from-garbage.patch - # Backport changes in fstab passno handling - # Basically, we only need 0001 and 0007, but 0007 is based on earlier patches, - # and it doesn't hurt to backport them all. - patch -Np1 < "$srcdir"/0001-fstab-generator-When-parsing-the-root-cmdline-option.patch - patch -Np1 < "$srcdir"/0002-fstab-generator-Generate-explicit-dependencies-on-sy.patch - patch -Np1 < "$srcdir"/0003-gpt-auto-generator-Generate-explicit-dependencies-on.patch - patch -Np1 < "$srcdir"/0004-Remove-FsckPassNo-from-systemd-fsck-root.service.patch - patch -Np1 < "$srcdir"/0005-mount-service-drop-FsckPassNo-support.patch - patch -Np1 < "$srcdir"/0006-efi-boot-generator-hookup-to-fsck.patch - patch -Np1 < "$srcdir"/0007-fsck-root-only-run-when-requested-in-fstab.patch - - autoreconf + cd "$pkgname" + + # networkd: fix neworkd crash + # https://github.com/systemd/systemd/commit/49f6e11e89b4 + git cherry-pick -n 49f6e11e89b4 + + ./autogen.sh } build() { - cd "$pkgname-$pkgver" + cd "$pkgname" + + local timeservers=({0..3}.arch.pool.ntp.org) ./configure \ --libexecdir=/usr/lib \ --localstatedir=/var \ --sysconfdir=/etc \ - --enable-introspection \ - --enable-gtk-doc \ + --enable-lz4 \ + --enable-compat-libs \ + --enable-gnuefi \ --disable-audit \ --disable-ima \ + --disable-kdbus \ --with-sysvinit-path= \ --with-sysvrcnd-path= \ - --with-firmware-path="/usr/lib/firmware/updates:/usr/lib/firmware" + --with-ntp-servers="${timeservers[*]}" make } -check() { - make -C "$pkgname-$pkgver" check || : -} - package_systemd() { pkgdesc="system and service manager" - license=('GPL2' 'LGPL2.1' 'MIT') - depends=('acl' 'bash' 'dbus-core' 'glib2' 'kbd' 'kmod' 'hwids' 'libcap' 'libgcrypt' - 'pam' 'util-linux' 'xz') - provides=("libsystemd=$pkgver" 'nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver" - 'libgudev-1.0.so' 'libsystemd-daemon.so' 'libsystemd-id128.so' - 'libsystemd-journal.so' 'libsystemd-login.so' 'libudev.so') - replaces=('libsystemd' 'nss-myhostname' 'systemd-tools' 'udev') - conflicts=('libsystemd' 'nss-myhostname' 'systemd-tools' 'udev') + license=('GPL2' 'LGPL2.1') + depends=('acl' 'bash' 'dbus' 'iptables' 'kbd' 'kmod' 'hwids' 'libcap' + 'libgcrypt' 'libsystemd' 'libidn' 'lz4' 'pam' 'libseccomp' 'util-linux' + 'xz') + provides=('nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver") + replaces=('nss-myhostname' 'systemd-tools' 'udev') + conflicts=('nss-myhostname' 'systemd-tools' 'udev') optdepends=('cryptsetup: required for encrypted block devices' - 'libmicrohttpd: systemd-journal-gatewayd' + 'libmicrohttpd: remote journald capabilities' 'quota-tools: kernel-level quota management' - 'python2: systemd library bindings' - 'systemd-sysvcompat: symlink package to provide sysvinit binaries') + 'systemd-sysvcompat: symlink package to provide sysvinit binaries' + 'polkit: allow administration as unprivileged user') backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf etc/dbus-1/system.d/org.freedesktop.hostname1.conf etc/dbus-1/system.d/org.freedesktop.login1.conf etc/dbus-1/system.d/org.freedesktop.locale1.conf etc/dbus-1/system.d/org.freedesktop.machine1.conf etc/dbus-1/system.d/org.freedesktop.timedate1.conf + etc/dbus-1/system.d/org.freedesktop.import1.conf + etc/dbus-1/system.d/org.freedesktop.network1.conf etc/pam.d/systemd-user etc/systemd/bootchart.conf + etc/systemd/coredump.conf etc/systemd/journald.conf + etc/systemd/journal-remote.conf + etc/systemd/journal-upload.conf etc/systemd/logind.conf etc/systemd/system.conf + etc/systemd/timesyncd.conf + etc/systemd/resolved.conf etc/systemd/user.conf etc/udev/udev.conf) install="systemd.install" - make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install - - printf "d /run/console 0755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf" - - # fix .so links in manpage stubs - find "$pkgdir/usr/share/man" -type f -name '*.[[:digit:]]' \ - -exec sed -ri '1s|^\.so (.*)\.([0-9]+)|.so man\2/\1.\2|' {} + + make -C "$pkgname" DESTDIR="$pkgdir" install - # don't write units to /etc by default -- we'll enable this on post_install - # as a sane default - rm "$pkgdir/etc/systemd/system/getty.target.wants/getty@tty1.service" - rmdir "$pkgdir/etc/systemd/system/getty.target.wants" + # don't write units to /etc by default. some of these will be re-enabled on + # post_install. + rm -r "$pkgdir/etc/systemd/system/"*.wants # get rid of RPM macros rm -r "$pkgdir/usr/lib/rpm" # add back tmpfiles.d/legacy.conf - install -m644 "systemd-$pkgver/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d" + install -m644 "$pkgname/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d" # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group sed -i 's#GROUP="dialout"#GROUP="uucp"#g; s#GROUP="tape"#GROUP="storage"#g; s#GROUP="cdrom"#GROUP="optical"#g' "$pkgdir"/usr/lib/udev/rules.d/*.rules + sed -i 's/dialout/uucp/g; + s/tape/storage/g; + s/cdrom/optical/g' "$pkgdir"/usr/lib/sysusers.d/basic.conf # add mkinitcpio hooks install -Dm644 "$srcdir/initcpio-install-systemd" "$pkgdir/usr/lib/initcpio/install/systemd" install -Dm644 "$srcdir/initcpio-install-udev" "$pkgdir/usr/lib/initcpio/install/udev" install -Dm644 "$srcdir/initcpio-hook-udev" "$pkgdir/usr/lib/initcpio/hooks/udev" - # ensure proper permissions for /var/log/journal + # ensure proper permissions for /var/log/journal. This is only to placate chown root:systemd-journal "$pkgdir/var/log/journal" chmod 2755 "$pkgdir/var/log/journal" + # we'll create this on installation + #rmdir "$pkgdir/var/log/journal/remote" + # fix pam file sed 's|system-auth|system-login|g' -i "$pkgdir/etc/pam.d/systemd-user" + # ship default policy to leave services disabled + echo 'disable *' >"$pkgdir"/usr/lib/systemd/system-preset/99-default.preset + ### split out manpages for sysvcompat rm -rf "$srcdir/_sysvcompat" install -dm755 "$srcdir"/_sysvcompat/usr/share/man/man8/ mv "$pkgdir"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \ "$srcdir"/_sysvcompat/usr/share/man/man8 - # include MIT license, since it's technically custom - install -Dm644 "$srcdir/$pkgname-$pkgver/LICENSE.MIT" \ - "$pkgdir/usr/share/licenses/systemd/LICENSE.MIT" + ### split off runtime libraries + rm -rf "$srcdir/_libsystemd" + install -dm755 "$srcdir"/_libsystemd/usr/lib + cd "$srcdir"/_libsystemd + mv "$pkgdir"/usr/lib/lib{systemd,udev}*.so* usr/lib + + # add example bootctl configuration + install -Dm644 "$srcdir/arch.conf" "$pkgdir"/usr/share/systemd/bootctl/arch.conf + install -Dm644 "$srcdir/loader.conf" "$pkgdir"/usr/share/systemd/bootctl/loader.conf + install -Dm644 "$srcdir/splash-arch.bmp" "$pkgdir"/usr/share/systemd/bootctl/splash-arch.bmp +} + +package_libsystemd() { + pkgdesc="systemd client libraries" + depends=('glibc' 'libgcrypt' 'lz4' 'xz') + license=('GPL2') + provides=('libsystemd.so' 'libsystemd-daemon.so' 'libsystemd-id128.so' + 'libsystemd-journal.so' 'libsystemd-login.so' 'libudev.so') + + mv "$srcdir/_libsystemd"/* "$pkgdir" } package_systemd-sysvcompat() { @@ -166,18 +180,3 @@ package_systemd-sysvcompat() { } # vim: ft=sh syn=sh et -md5sums=('df64550d92afbffb4f67a434193ee165' - '29245f7a240bfba66e2b1783b63b6b40' - '8b68b0218a3897d4d37a6ccf47914774' - 'bde43090d4ac0ef048e3eaee8202a407' - '1b191c4e7a209d322675fd199e3abc66' - 'a693bef63548163ffc165f4c4801ebf7' - 'ccafe716d87df9c42af0d1960b5a4105' - '441e3d464ee6af5fe4af6a8bc10d7980' - '718d841203cf2ea9e24a7d0f1d19d48b' - '623c77bad0d2968e44963d72924825f1' - 'e52fc8368853c7800ab03ab8868cfd41' - '2096f33bd36dfa0a7f0431d0a429787a' - 'd2481a6ea199b581e243a950125b0ca6' - 'c2aee634a3a6c50778968f0d5c756f40' - 'ef8b8212d504bb73c10bf4e85f0703b2') diff --git a/abs/core/systemd/__changelog b/abs/core/systemd/__changelog new file mode 100644 index 0000000..841eee3 --- /dev/null +++ b/abs/core/systemd/__changelog @@ -0,0 +1,4 @@ +PKGBUILD: change dep python-lxml to python2-lxml +PKGBUILD: comment out rmdir "$pkgdir/var/log/journal/remote" +PKGBUILD: Change for tool in runlevel reboot shutdown poweroff halt telinit; do + to for tool in runlevel telinit; do diff --git a/abs/core/systemd/arch.conf b/abs/core/systemd/arch.conf new file mode 100644 index 0000000..250b778 --- /dev/null +++ b/abs/core/systemd/arch.conf @@ -0,0 +1,7 @@ +## This is just an example config file. +## Please edit the paths and kernel parameters according to your system. + +title Arch Linux +linux /vmlinuz-linux +initrd /initramfs-linux.img +options root=PARTUUID=XXXX rootfstype=XXXX add_efi_memmap diff --git a/abs/core/systemd/initcpio-hook-udev b/abs/core/systemd/initcpio-hook-udev index 0bc32e0..ea9a11f 100644 --- a/abs/core/systemd/initcpio-hook-udev +++ b/abs/core/systemd/initcpio-hook-udev @@ -2,7 +2,7 @@ run_earlyhook() { kmod static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf - systemd-tmpfiles --prefix=/dev --create + systemd-tmpfiles --prefix=/dev --create --boot /usr/lib/systemd/systemd-udevd --daemon --resolve-names=never udevd_running=1 } diff --git a/abs/core/systemd/initcpio-install-systemd b/abs/core/systemd/initcpio-install-systemd index 2c59074..96df98a 100644 --- a/abs/core/systemd/initcpio-install-systemd +++ b/abs/core/systemd/initcpio-install-systemd @@ -4,7 +4,7 @@ strip_quotes() { local len=${#1} quotes=$'[\'"]' str=${!1} if [[ ${str:0:1} = ${str: -1} && ${str:0:1} = $quotes ]]; then - declare -g "$1=${str:1:-1}" + printf -v "$1" %s "${str:1:-1}" fi } @@ -34,6 +34,7 @@ add_udev_rule() { strip_quotes 'value' # just take the first word as the binary name binary=${value%% *} + [[ ${binary:0:1} == '$' ]] && continue if [[ ${binary:0:1} != '/' ]]; then binary=$(PATH=/usr/lib/udev:/lib/udev type -P "$binary") fi @@ -98,13 +99,16 @@ build() { # from base add_binary /bin/mount add_binary /usr/bin/kmod /usr/bin/modprobe - - # systemd add_binary /usr/lib/systemd/systemd /init - add_binary /usr/bin/systemd-tmpfiles - # generate sysroot.mount and sysroot-usr.mount - add_file "/usr/lib/systemd/system-generators/systemd-fstab-generator" + map add_binary \ + /usr/bin/systemd-tmpfiles \ + /usr/lib/systemd/systemd-hibernate-resume \ + /usr/lib/systemd/system-generators/systemd-fstab-generator \ + /usr/lib/systemd/system-generators/systemd-gpt-auto-generator \ + /usr/lib/systemd/system-generators/systemd-hibernate-resume-generator + + add_module "kdbus?" # udev rules and systemd units map add_udev_rule "$rules" \ @@ -112,10 +116,9 @@ build() { 60-persistent-storage.rules \ 64-btrfs.rules \ 80-drivers.rules \ - 99-systemd.rules \ + 99-systemd.rules map add_systemd_unit \ - ctrl-alt-del.target \ initrd-cleanup.service \ initrd-fs.target \ initrd-parse-etc.service \ @@ -125,24 +128,32 @@ build() { initrd-udevadm-cleanup-db.service \ initrd.target \ kmod-static-nodes.service \ + local-fs.target \ + local-fs-pre.target \ + paths.target \ + reboot.target \ + slices.target \ sockets.target \ + swap.target \ systemd-fsck@.service \ + systemd-hibernate-resume@.service \ systemd-journald.service \ + systemd-journald-audit.socket \ + systemd-journald-dev-log.socket \ systemd-tmpfiles-setup-dev.service \ systemd-udev-trigger.service \ systemd-udevd-control.socket \ systemd-udevd-kernel.socket \ - systemd-udevd.service + systemd-udevd.service \ + timers.target add_symlink "/usr/lib/systemd/system/default.target" "initrd.target" + add_symlink "/usr/lib/systemd/system/ctrl-alt-del.target" "reboot.target" - # libdbus needs the passwd info of the root user - # TODO: make sure this is no longer necessary when systemctl moves to sd-bus + # udev wants /etc/group since it doesn't launch with --resolve-names=never add_file "/etc/nsswitch.conf" - add_file "/etc/passwd" add_binary "$(readlink -f /usr/lib/libnss_files.so)" - - # udev wants /etc/group since it doesn't launch with --resolve-names=never + add_file "/etc/passwd" add_file "/etc/group" } diff --git a/abs/core/systemd/initcpio-install-udev b/abs/core/systemd/initcpio-install-udev index 419c19e..7f0301a 100644 --- a/abs/core/systemd/initcpio-install-udev +++ b/abs/core/systemd/initcpio-install-udev @@ -3,7 +3,6 @@ build() { local rules tool - add_file "/etc/udev/udev.conf" add_binary /usr/lib/systemd/systemd-udevd add_binary /usr/bin/udevadm add_binary /usr/bin/systemd-tmpfiles diff --git a/abs/core/systemd/loader.conf b/abs/core/systemd/loader.conf new file mode 100644 index 0000000..1f7cd7e --- /dev/null +++ b/abs/core/systemd/loader.conf @@ -0,0 +1 @@ +default arch diff --git a/abs/core/systemd/splash-arch.bmp b/abs/core/systemd/splash-arch.bmp new file mode 100644 index 0000000..f083d4b Binary files /dev/null and b/abs/core/systemd/splash-arch.bmp differ diff --git a/abs/core/systemd/systemd.install b/abs/core/systemd/systemd.install index 1e79585..b0a3e1f 100644 --- a/abs/core/systemd/systemd.install +++ b/abs/core/systemd/systemd.install @@ -1,7 +1,7 @@ -#!/bin/sh +#!/bin/bash sd_booted() { - [ -e sys/fs/cgroup/systemd ] + [[ -d run/systemd/system && ! -L run/systemd/system ]] } add_privs() { @@ -11,110 +11,195 @@ add_privs() { fi } -post_common() { - systemd-machine-id-setup - - add_privs usr/bin/systemd-detect-virt 'cap_dac_override,cap_sys_ptrace+ep' +add_journal_acls() { + # ignore errors, since the filesystem might not support ACLs + setfacl -Rnm g:wheel:rx,d:g:wheel:rx,g:adm:rx,d:g:adm:rx var/log/journal/ 2>/dev/null + : +} - udevadm hwdb --update - journalctl --update-catalog +maybe_reexec() { + # don't reexec on 209-1 upgrade due to large infrastructural changes. + if [[ $(vercmp 209-1 "$2") -eq 1 ]]; then + echo ':: systemd has not been reexecuted. It is recommended that you' + echo ' reboot at your earliest convenience.' + return + fi if sd_booted; then systemctl --system daemon-reexec fi } -mask_net_naming() { - if [ ! -e etc/udev/rules.d/80-net-name-slot.rules ]; then - printf >etc/udev/rules.d/80-net-name-slot.rules '# %s\n' \ - "This file masks persistent renaming rules for network devices. If you" \ - "delete this file, /usr/lib/udev/rules.d/80-net-name-slot.rules may" \ - "rename network devices according to ID_NET_NAME_{ONBOARD,SLOT,PATH}" \ - "properties of your network devices, with priority in that order. See" \ - "the output of 'udevadm test-builtin net_id /sys/class/net/\$interface'" \ - "for details on what that new name might be." \ - "" \ - "http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames" - fi +_dir_empty() { + set -- "$1"/* + [[ ! -e $1 && ! -L $1 ]] } -_208_changes() { - chown root:systemd-journal var/log/journal - chmod 2755 var/log/journal +post_common() { + systemd-sysusers + udevadm hwdb --update + journalctl --update-catalog +} - if [ -e var/lib/backlight ] && [ ! -e var/lib/systemd/backlight ]; then +_204_1_changes() { + printf '==> The /bin/systemd symlink has been removed. Any references in your\n' + printf ' bootloader (or elsewhere) must be updated to /usr/lib/systemd/systemd.\n' +} + +_205_1_changes() { + printf '==> systemd 205 restructures the cgroup hierarchy and changes internal\n' + printf ' protocols. You should reboot at your earliest convenience.\n' +} + +_206_1_changes() { + printf '==> The "timestamp" hook for mkinitcpio no longer exists. If you used\n' + printf ' this hook, you must remove it from /etc/mkinitcpio.conf. A "systemd"\n' + printf ' hook has been added which provides this functionality, and more.\n' +} + +_208_1_changes() { + if [[ -e var/lib/backlight && ! -e var/lib/systemd/backlight ]]; then mv -T var/lib/backlight var/lib/systemd/backlight fi - if [ -e var/lib/random-seed ] && [ ! -e var/lib/systemd/random-seed ]; then + if [[ -e var/lib/random-seed && ! -e var/lib/systemd/random-seed ]]; then mv -T var/lib/random-seed var/lib/systemd/random-seed fi } -post_install() { - post_common +_208_8_changes() { + add_journal_acls +} - # enable getty@tty1 by default, but don't track the file - systemctl enable getty@tty1.service +_209_1_changes() { + # attempt to preserve existing behavior - echo ":: Append 'init=/usr/lib/systemd/systemd' to your kernel command line in your" - echo " bootloader to replace sysvinit with systemd, or install systemd-sysvcompat" + local old_rule=etc/udev/rules.d/80-net-name-slot.rules + local new_rule=etc/udev/rules.d/80-net-setup-link.rules + + echo ":: Network device naming is now controlled by udev's net_setup_link" + echo " builtin. Refer to the systemd.link manpage for a full description." + + # not clear what action we can take here, so don't do anything + [[ -e $new_rule ]] && return 0 + + # rename the old rule to the new one so that we preserve the user's + # existing option. + if [[ -e $old_rule ]]; then + printf ':: Renaming %s to %s in order\n' "${old_rule##*/}" "${new_rule##*/}" + printf ' to preserve existing network naming behavior.\n' + mv -v "$old_rule" "$new_rule" + else + echo ':: No changes have been made to your network naming configuration.' + echo ' Interfaces should continue to maintain the same names.' + fi } -post_upgrade() { - post_common - - # getty@tty1.service is no longer enabled by default, but we don't want to break - # existing setups. - if [ "$(vercmp 183 "$2")" -eq 1 ]; then - # systemctl seems to be whiny on sysvinit. this will succeed unless something - # horrific happens, so just mask the error. - systemctl -q enable getty@tty1.service || true +_210_1_changes() { + if sd_booted; then + # If /etc/systemd/network is non-empty, then this is a 209 user who used + # networkd. Re-enable it for them. + if ! _dir_empty etc/systemd/network; then + systemctl enable systemd-networkd + fi fi +} - if [ "$(vercmp 194-4 "$2")" -eq 1 ]; then - printf '==> journald now writes to /var/log/journal by default. This can be\n' - printf ' controlled with the Storage setting in /etc/systemd/journald.conf\n' +_213_4_changes() { + if sd_booted; then + # if /etc/resolv.conf is a symlink, just assume that it was being managed + # by systemd-networkd, and re-enable systemd-resolved. + if [[ -L etc/resolv.conf ]]; then + systemctl enable systemd-resolved + fi fi +} + +_214_2_changes() { + # /run/systemd/network/resolv.conf -> /run/systemd/resolve/resolv.conf + if [[ etc/resolv.conf -ef run/systemd/network/resolv.conf ]]; then + ln -sf /run/systemd/resolve/resolv.conf /etc/resolv.conf - # logind's protocol changed. kindly restart the daemon to avoid locking - # out further logins. - if [ "$(vercmp 195 "$2")" -eq 1 ]; then if sd_booted; then - systemctl restart systemd-logind.service + if [[ ! -d run/systemd/resolve ]]; then + mkdir run/systemd/resolve + fi + + if [[ -f run/systemd/network/resolv.conf ]]; then + mv run/systemd/{network,resolve}/resolv.conf + fi fi fi - if [ "$(vercmp 196-1 "$2")" -eq 1 ]; then - printf '==> The legacy configuration options are no longer supported in rc.conf,\n' - printf ' convert your rc.conf to the new configuration formats.\n' - fi + echo ':: coredumps are no longer sent to the journal by default. To re-enable:' + echo ' echo >/etc/sysctl.d/50-coredump.conf \' + echo ' "kernel.core_pattern=|/usr/lib/systemd/systemd-coredump %p %u %g %s %t %e"' +} - if [ "$(vercmp 197-1 "$2")" -eq 1 ]; then - mask_net_naming - printf '==> Persistent net naming rules have been shipped as disabled.\n' - printf ' See /etc/udev/rules.d/80-net-name-slot.rules for more detail\n' - fi +_215_2_changes() { + # create at least the symlink from /etc/os-release to /usr/lib/os-release + systemd-tmpfiles --create etc.conf +} - if [ "$(vercmp 204-1 "$2")" -eq 1 ]; then - printf '==> The /bin/systemd symlink has been removed. Any references in your\n' - printf ' bootloader (or elsewhere) must be updated to /usr/lib/systemd/systemd.\n' - fi +_216_2_changes() { + echo ':: Coredumps are handled by systemd by default. Collection behavior can be' + echo ' tuned in /etc/systemd/coredump.conf.' +} - if [ "$(vercmp 205-1 "$2")" -eq 1 ]; then - printf '==> systemd 205 restructures the cgroup hierarchy and changes internal\n' - printf ' protocols. You should reboot at your earliest convenience.\n' +_219_2_changes() { + if mkdir -m2755 var/log/journal/remote 2>/dev/null; then + chgrp systemd-journal-remote var/log/journal/remote fi +} - if [ "$(vercmp 206-1 "$2")" -eq 1 ]; then - printf '==> The "timestamp" hook for mkinitcpio no longer exists. If you used\n' - printf ' this hook, you must remove it from /etc/mkinitcpio.conf. A "systemd"\n' - printf ' hook has been added which provides this functionality, and more.\n' +_219_4_changes() { + if ! systemctl is-enabled -q remote-fs.target; then + systemctl enable -q remote-fs.target fi +} - if [ "$(vercmp 208-1 "$2")" -eq 1 ]; then - _208_changes - fi +post_install() { + systemd-machine-id-setup + + post_common "$@" + + add_journal_acls + + # enable some services by default, but don't track them + systemctl enable getty@tty1.service remote-fs.target + + echo ":: Append 'init=/usr/lib/systemd/systemd' to your kernel command line in your" + echo " bootloader to replace sysvinit with systemd, or install systemd-sysvcompat" + + # group 'systemd-journal-remote' is created by systemd-sysusers + mkdir -m2755 var/log/journal/remote + chgrp systemd-journal-remote var/log/journal/remote +} + +post_upgrade() { + post_common "$@" + + maybe_reexec "$@" + + local v upgrades=(204-1 + 205-1 + 206-1 + 208-1 + 208-8 + 209-1 + 210-1 + 213-4 + 214-2 + 215-2 + 216-2 + 219-2 + 219-4) + + for v in "${upgrades[@]}"; do + if [[ $(vercmp "$v" "$2") -eq 1 ]]; then + "_${v//-/_}_changes" + fi + done } # vim:set ts=2 sw=2 et: -- cgit v0.12