killall-gentoo-systemd-fsck-root.patch

killall-gentoo-systemd-fsck-root.patch (text/plain), 4.34 KB, created by Canek Peláez Valdés on 2010-12-03 01:45:48 UTC

From 3b36783779e2effbe2d9c048bd5e7c24057a49a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Canek=20Pel=C3=A1ez=20Vald=C3=A9s?= <[e-mail]>
Date: Thu, 2 Dec 2010 15:28:00 -0600
Subject: [PATCH] Patch to remove the -l, -M and -T flags of fsck. ext3.fsck does not
 accept the -M and -T flags, and the -l flags expects a files with
 badblocks. If the root partition is ext3, without the patch Systemd
 fails to boot when /sbin/fsck fails. Also, patch the killall.service
 unit so it works in Gentoo.

---
 sys-apps/systemd/Manifest              |    3 ++-
 sys-apps/systemd/files/fsck-root.patch |   17 +++++++++++++++++
 sys-apps/systemd/files/killall.service |    2 +-
 sys-apps/systemd/systemd-9999.ebuild   |    1 +
 4 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 sys-apps/systemd/files/fsck-root.patch

diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 88e4a12..83b54e6 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,8 +1,9 @@
 AUX 0001-Revert-Revert-Revert-fsck-add-new-l-switch-to-fsck-m.patch 1045 RMD160 f080497a39fb8d9c4a1afe46066bdba248373a72 SHA1 dfc7df7b5667a8cace130273e4137dd783966080 SHA256 55ac7ebe6f241261bd72e4d6c6eae1c8b7883cca2ef5c2d18ea7da6addbdba18
+AUX fsck-root.patch 422 RMD160 d533ffc5bb787791eefae3e5d2a376fd0dfffb6d SHA1 cb6c94360a111927eb3ebe8159c365a1873996c8 SHA256 520700dcd471dc6be935f0603f5f88375c382333f31b5d32b3703d724a8e8ca1
 AUX killall.service 522 RMD160 3d8beb63009ccb6752d4e68818ba14559695a3b8 SHA1 914f95d85742eebb47d513d8d1b23c2009e93aa1 SHA256 ffd855878e69811d00eca6e30dcdbe89c3019d13707fe182772f5cd8019b02e6
 AUX poweroff.service 532 RMD160 9bfb2bc6a481284d3833eb20d8e50e8efd7d9cbd SHA1 fc653c93006668ff6704ad2b6ec1d08668950d04 SHA256 0e2ab45ababa11e0cd1d9d40c15a3384ff02f12f867b6d9fb0def7e357b6f714
 AUX reboot.service 531 RMD160 f12172f20b3022e6fe84ea28204c0e37ec26fdba SHA1 42d860baae5f1332ee3be144ca4d305b7c1faa47 SHA256 744be77ba24fbefb100fd9a8055f5466b1ead6a96f5833409258535c024e8ddf
 DIST systemd-15.tar.bz2 728063 RMD160 56c91ab8b014cbe0d66be691ace5b1a43da284c1 SHA1 b383d35b409a99d6929e7d1f2e508e3b97fef601 SHA256 1714887652467614e7930ebdae85459ce24f8691b3e27b0f08dc5f052fd07cd8
 EBUILD systemd-15.ebuild 2279 RMD160 81f0f7ab9b702c69a154c6e1aea02e17d6a8cfbd SHA1 8be1f63d900caeb00320cbfa7850fff23c37ac3d SHA256 8c05761fd0424ff68cbcff75bcbd35fb537fdf1fef72ad2fd381172a7d871e72
-EBUILD systemd-9999.ebuild 1958 RMD160 7650db2f60b9b8a8dd1eb92f925cd9233bbd772e SHA1 46250fb0922db7a418fb35f59e3fe44b12a6870f SHA256 f062d16392ef911e2f39103a196a869f9939eba248c42daa5e92b8317e6daeb2
+EBUILD systemd-9999.ebuild 1996 RMD160 102158be9a5fa59b7d77b00a9fbddc6c12f9e524 SHA1 58deb990cc7804e689948bc62aa999194be26f0a SHA256 e8145081e835798c5d09997eb4c3b52665db4905df3d028b07803e195ef67cc2
 MISC metadata.xml 737 RMD160 cdd440f38c039bfa7967fd713ef238588c2e1fb4 SHA1 1dea5e1d1e388bf43131297667bb4dbba10e65dd SHA256 042b1b68c02c274920954280705e21c2ca2ef5eece3229aab03d8dd43e06422d
diff --git a/sys-apps/systemd/files/fsck-root.patch b/sys-apps/systemd/files/fsck-root.patch
new file mode 100644
index 0000000..16b657a
--- /dev/null
+++ b/sys-apps/systemd/files/fsck-root.patch
@@ -0,0 +1,17 @@
+diff --git a/src/fsck.c b/src/fsck.c
+index fdcf6b4..2818de5 100644
+--- a/src/fsck.c
++++ b/src/fsck.c
+@@ -212,11 +212,6 @@ int main(int argc, char *argv[]) {
+ 
+         cmdline[i++] = "/sbin/fsck";
+         cmdline[i++] = "-a";
+-        cmdline[i++] = "-T";
+-        cmdline[i++] = "-l";
+-
+-        if (!root_directory)
+-                cmdline[i++] = "-M";
+ 
+         if (arg_force)
+                 cmdline[i++] = "-f";
+
diff --git a/sys-apps/systemd/files/killall.service b/sys-apps/systemd/files/killall.service
index a156fad..af939b1 100644
--- a/sys-apps/systemd/files/killall.service
+++ b/sys-apps/systemd/files/killall.service
@@ -14,5 +14,5 @@ RefuseManualStart=yes
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart="/bin/bash -c 'killall5 -15; sleep 1; killall5 -9; sleep 1'"
+ExecStart=/bin/bash -c 'killall5 -15; sleep 1; killall5 -9; sleep 1'
 StandardOutput=tty
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index fb5e313..afdd17c 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -41,6 +41,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}/fsck-root.patch"
 	eautoreconf
 }
 
-- 
1.7.2.2