Fix borked patch

This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2014-11-02 17:15:07 -05:00
parent b397f2acfb
commit 47313b1c32
37 changed files with 42 additions and 44 deletions

View File

@ -1,4 +1,4 @@
From 873abc6423bf62d9ddfe274aa52a8f2918b070a9 Mon Sep 17 00:00:00 2001
From 1c5d3c9230d1648413410770d42dcbaf57a78e23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Sun, 2 Nov 2014 09:16:09 -0500
Subject: [PATCH] Revert "readahead: wipe out readahead"
@ -39,7 +39,7 @@ Conflicts:
units/system-update.target | 2 +-
units/systemd-backlight@.service.in | 2 +-
units/systemd-binfmt.service.in | 2 +-
units/systemd-firstboot.service.in | 3 +-
units/systemd-firstboot.service.in | 1 +
units/systemd-fsck-root.service.in | 1 +
units/systemd-fsck@.service.in | 2 +-
units/systemd-journal-catalog-update.service.in | 2 +-
@ -62,7 +62,7 @@ Conflicts:
units/systemd-update-done.service.in | 2 +-
units/systemd-update-utmp.service.in | 2 +-
units/systemd-vconsole-setup.service.in | 1 +
54 files changed, 2677 insertions(+), 24 deletions(-)
54 files changed, 2676 insertions(+), 23 deletions(-)
create mode 100644 man/sd-readahead.xml
create mode 100644 man/sd_readahead.xml
create mode 100644 man/systemd-readahead-replay.service.xml
@ -2994,19 +2994,17 @@ index 34a5d5237b..02dfe774df 100644
ConditionPathIsReadWrite=/proc/sys/
ConditionDirectoryNotEmpty=|/lib/binfmt.d
diff --git a/units/systemd-firstboot.service.in b/units/systemd-firstboot.service.in
index 405c6f3fd2..4b85f562af 100644
index 405c6f3fd2..91b9909093 100644
--- a/units/systemd-firstboot.service.in
+++ b/units/systemd-firstboot.service.in
@@ -10,7 +10,8 @@ Description=First Boot Wizard
@@ -10,6 +10,7 @@ Description=First Boot Wizard
Documentation=man:systemd-firstboot(1)
DefaultDependencies=no
Conflicts=shutdown.target
-After=systemd-remount-fs.service
+After=systemd-readahead-collect.service systemd-readahead-replay.service
+After=systemd-remount-fs.service systemd-sysusers.service
After=systemd-remount-fs.service
Before=systemd-sysusers.service sysinit.target shutdown.target
ConditionPathIsReadWrite=/etc
ConditionFirstBoot=yes
diff --git a/units/systemd-fsck-root.service.in b/units/systemd-fsck-root.service.in
index 6d7657853e..26cce5131e 100644
--- a/units/systemd-fsck-root.service.in

View File

@ -1,4 +1,4 @@
From 92fb375921f57472f43cd94c8a86195c38894e98 Mon Sep 17 00:00:00 2001
From a8caf8eabad9bd51425c649189955c9fe18c9418 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Sun, 2 Nov 2014 09:20:39 -0500
Subject: [PATCH] Revert "timedated: manage systemd-timesyncd directly instead

View File

@ -1,4 +1,4 @@
From 4ff1c91a85b2f4a546dbb2d5afc40b7c3c06e49e Mon Sep 17 00:00:00 2001
From 2ed2be30664faa7076edd819ea4ae429fab8ac08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Sun, 2 Nov 2014 09:42:01 -0500
Subject: [PATCH] Revert "sysctl.d: default to fq_codel, fight bufferbloat"

View File

@ -1,4 +1,4 @@
From 38d3bea29a7c19a5f41d347b7658fa058c56a942 Mon Sep 17 00:00:00 2001
From 93871b345b76480e99b9a135006cad47e10acd7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Sun, 2 Nov 2014 10:02:41 -0500
Subject: [PATCH] Revert "units: define appropriate job timeout actions when

View File

@ -1,4 +1,4 @@
From e6407f548fcf093e1553c809036db0594d296a45 Mon Sep 17 00:00:00 2001
From 2f0a6c615496777ec37f6815b8516f8b3a25e82e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Sun, 2 Nov 2014 10:03:49 -0500
Subject: [PATCH] Revert "Update NEWS"

View File

@ -1,4 +1,4 @@
From 6dea3619b5493cfdd9f973cb5346ea252ad75c01 Mon Sep 17 00:00:00 2001
From 32e659e2d7a50ebe19dd82db116518eb150f7317 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Sun, 2 Nov 2014 10:05:51 -0500
Subject: [PATCH] Revert "login: remove multi-seat-x"

View File

@ -1,4 +1,4 @@
From 7339a21496c9dd0d3a1fee24172843a522f0bb16 Mon Sep 17 00:00:00 2001
From 9bbe7b209c31fb3b31f7b0e1a66ae82b4c2768d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Sun, 2 Nov 2014 10:24:58 -0500
Subject: [PATCH] Revert "service: add missing state table entry"

View File

@ -1,4 +1,4 @@
From ca1cf37d559b7b155c48285ef9d090ac86f9a965 Mon Sep 17 00:00:00 2001
From d5cd1a02f0da4de24cce433b1759e3e297df0f5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Sun, 2 Nov 2014 10:25:06 -0500
Subject: [PATCH] Revert "core: send sigabrt on watchdog timeout to get the

View File

@ -1,4 +1,4 @@
From 04c7091101c04e0f7baf22980872e77af5ea4577 Mon Sep 17 00:00:00 2001
From 6bb37d22af95d11df7f487f3e34abc97fa5fa9bf Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 28 Oct 2014 20:36:32 +0100
Subject: [PATCH] NEWS: well, it's Options= now, not Discard=

View File

@ -1,4 +1,4 @@
From 719014b379714744760e5d65a599d100b397d548 Mon Sep 17 00:00:00 2001
From 8207682d7a40270e6581515e3537adaff885a072 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 29 Oct 2014 17:58:43 +0100
Subject: [PATCH] sd-bus: properly handle removals of non-existing matches

View File

@ -1,4 +1,4 @@
From 0a54df09b797dfc1ffd076ea378d17db64623a78 Mon Sep 17 00:00:00 2001
From 5b6b524662ddc3178b4d8c2e51eba5d023ad08c4 Mon Sep 17 00:00:00 2001
From: Dave Reisner <dreisner@archlinux.org>
Date: Wed, 29 Oct 2014 13:32:43 -0400
Subject: [PATCH] nspawn: ignore EEXIST when creating mount point

View File

@ -1,4 +1,4 @@
From 220947cd72a4897fae2f90fd70d3a36db96cd9c9 Mon Sep 17 00:00:00 2001
From c96c14e1f545e6533c781e33c2238d1433deb30f Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay@vrfy.org>
Date: Thu, 30 Oct 2014 01:18:34 +0100
Subject: [PATCH] udev: path_id - update comments

View File

@ -1,4 +1,4 @@
From c6c61aa02fc16388acdb1a04ab6192d7c749d492 Mon Sep 17 00:00:00 2001
From 1c7a80d7748ee8c4117ccbb628274413f2c7cb59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Wed, 29 Oct 2014 22:25:33 -0400
Subject: [PATCH] bash-completion: rework startable/restartable units once more

View File

@ -1,4 +1,4 @@
From e67d6e601aaa380a615bc3dfffcab56d0f4666c0 Mon Sep 17 00:00:00 2001
From 4ffc2172253c5ac6ad49bee3c87e5740ae520c8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Wed, 29 Oct 2014 22:46:30 -0400
Subject: [PATCH] systemctl: let list-{units,unit-files } honour --type

View File

@ -1,4 +1,4 @@
From b8e4de9dcc9eebe202b2450f2c863eab48d50cc2 Mon Sep 17 00:00:00 2001
From ff0c10038b7dc58ad13dce492806e6781a0f34fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Wed, 29 Oct 2014 22:51:00 -0400
Subject: [PATCH] systemctl: obey --state in list-unit-files

View File

@ -1,4 +1,4 @@
From dde552b36bcfef618dd45325ebafa73b801ec38f Mon Sep 17 00:00:00 2001
From fef18888ca215c0600b95cd4dfd9b469c9936043 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Wed, 29 Oct 2014 23:06:58 -0400
Subject: [PATCH] bash-completion: use improved filtering to make things faster

View File

@ -1,4 +1,4 @@
From 0f6c8d5bf7f371e39a49e5a932d955f28f25d64f Mon Sep 17 00:00:00 2001
From 8b2735073009dcb855d65a3aa85eec25d8100a2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Wed, 29 Oct 2014 23:47:55 -0400
Subject: [PATCH] zsh-completion: update start/restart completions

View File

@ -1,4 +1,4 @@
From cbc2459556c16dca2c76b4c580e4d9d8d78279ea Mon Sep 17 00:00:00 2001
From b9ae7f976b524c712b7b98062087adaa662f3cf8 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Thu, 30 Oct 2014 10:15:54 +0100
Subject: [PATCH] keymap: Ignore brightness keys on Dell Inspiron 1520 to avoid

View File

@ -1,4 +1,4 @@
From c1cd55e4ea29a31a8420c6461eeec360139301f3 Mon Sep 17 00:00:00 2001
From c3a8638cf447ae5901dccb89ea766d768febe529 Mon Sep 17 00:00:00 2001
From: Colin Guthrie <colin@mageia.org>
Date: Wed, 29 Oct 2014 14:03:41 +0000
Subject: [PATCH] sysusers: Preserve ownership and mode on /etc/passwd and

View File

@ -1,4 +1,4 @@
From 514a189346af541c31687dd9285afb997a26313e Mon Sep 17 00:00:00 2001
From 3db5ad126fcca99e7d341e47f1c2967aa70fc813 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Tue, 28 Oct 2014 12:36:17 -0400
Subject: [PATCH] snapshot: return error when snapshot exists

View File

@ -1,4 +1,4 @@
From 83b7b5f5db1e251d0ddc6c60bf4b32639ea9f49f Mon Sep 17 00:00:00 2001
From b994526e7fbc8acc71889120645508ac5f8aca33 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Thu, 30 Oct 2014 14:23:00 -0500
Subject: [PATCH] sd-dhcp-client: clean up raw socket sd_event_source when

View File

@ -1,4 +1,4 @@
From de2315fd8b3e2712b5f5790c24182e2d61eb6116 Mon Sep 17 00:00:00 2001
From deb58970549681f28a7e38ee0f75664523f5066a Mon Sep 17 00:00:00 2001
From: Dave Reisner <dreisner@archlinux.org>
Date: Thu, 30 Oct 2014 20:12:05 -0400
Subject: [PATCH] shared/install: avoid prematurely rejecting "missing" units

View File

@ -1,4 +1,4 @@
From e268a9380de7c5848e6cd8a92b89d68d7eef2bd4 Mon Sep 17 00:00:00 2001
From c986f1e5ff7afaa52274ee25a7ba94bec0356d03 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 30 Oct 2014 20:53:23 +0100
Subject: [PATCH] nspawn: don't make up -1 as error code

View File

@ -1,4 +1,4 @@
From 6dc664b38675e2b763fa598e2ef8d466cbc93f43 Mon Sep 17 00:00:00 2001
From 860e33966a511e008f80bbfa23450dcc33650290 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 31 Oct 2014 16:22:36 +0100
Subject: [PATCH] units: don't order journal flushing afte remote-fs.target

View File

@ -1,4 +1,4 @@
From 99025d810c1d252369e5052d36b33eccdb78f8d9 Mon Sep 17 00:00:00 2001
From 077f3bccf730114917c581fb9f47beb4518835bd Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Fri, 31 Oct 2014 20:37:59 +0100
Subject: [PATCH] hwdb: Update database of Bluetooth company identifiers

View File

@ -1,4 +1,4 @@
From 4acc3dbd1fc3326918739d2e898cb4b1ed67c000 Mon Sep 17 00:00:00 2001
From e63854bf942d6f3364e5e69d5e7bcfd5a2ad8ec8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Sat, 1 Nov 2014 11:32:44 -0400
Subject: [PATCH] libudev: modernization

View File

@ -1,4 +1,4 @@
From 83b62da30bd9a62bf25847b16bb36bcd1270b5f3 Mon Sep 17 00:00:00 2001
From 6c2d3f24672aaa806bbd6b4b5741e315566da35c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Sat, 1 Nov 2014 12:06:41 -0400
Subject: [PATCH] libudev: do not accept invalid log levels

View File

@ -1,4 +1,4 @@
From 02f8fb24f91116a5f315e607f5fc0ea6f7627a51 Mon Sep 17 00:00:00 2001
From acfc0db365d38b1185ab4cb47f03c63b9aa23087 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Sat, 1 Nov 2014 14:36:29 -0400
Subject: [PATCH] man: describe all log levels in udevadm(8)

View File

@ -1,4 +1,4 @@
From 74f80e9a5df498af7c3af1433b406f606d6433a3 Mon Sep 17 00:00:00 2001
From 896050eeb3acbf4106d71204a5173b4984cf1675 Mon Sep 17 00:00:00 2001
From: Jan Synacek <jsynacek@redhat.com>
Date: Fri, 31 Oct 2014 10:16:45 +0100
Subject: [PATCH] core: improve error message when machine id is missing

View File

@ -1,4 +1,4 @@
From 7ea6b0745f5795dbf0dde547971215ef139c59f1 Mon Sep 17 00:00:00 2001
From 3169d6cf7f78ab2906b7249466d0c5721890fc7a Mon Sep 17 00:00:00 2001
From: Umut Tezduyar Lindskog <umut.tezduyar@axis.com>
Date: Wed, 29 Oct 2014 11:20:02 +0100
Subject: [PATCH] man: explain journalctl --flush correctly

View File

@ -1,4 +1,4 @@
From b7248e47e1938d9d4a0cc63b78ddd3d0a0861552 Mon Sep 17 00:00:00 2001
From 309ce8c2537ae72e2c7a07b7e21bee5fd2da0960 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Sat, 1 Nov 2014 13:52:14 -0400
Subject: [PATCH] systemd-journal-flush.service: remove "trigger" from

View File

@ -1,4 +1,4 @@
From 05530aba2c48b99a269544cf8f7c45e427b9cb20 Mon Sep 17 00:00:00 2001
From b464167132f65d25364d3d22368346ab48981a4a Mon Sep 17 00:00:00 2001
From: Michael Chapman <mike@very.puzzling.org>
Date: Wed, 29 Oct 2014 11:54:07 +1100
Subject: [PATCH] kernel-install/90-loaderentry.install: fix cmdline parsing

View File

@ -1,4 +1,4 @@
From b456d500bb70e4eb1f42816adac4f1f4a7efffa0 Mon Sep 17 00:00:00 2001
From 3db8a5d1b39f88981e979ff01afb4a0c7aa9a126 Mon Sep 17 00:00:00 2001
From: Joe Lawrence <joe.lawrence@stratus.com>
Date: Sat, 1 Nov 2014 12:18:08 -0400
Subject: [PATCH] scsi_id: fix usage spelling

View File

@ -1,4 +1,4 @@
From 18a4017bd49458570e8c3058d3e1d6c53fffd246 Mon Sep 17 00:00:00 2001
From 5a9b149c96f39d8363e6b2dcb45e95056d2799ea Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Sat, 1 Nov 2014 15:49:53 -0400
Subject: [PATCH] libudev: Use correct free function

View File

@ -1,4 +1,4 @@
From fce17a6ce48d44d99108bb9d14bb0cff6a627f89 Mon Sep 17 00:00:00 2001
From b5404292de0a4252b4b7447ef45bf3f334cae529 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Sun, 2 Nov 2014 12:10:42 -0500
Subject: [PATCH] Raise level of 'Found dependency...' lines

View File

@ -1,4 +1,4 @@
From d3bcf051780f5c294c80a5b1d28d80c00f0da0d6 Mon Sep 17 00:00:00 2001
From db2241b5259671c2a7435235f5fc560ba4e97077 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Sun, 2 Nov 2014 12:19:38 -0500
Subject: [PATCH] manager: do not print timing when running in test mode

View File

@ -1,4 +1,4 @@
From 845d73b496fdc7d8b52d7ad6e3f87824aba4cd53 Mon Sep 17 00:00:00 2001
From 3c6a000d5c291f998dba2eb4c8e351f4603ca985 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Sun, 2 Nov 2014 11:39:17 -0500
Subject: [PATCH] unit: do not order timers.target before basic.target