sys-apps/kexec-tools: Add support for systemd, #478072; Fix issues with openrc init scripts, #481506; thanks BobbyK for the patches

Package-Manager: portage-2.2.6/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

12 files changed, 367 insertions, 309 deletions

diff --git a/sys-apps/kexec-tools/ChangeLog b/sys-apps/kexec-tools/ChangeLog
index fd33e615469f..1ad615c41707 100644
--- a/sys-apps/kexec-tools/ChangeLog
+++ b/sys-apps/kexec-tools/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-apps/kexec-tools
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/ChangeLog,v 1.52 2013/08/11 11:18:15 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/ChangeLog,v 1.53 2013/09/21 11:35:53 jlec Exp $
+
+*kexec-tools-2.0.4-r2 (21 Sep 2013)
+
+  21 Sep 2013; Justin Lecher <jlec@gentoo.org> +kexec-tools-2.0.4-r2.ebuild,
+  kexec-tools-9999.ebuild, -files/kexec.conf-2.0.3, -files/kexec.init-2.0.3,
+  +files/kexec.init-2.0.4-r2, +files/kexec.conf-9999, +files/kexec.init-9999,
+  files/kexec.conf, -files/kexec.init, -files/kexec.init-ng,
+  +files/kexec.service:
+  Add support for systemd, #478072; Fix issues with openrc init scripts,
+  #481506; thanks BobbyK for the patches
 
   11 Aug 2013; Justin Lecher <jlec@gentoo.org> -kexec-tools-2.0.2-r1.ebuild,
   -kexec-tools-2.0.3.ebuild, -kexec-tools-2.0.3-r1.ebuild:
diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
index 32518f82032b..48d6720e820d 100644
--- a/sys-apps/kexec-tools/Manifest
+++ b/sys-apps/kexec-tools/Manifest
@@ -4,32 +4,33 @@ Hash: SHA512
 AUX README.Gentoo 939 SHA256 e1fa00817a8230efbcdc149a64c6a65418a46d5e6977b3d3adb91d1d3f44e29f SHA512 884e88fefd7b917b34900fac71dbf38ecc54907af513b41d7423deba83811f951070c4715708973bd2935fdc35b625cc6ea5e88e9abdb11c401d92f63f14cec0 WHIRLPOOL 15a4f7dc41ec1ca1675387d4d7f922bbc47aae50663e4ff79b5cff8733c0a98727fbc54ea30949411d0eb1082afe05ce360f44dd70328c106c186e12543b663d
 AUX kexec-tools-2.0.0-respect-LDFLAGS.patch 290 SHA256 c815c53eebcfddd687cefcaa835b604b489f14410bbd4c524e845cf31c69fa15 SHA512 8d34ecdf887ad8d6d09b0f65159285b6b54c434f59ea0e296b90f4e30b1f059acf933212f068172ddb1f02d854f568f24b2c899afefd782db69c252c9967efb7 WHIRLPOOL fca551236bfb55850e421654d43bb50d66fa83b1999f3d9b417a21506dd8d4ed2d75ba2699f0277cfb4681f35ecd7676b126769bbde2fb0ff6481855f0548142
 AUX kexec-tools-2.0.4-disable-kexec-test.patch 473 SHA256 95d7d6756aa438af926358dc9e6c964e11201a7c19b2ed2b457f013313d47558 SHA512 c7fe9176db7c3f9c84add1c263c5a695684bf1db55d47152534f0bbb97c084ad5d3f2090307d0bdfcf5622fa810aca3c104f81b3d24baa76f42d3f32d1d4bbad WHIRLPOOL 3b0cebf5aa1cd923c7867d588af9b74002b6266d3065e7c59061c5b510ad1f8aea0e1fa78d2f17a94bf25424db1d566a5648530e9ce5044ead28407b7f6135c5
-AUX kexec.conf 397 SHA256 59bd15f8a0be3a41a457e61cfbb3520252773ed6422b9b223b347dfeb54f152a SHA512 2c31ae780b6fd16f3a07857d30415fef50ca45297c639234eb6fad871e80819e73196d389a3e473bc9685569ce8688408428ee25a1328c16d1bf729912d63496 WHIRLPOOL 0bba1d957fff2d6eea1ffb0efd53eb2546df61a4209c14e8000ea00f3353ae57623188f50cfb38b614cacecf2af2cb83d1f13b8583c6229dbcac2e3a0e15db43
-AUX kexec.conf-2.0.3 961 SHA256 ecc3903b0a302243be84e954c2f4bb1c0ce86ca516589a5a30fa12db821969d7 SHA512 c81235f0b3fabbf43409f2dc8622274b35aab8fed05ade553c1217a0826f36150633696f21ea894ff0f85e75bab230fc4629235c2c253617e802a0cd4ade771b WHIRLPOOL a6f9bebb1927e9a24c1d0dd898d10dff98b6e0972af46e911517bb3a326d091bf95aaf68838f9b6159dad2de55550197b4c17e14041424055bc4aaaac6324c8a
+AUX kexec.conf 340 SHA256 19d6a02cf0bf3cebf03dc81c3b9fd5f517815ab1060f67cb9019b7e9653a7fc0 SHA512 66beb57ee13dba70f75f12326643270a0c888e178fdfca8ba7a566a874707aebe2afebb6ceae976dfb0aaf3135048daad6277e70580e4c7911b9ddbf74e4f00a WHIRLPOOL b77bb59ab16ea67690fa3e551995510b0fb0d82f7e2f10f9ed7d7815eb1e498cdda9ea667d2648b62cd1ae86a3ab67ae2ca1abd1fd2b9fce376b64ac41fb8725
 AUX kexec.conf-2.0.4 1013 SHA256 4c1b7e4651cd4be342db48389bc560589c896004f0274f8aba35a92fcd790531 SHA512 96db2834454aa4d038061e9b1f918932da3d3054021487425d0f70c6ad32096b9433ae2f3921e83196b23af901c32e591df3d6a84a6d14e064608d8ad895a599 WHIRLPOOL 3041644bf1688ac6c89e6078adcee987913bce124ea3ae4a2ce342c0956f319cccae93aabf39ee4aed9f23812e575f7f06cbf110bf39d9d961a1a19294108f27
-AUX kexec.init 2106 SHA256 34c97c9d11ab741cb13160bab16e322929d2c84bbefaa13d33171bdf02b0dc98 SHA512 f25576d4821a54bf89e7b562392a04119caa800dad039c72cd4191e05b6e6a0d107f64607193782ddcb29c02b7f7f1fa841aec13e6171cd3d8cd51df778a58dd WHIRLPOOL 6cf7402ae612a439d1a3ff3acfada21734b586fc2cb72136ebec4b3da6f64342e334d089a5925c99bc2479e6ef034483313424bb37d9d08caa2c6c4a4d0622b8
-AUX kexec.init-2.0.3 2825 SHA256 8dc2ef4c6391ec1e509381564d8c1b6602a16f107355465031efb46027d5a667 SHA512 3b1364cfd7beb03c9f1fda3d3d1e5382b2af23a2b9ad1fd981566786f5221985b35903ba62dc9cb7ba314375e05b9d6c7de9ac8e986c59c221e137ab46ffdde7 WHIRLPOOL 46eb2657e1fda4d18b6a6203bbed599e9bfd59638e4d4d363aaf69c79b58acb86bd1c13804d4945714bd8b0df64f3d77a2987888477758f08f1d67c32e10c959
+AUX kexec.conf-9999 397 SHA256 59bd15f8a0be3a41a457e61cfbb3520252773ed6422b9b223b347dfeb54f152a SHA512 2c31ae780b6fd16f3a07857d30415fef50ca45297c639234eb6fad871e80819e73196d389a3e473bc9685569ce8688408428ee25a1328c16d1bf729912d63496 WHIRLPOOL 0bba1d957fff2d6eea1ffb0efd53eb2546df61a4209c14e8000ea00f3353ae57623188f50cfb38b614cacecf2af2cb83d1f13b8583c6229dbcac2e3a0e15db43
 AUX kexec.init-2.0.4 3173 SHA256 e7d16368ca8e9ba42d2fb7320362722729c50b360e7737578b3f8ab2187c57ee SHA512 8f4dc9b448662060d10c9dbc3175fc3085ced0435408d8cf5a29166d8ec270c71af7917efcee5364e4cd052666e415b11b838ca4ed596abd2b11caa239f9509a WHIRLPOOL 383dde8f3079b51f1651ebf661ad6841232d7490940437b74a7b8d70da17d3b84fd68bc8baf3dbb979678b371c2e00738449fc5620b8d87525d7158cbc0bd184
-AUX kexec.init-ng 2264 SHA256 ba1a0d48a1a8663d2d48b83eeda987e83fa0440254573ded7c487e888824f947 SHA512 f87784856b3e0870ed0b4234d649d3567196d760da0c657c0b962d639ed953bbe9d258136587e9253b0d35cf069a62c35c4dbf70dd50196015ce1e583900a6b1 WHIRLPOOL b543f56b72f942272a17666e8d4027f8e51ac25c3c75c01127fda956b1b5d1da87b340013ec827aefd216fb7194257cac1327675dc6fe49d2aef08ab5e90fc56
+AUX kexec.init-2.0.4-r2 3625 SHA256 e544b056368769816c73b2e1eac7d7bccffa815ef5e09d150ddc967940f284a9 SHA512 e8b0df5d0be1824ed6686afd538cac1768e31ab90b7e2a2e9c0933ddefdb8d992238cd8a5bf42ad7ada7ed8f958cba603ca4b5c535f88dbb586d662234cc7817 WHIRLPOOL 12c9e60ef4c03f9b606be4ef8c3b4f5babfbb7aa047cc174b484a9aa15338cb357d0a683d639226354d60c10d851e3c8fdbf24d87c089f1ff231b43cff61420f
+AUX kexec.init-9999 2110 SHA256 1788178cb342e5a0b230540db64ec1a3d7c88a9ea513754ae0209a701382d751 SHA512 527f91aa7cee4598175f4bdd6ab6d9d19091a5e8de212f1ab554ea6bf1eb32067bb9ce44590884969c0557636a47fa26c0a49508c2aa4a5ee3d80fb9e1ce354f WHIRLPOOL 5b082c044766f9fd7d459c23e68b0b5f5fd03fd5969ddc0836854e36545861e7800947691cd7bedadebf1dba858fb276e1c8759cff0e279600d48e3aac25533b
+AUX kexec.service 407 SHA256 d95610609301d46e0f67efd78653beabd7dd253d2bf00f5736de5cdfbf2ea94e SHA512 9f0fa6d39c67048fe774fee0f2e8ed10e9e12a2468e7dda193cd8c5bd8b4cf49819d14703efad35c91265cd4e03c6f5460934b5fe92efd06eab8dc619920b1e3 WHIRLPOOL 9a412481d729e7ec7cec3a4142f2159337d61baf22431e4129f1e7798bf2683f1802e51edc92800e6b42b8b9b01cd83ef51f67cbc1cb7a4b209f923f3180948f
 DIST kexec-tools-2.0.4.tar.xz 271604 SHA256 e5f5ab00d746eb15b4714eca6a8ec5a1a86a62ce2bbdad1b3000161138a978c6 SHA512 2514f407d9150d2615dffc91a525fb28f159bef92b9543f9802e2618746b7d4c04137668ad8a8d8f0b75f68ed9057d09629ce736b6a061b5cf817b9d904f549e WHIRLPOOL 70ad298512e700cd1cdee7698e4fa68a769d91d3080d5d8387b8362ad49126ad68b0b6dbd1f13305958bdc988f805fa610e487682fd0eb5e4e9bcda0a9022627
 EBUILD kexec-tools-2.0.4-r1.ebuild 1279 SHA256 b41d15668b7930279242ac9da97eac2d387b730fbfb3153e0d5030da3e47bac7 SHA512 2b4711a8800acf3c03758ccc7bffd3535f42075f16b824bd0441134aff10c1b40a869a958f4d4160d73fe9027580d96c909d2530894cd1502ba0eecfa95f3716 WHIRLPOOL df0084b43770e7e92fc7c9de3c87c4d0116ebe81541326708ae881330c78182db9bafd7a7eca7ee4f455d44565f25747aba331845e39356329ec17ad4b025b89
-EBUILD kexec-tools-9999.ebuild 946 SHA256 2a644186ff46ec113f48d1952450b0b704082910b378f192c04d13e95945de03 SHA512 251a02276ce16bfd2844de53f7d89375c499d7025102bc345beae10be8ee2d8c3fd8ce9872425b7d485188177253dd050a2fe7bb15624ecc6f6e4563714580c3 WHIRLPOOL 1cc0d0cd59a90f98f1ec1b24b80d99aca300c323af8fe9621be1f04b08f4cc85278b9ceac991dd681c5e75d77aba51ea6723f7c1f211a56f7996b2fc8444c88b
-MISC ChangeLog 11009 SHA256 73fe8501e809e04d24862727e148f3650c7b07a7c7df031e01a50d26aa19ba4b SHA512 340e0f587f4ea3d8c0bd8081d16f736a30f634b3422128a5dd0e73b51b4e708af71adcbc45622ab8064ab8c9f453ee8917d955952ce5804fa12ce297961848e7 WHIRLPOOL b0fe9bed28ef8eb0d138edefcebfd6415735a4514a347f641d47dbe512d72ad06c4c3e70f850220efb9b70df71e83dfd29b116d82bce9fda22e064495fbe9486
+EBUILD kexec-tools-2.0.4-r2.ebuild 1689 SHA256 10db111e85144e13ad637ea8c6dacb5d0f7ae33d1df122b3bc49b0792b47639d SHA512 157b856faa00cf53c5748190e98bb5423641c92c661f9af9f3f9819d958c36b78ba03e97cb3313269ede96742c89d294f16eb751f28742e0d3c35ad1dbad0b8f WHIRLPOOL ec818ff67dbb25802dc9fcfda59633bcb3df64d33b8ddaecb86d9db905c028291bd181f256e35b93954063c23d014a388259bb852ab599838fe99b88f4281682
+EBUILD kexec-tools-9999.ebuild 1688 SHA256 aa13e504b3fc1e2eb8faa08d7f12950a1d6c21cf4a06bd2d9ac12c46c5da2555 SHA512 a65a3f008a8602b0da57674982da4b005c89c8c7b2ff8745ef32221b37795dfcac374f88d3ec36b174e38d414559842822a019775e60183c3cfa0165bcecc1b8 WHIRLPOOL 6b399ed0fd1a2e75d1206be014deb6f52fb91e537878251e69d0b9b6811e0f2351005164cd01406780cea19127617d7fa1a6428947b4fdeec2e56b135629502d
+MISC ChangeLog 11478 SHA256 c4a726ac8a10420c8e352f7cc94c24e263230141c2b30322b795763580934e72 SHA512 71640d32e2cf158f372ea8329c044da77f14b166b2b93651ef714fcec0980dc79ea1e304c609b7a98136459a91e40814c6c2665b3deeab5abb90da1b32e57477 WHIRLPOOL 22d1c0c1f67a20b502040d18f4136ed22f940ca7b920ae81eae1f82a631ec030f95c64517e066922532933fb24a405996f92adc1fa8e26b23545452761653b7e
 MISC metadata.xml 459 SHA256 9d84c6af2cbf56cf70a11bf399f623133b5da428fd00b6921e512195bce98c36 SHA512 c4def015a91deea9e8ca7269758d6d00d2d67ea242b33ffa327a0776f7c8a89d63890bd45d2377fdcbaa9f57f832418eed6bb543c58c1fd0ba5ca3fdb4987dba WHIRLPOOL 6218bde0407385cb46fc9d469e965f4933562f9be640916a882b21a8c7fbedb00ab12b466c660a1dc2354e5259ddecae01724ebac5eadfdf4bc385e5be2fe121
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSB3L4AAoJELnU8jG9FVirR2kQAIGev2UKN3Mg1cHrnE/IIYN8
-XDzCjJiej3ytY7o/yfzG4NzdxOdO/9QhUeOol84OQbAfvVjFo7YjFZCxi2+kS1Dp
-SMtiFSN5qo5dMy9BVnvtbAfA0thY461EYsV4QXmYRlj6WePioeA3HW6RGFCWfMd1
-fkLI+AVLOaQaMzf/WBoe9SbL10dKeWSI+mmeM4156vkVR22lg/UHguxdUt2LwveZ
-D64KcjpD6ScavH+vVStpaosrrGuZHpfFa1v5eN6UKfUjSKn3FL/7K/cENWE1ctCz
-OQOv+a9h3t/QWe1CUf1wsmIMDrdIH/jSbDIP4JQDGH2LAKsi8+yLLgYSNKTqTKTm
-GThUO0Ne0jl8saEbDxKYJhUA9fs9jd9wtd/npZktVTOwp8uj3h52xVaT8SZYgdCU
-rLiM8Ki9dZ4PA4Lwv8/xWYHRSHrmwhthcqk+bdFltZ91x4fhxITKtBl6ndexjhLd
-8kt0IFk486k1Hr6ezy3+4Su4VEUYp4DQvGNqnNHIK3P0d0cnKXzMXHKqHuU02JcR
-z7LxD63eKXl4xsQrhOTeKWZy6mQHgHoqVDFWRfyXLjrMec6Hl/eJZH+OngoBeHGk
-c/vzYYMZrfhUY6pS/T0joFy/IxSYaDmCJS4znGZgVlq0v0iSb7c+xgKPg04qoYke
-51pC0EUg7OlElhhcq5qR
-=Kx6m
+iQIcBAEBCgAGBQJSPYSaAAoJELnU8jG9FVir0kgP/2WU7h8q2HLBIq3le50EUwcg
+eiMhaO9mXWG2ZrF8/trCVVwHssyFcf7WYoKaCdAtWxC7gAAgGPq/zFNopTPfZ3KR
+LV/i6yE7vihZJ6cPUex1wu4VXZOsif2NPuxkHFMnd/x/sTl/DV6tcHyUMweioaeJ
+o1b8KC+WoCtK4QSRYrKR3bdEOpFyGp89/GnpwMdjw3Rx3kRTW2bd1xB565rT34Qg
+8LGEHXj8Zmln0IGXSicZsp1/PGc4eV58JPB1d7GyQjthidCZsQnvaD9jZbFprGq+
+hCVj0ufhT69T88BdOckUoqQyc1HICWoot/gCItQO9ovZC+W/pIfQhvZuBSVDuOCN
+Iop4SVoX1AmwnqL6KBHV3k6p5p29Xyie8EzivzbqNCmFx5bu4VBYX7W5WVx67+Ot
+EUFCfxCXqvGNIl5atSHR8PKhDgpILghjV66ZGts9K3RG3IpNvM/eiq6yoO4qve8m
+QJhk+xsJGy7bVCkpPnKxbDQs/7en2Ff9OJFoUKIxOpfIaEB1p6ZWOxbUidoxsSJo
+/ivSBQYnxg0iPedPer4KsrcBpGiS86dicuhD+jDAAR+nlRzBYxyY/NZFfvXRoS3V
+aucyhntloXKu+AQKN1boWqN4Q/jzXUf660c0CVhnqUBs0GK6GgJ2H+oRvTy94fdd
+8nd8ExZNkqowRG4cIYsV
+=srdi
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/kexec-tools/files/kexec.conf b/sys-apps/kexec-tools/files/kexec.conf
index 74f8b891ce54..aa829b9c2349 100644
--- a/sys-apps/kexec-tools/files/kexec.conf
+++ b/sys-apps/kexec-tools/files/kexec.conf
@@ -1,18 +1,16 @@
-# Boot partition
-#BOOTPART="/boot"
+# Kernel image pathname, relative from /boot.
+KNAME="bzimage"
 
-# Kernel name
-#KNAME="vmlinuz-2.6.10"
-
-# Root partition (should be autodetected)
-#ROOTPART="/dev/hda3"
-
-# Kernel parameters (should be autodetected)
-#KPARAM="splash=silent,theme:emergence"
-
-# Initrd
-#INITRD="/boot/fbsplash-emergence-1024x768"
-
-# Load kexec kernel image into memory during shutdown instead of bootup
-# (default: yes)
-#LOAD_DURING_SHUTDOWN="yes"
+# Additional arguments passed to kexec (8)
+# Following arguments are support:
+#
+# --reuse-cmdline
+#   Use the current boot command line
+#
+# --command-line=string
+#   Use a different command line
+#
+# --initrd=file
+#   Specify an initrd to use
+#
+KEXEC_OPT_ARGS="--reuse-cmdline"
diff --git a/sys-apps/kexec-tools/files/kexec.conf-2.0.3 b/sys-apps/kexec-tools/files/kexec.conf-2.0.3
deleted file mode 100644
index a1d409edabc6..000000000000
--- a/sys-apps/kexec-tools/files/kexec.conf-2.0.3
+++ /dev/null
@@ -1,31 +0,0 @@
-# Load kexec kernel image into memory during shutdown instead of bootup
-# (default: yes)
-#LOAD_DURING_SHUTDOWN="yes"
-
-# Additional arguments passed to kexec (8)
-#KEXEC_OPT_ARGS=""
-
-# Kernel image partition. Mounted automatically if not.
-# (default: /boot)
-#BOOTPART="/boot"
-
-# Root partition (should be autodetected)
-#ROOTPART="/dev/hda3"
-
-# Kernel image pathname, relative from BOOTPART.
-# If it's one of 
-# {kernel-genkernel,bzImage,vmlinuz,kernel}-<currently running kernel version>,
-# or bzImage, vmlinuz (without suffix),
-# then it's automaticaly detected.
-# Setting it to "-" will disable kexec.
-#KNAME="vmlinuz-2.6.10"
-
-# Initrd
-# Same automatic detection restriction as for KNAME apply.
-# initramfs-genkernel-<currently running kernel version>,
-# initrd{,.img}-<currently running kernel version>{,.img}
-# will be detected.
-#INITRD="/boot/fbsplash-emergence-1024x768"
-
-# Kernel parameters (should be autodetected)
-#KPARAM="splash=silent,theme:emergence"
diff --git a/sys-apps/kexec-tools/files/kexec.conf-9999 b/sys-apps/kexec-tools/files/kexec.conf-9999
new file mode 100644
index 000000000000..74f8b891ce54
--- /dev/null
+++ b/sys-apps/kexec-tools/files/kexec.conf-9999
@@ -0,0 +1,18 @@
+# Boot partition
+#BOOTPART="/boot"
+
+# Kernel name
+#KNAME="vmlinuz-2.6.10"
+
+# Root partition (should be autodetected)
+#ROOTPART="/dev/hda3"
+
+# Kernel parameters (should be autodetected)
+#KPARAM="splash=silent,theme:emergence"
+
+# Initrd
+#INITRD="/boot/fbsplash-emergence-1024x768"
+
+# Load kexec kernel image into memory during shutdown instead of bootup
+# (default: yes)
+#LOAD_DURING_SHUTDOWN="yes"
diff --git a/sys-apps/kexec-tools/files/kexec.init-2.0.3 b/sys-apps/kexec-tools/files/kexec.init-2.0.3
deleted file mode 100644
index a2d32f030219..000000000000
--- a/sys-apps/kexec-tools/files/kexec.init-2.0.3
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/files/kexec.init-2.0.3,v 1.2 2013/03/27 11:50:55 jlec Exp $
-
-depend() {
-	need localmount
-}
-
-image_path() {
-	local x= kver=$(uname -r) karch=$(uname -m)
-	BOOTPART="${BOOTPART:-/boot}"
-	for x in "${KNAME:-bzImage}" vmlinuz \
-		bzImage-${kver} vmlinuz-${kver} \
-		kernel-genkernel-${karch}-${kver} \
-		kernel-${kver} kernel-${karch}; do
-		if [[ -e "${BOOTPART}/${x}" ]] ; then
-			echo "${BOOTPART}/${x}"
-			return 0
-		fi
-	done
-
-	return 1
-}
-
-initrd_path() {
-	local x= kver=$(uname -r) karch=$(uname -m)
-	BOOTPART="${BOOTPART:-/boot}"
-	for x in "${INITRD:-initrd}" \
-		initrd.img-${kver} initrd-${kver}.img \
-		initrd-${kver} initramfs-${kver}.img \
-		initramfs-genkernel-${karch}-${kver} ; do
-		if [[ -e "${BOOTPART}/${x}" ]] ; then
-			echo "${BOOTPART}/${x}"
-			return 0
-		fi
-	done
-
-	return 1
-}
-
-load_image() {
-	if [[ "${KNAME}" = "-" ]]; then
-		ebegin "Disabling kexec"
-		kexec -u
-		eend $?
-		return $?
-	fi
-
-	BOOTPART="${BOOTPART:-/boot}"
-	local img="$(image_path)" initrd="$(initrd_path)" mounted=false initrdopt=
-
-	if [[ -z "${img}" ]] || [[ -z "${initrd}" ]]; then
-		# If we cannot find our image, try mounting ${BOOTPART}
-		if ! grep -q " ${BOOTPART} " /proc/mounts; then
-			ebegin "Mounting ${BOOTPART}"
-			mount "${BOOTPART}" && mounted=true
-			eend $? || return $?
-			img="$(image_path)"
-			initrd="$(initrd_path)"
-		fi
-	fi
-
-	if [[ -z "${img}" ]]; then
-		eerror "No kernel image found in ${BOOTPART}!"
-		${mounted} && umount "${BOOTPART}"
-		return 1
-	else
-		ebegin "Loading kernel image ${img} for kexec"
-	fi
-
-	[[ -n "${ROOTPART}" ]] || \
-		ROOTPART="$(readlink -f "$(sed -n '/^\/[^ ]* \/ / s,^\([^ ]*\).*,\1,p' /proc/mounts)")"
-
-	[[ -n "${KPARAM}" ]] || KEXEC_OPT_ARGS+=" --reuse-cmdline"
-
-	[[ -n "${initrd}" ]] && [[ -e "${initrd}" ]] && initrdopt="--initrd=${initrd}"
-
-	einfo "   Setting kexec with ${KEXEC_OPT_ARGS} -l ${img} root=${ROOTPART} ${KPARAM} ${initrdopt}"
-	kexec ${KEXEC_OPT_ARGS} -l "${img}" --append="root=${ROOTPART} ${KPARAM}" ${initrdopt}
-	local res=$?
-
-	${mounted} && umount "${BOOTPART}"
-	eend ${res}
-	return ${res}
-}
-
-start() {
-	if [[ "${LOAD_DURING_SHUTDOWN:-yes}" = "yes" ]]; then
-		image_path > /dev/null || \
-			ewarn "Cannot find kernel image. Please make sure a valid kernel image is present before reboot."
-		return 0
-	else
-		ebegin "Configuring kexec"
-		load_image
-		eend $?
-	fi
-}
-
-stop() {
-	[[ "${LOAD_DURING_SHUTDOWN:-yes}" != "yes" ]] && return 0
-
-	if ! yesno $RC_REBOOT; then
-		einfo "Not rebooting, so disabling"
-		kexec -u
-		return 0
-	fi
-
-	if [[ -f /nokexec ]]; then
-		einfo "Not using kexec during reboot"
-		rm -f /nokexec
-		kexec -u
-		return 0
-	fi
-
-	ebegin "Configuring kexec"
-	load_image
-	eend $?
-}
diff --git a/sys-apps/kexec-tools/files/kexec.init-2.0.4-r2 b/sys-apps/kexec-tools/files/kexec.init-2.0.4-r2
new file mode 100644
index 000000000000..f22566d6a085
--- /dev/null
+++ b/sys-apps/kexec-tools/files/kexec.init-2.0.4-r2
@@ -0,0 +1,165 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/files/kexec.init-2.0.4-r2,v 1.1 2013/09/21 11:35:53 jlec Exp $
+
+depend() {
+	need localmount
+}
+
+image_path() {
+	local x= kver=$(uname -r) karch=$(uname -m)
+	BOOTPART="${BOOTPART:-/boot}"
+	KNAME="${KNAME:-bzImage}"
+	if [ -e "${KNAME}" ]; then
+		echo "${KNAME}"
+		return 0
+	fi
+	for x in "${KNAME#${BOOTPART}}" vmlinuz \
+		bzImage-${kver} vmlinuz-${kver} \
+		kernel-genkernel-${karch}-${kver} \
+		kernel-${kver} kernel-${karch}; do
+		if [ -e "${BOOTPART}/${x}" ]; then
+			echo "${BOOTPART}/${x}"
+			return 0
+		fi
+	done
+
+	return 1
+}
+
+initrd_path() {
+	local x= kver=$(uname -r) karch=$(uname -m)
+	BOOTPART="${BOOTPART:-/boot}"
+	INITRD="${INITRD:-initrd}"
+	if [ -e "${INITRD}" ]; then
+		echo "${INITRD}"
+		return 0
+	fi
+	for x in "${INITRD#${BOOTPART}}" \
+		initrd.img-${kver} initrd-${kver}.img \
+		initrd-${kver} initramfs-${kver}.img \
+		initramfs-genkernel-${karch}-${kver} ; do
+		if [ -e "${BOOTPART}/${x}" ]; then
+			echo "${BOOTPART}/${x}"
+			return 0
+		fi
+	done
+
+	return 1
+}
+
+mount_boot(){
+	local ret
+
+	[ -n "${DONT_MOUNT_BOOT}" ] && return 1
+	grep -q " ${BOOTPART:-/boot} " /proc/mounts && return 1
+
+	BOOTPART="${BOOTPART:-/boot}"
+	ebegin "Mounting ${BOOTPART}"
+	mount "${BOOTPART}"; ret=$?
+	eend ${ret}
+	return ${ret}
+}
+
+load_image() {
+	local ret
+	if [ "${KNAME}" = "-" ]; then
+		ebegin "Disabling kexec"
+		kexec -u; ret=$?
+		eend ${ret}
+		return ${ret}
+	fi
+
+	BOOTPART="${BOOTPART:-/boot}"
+	local img= initrd="$(initrd_path)" mounted=false initrdopt=
+
+	if ! img="$(image_path)"; then
+		if mount_boot; then
+			if img="$(image_path)"; then
+				mounted=true
+				initrd="$(initrd_path)"
+			else
+				eerror "No kernel image found in ${BOOTPART}!"
+				umount "${BOOTPART}"
+				return 1
+			fi
+		else
+			eerror "No kernel image found in ${BOOTPART}!"
+			return 1
+		fi
+	fi
+
+	if [ -n "${INITRD}" ] && \
+		! [ "${BOOTPART}/${INITRD#${BOOTPART}}" = "${initrd}" ]; then
+		eerror "Requested initrd: ${INITRD#${BOOTPART}}"
+		eerror "could not be found"
+		return 1
+	fi
+
+	[ -n "${ROOTPART}" ] || \
+		ROOTPART="$(readlink -f "$(sed -n '/^\/[^ ]* \/ / s,^\([^ ]*\).*,\1,p' /proc/mounts)")"
+
+	[ -n "${KPARAM}" ] || KEXEC_OPT_ARGS="${KEXEC_OPT_ARGS} --reuse-cmdline"
+
+	[ -n "${initrd}" ] && [ -e "${initrd}" ] && initrdopt="--initrd=${initrd}"
+
+	local msg=
+	[ -n "${initrd}" ] && \
+		msg="with ${initrd}"
+	einfo "Using kernel image ${img} ${msg} for kexec"
+
+	ebegin "Setting kexec with ${KEXEC_OPT_ARGS} -l ${img} root=${ROOTPART} ${KPARAM} ${initrdopt}"
+	kexec ${KEXEC_OPT_ARGS} -l "${img}" --append="root=${ROOTPART} ${KPARAM}" ${initrdopt}
+	local res=$?
+
+	${mounted} && umount "${BOOTPART}"
+	eend ${res}
+	return ${res}
+}
+
+start() {
+	if [ "${LOAD_DURING_SHUTDOWN:-yes}" = "yes" ]; then
+		local ret=0
+		BOOTPART="${BOOTPART:-/boot}"
+		if mount_boot; then
+			mounted=true
+		fi
+		if ! image_path > /dev/null; then
+			ewarn "Cannot find kernel image!"
+			ewarn "Please make sure a valid kernel image is present before reboot."
+			return 0
+		fi
+		if [ -n "${mounted}" ]; then
+			ebegin "Unmounting ${BOOTPART}"
+			umount "${BOOTPART}"; ret=$?
+			eend ${ret}
+		fi
+		return ${ret}
+	else
+		ebegin "Configuring kexec"
+		load_image
+		eend $?
+	fi
+}
+
+stop() {
+	[ "${LOAD_DURING_SHUTDOWN:-yes}" != "yes" ] && return 0
+
+	if ! yesno $RC_REBOOT; then
+		einfo "Not rebooting, so disabling"
+		kexec -u
+		return 0
+	fi
+
+	if [ -f /nokexec ]; then
+		einfo "Not using kexec during reboot"
+		rm -f /nokexec
+		kexec -u
+		return 0
+	fi
+
+	ebegin "Configuring kexec"
+	load_image
+	eend $?
+}
diff --git a/sys-apps/kexec-tools/files/kexec.init b/sys-apps/kexec-tools/files/kexec.init-9999
index 80edb435c89b..56a092832ec8 100755..100644
--- a/sys-apps/kexec-tools/files/kexec.init
+++ b/sys-apps/kexec-tools/files/kexec.init-9999
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/files/kexec.init,v 1.15 2010/10/29 06:44:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/files/kexec.init-9999,v 1.1 2013/09/21 11:35:53 jlec Exp $
 
 depend() {
 	need localmount
diff --git a/sys-apps/kexec-tools/files/kexec.init-ng b/sys-apps/kexec-tools/files/kexec.init-ng
deleted file mode 100644
index 20a03e3a35bb..000000000000
--- a/sys-apps/kexec-tools/files/kexec.init-ng
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/files/kexec.init-ng,v 1.1 2011/03/27 08:31:50 jlec Exp $
-
-depend() {
-	need localmount
-}
-
-image_path() {
-	local x= kver=$(uname -r)
-	for x in "${KNAME:-bzImage}" vmlinuz \
-		bzImage-"${kver}" vmlinuz-"${kver}" ; do
-		if [ -e "${BOOTPART}/${x}" ] ; then
-			echo "${BOOTPART}/${x}"
-			return 0
-		fi
-	done
-
-	return 1
-}
-
-load_image() {
-	if [ "${KNAME}" = "-" ] ; then
-		ebegin "Disabling kexec"
-		kexec -u
-		eend $?
-		return $?
-	fi
-
-	BOOTPART="${BOOTPART:-/boot}"
-	local img="$(image_path)" mounted=false initrdopt=
-
-	if [ -z "${img}" ] ; then
-		# If we cannot find our image, try mounting ${BOOTPART}
-		if ! grep -q " ${BOOTPART} " /proc/mounts ; then
-			ebegin "Mounting ${BOOTPART}"
-			mount "${BOOTPART}" && mounted=true
-			eend $? || return $?
-			img="$(image_path)"
-		fi
-	fi
-
-	if [ -z "${img}" ] ; then
-		eerror "No kernel image found in ${BOOTPART}!"
-		${mounted} && umount "${BOOTPART}"
-		return 1
-	fi
-
-	ebegin "Loading kernel image ${img} for kexec"
-	if [ -z "${ROOTPART}" ] ; then
-		ROOTPART="$(readlink -f "$(sed -n '/^\/[^ ]* \/ / s,^\([^ ]*\).*,\1,p' /etc/mtab)")"
-	fi
-	if [ -z "${KPARAM}" ] ; then
-		KPARAM="$(sed -e 's/ /\n/g' /proc/cmdline | grep -v -e "^root=" | tr '\n' ' ')"
-	fi
-
-	# Use the default initrd if it exists and none other given
-	if  [ -z "${INITRD}" -a -e "${BOOTPART}"/initrd ] ; then
-	    INITRD="${BOOTPART}/initrd"
-	fi
-	if [ -e "${INITRD}" ] ; then
-	    initrdopt="--initrd=${INITRD}"
-	fi
-
-	kexec -l "${img}" --append="root=${ROOTPART} ${KPARAM}" ${initrdopt}
-	local res=$?
-
-	${mounted} && umount "${BOOTPART}"
-	eend ${res}
-	return ${res}
-}
-
-start() {
-	[ "${LOAD_DURING_SHUTDOWN:-yes}" = "yes" ] && return 0
-
-	ebegin "Configuring kexec"
-	load_image
-	eend 0
-}
-
-stop() {
-	[ "${LOAD_DURING_SHUTDOWN:-yes}" != "yes" ] && return 0
-
-	ebegin "Configuring kexec"
-	if [ "`/sbin/runlevel|/bin/cut -c 3`" != "6" ]; then
-		einfo "Not rebooting, so disabling"
-		kexec -u
-		return 0
-	fi
-
-	if [ "`/sbin/runlevel|/bin/cut -c 3`" = "6" ] && [ -f /nokexec ]; then
-		einfo "Not using kexec during reboot"
-		rm -f /nokexec
-		kexec -u
-		return 0
-	fi
-
-	load_image
-	eend $?
-}
diff --git a/sys-apps/kexec-tools/files/kexec.service b/sys-apps/kexec-tools/files/kexec.service
new file mode 100644
index 000000000000..289aae0df0b1
--- /dev/null
+++ b/sys-apps/kexec-tools/files/kexec.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=Gracefully restart the box
+Documentation=man:kexec(8)
+After=boot.mount
+Before=shutdown.target umount.target final.target
+ConditionPathExists=!/nokexec
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+EnvironmentFile=/etc/kexec.conf
+ExecStart=/usr/sbin/kexec -l /boot/${KNAME} ${KEXEC_OPT_ARGS}
+ExecStop=/usr/sbin/kexec -l /boot/${KNAME} ${KEXEC_OPT_ARGS}
+
+[Install]
+WantedBy=multi-user.target
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.4-r2.ebuild b/sys-apps/kexec-tools/kexec-tools-2.0.4-r2.ebuild
new file mode 100644
index 000000000000..9aa786dcbad7
--- /dev/null
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.4-r2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/kexec-tools-2.0.4-r2.ebuild,v 1.1 2013/09/21 11:35:53 jlec Exp $
+
+EAPI=5
+
+inherit autotools-utils flag-o-matic linux-info systemd
+
+DESCRIPTION="Load another kernel from the currently executing Linux kernel"
+HOMEPAGE="http://kernel.org/pub/linux/utils/kernel/kexec/"
+SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="booke lzma xen zlib"
+
+DEPEND="
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="~KEXEC"
+
+PATCHES=(
+		"${FILESDIR}"/${PN}-2.0.0-respect-LDFLAGS.patch
+		"${FILESDIR}"/${P}-disable-kexec-test.patch
+	)
+
+pkg_setup() {
+	# GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC)
+	export ASFLAGS="${CCASFLAGS}"
+	# to disable the -fPIE -pie in the hardened compiler
+	if gcc-specs-pie ; then
+		filter-flags -fPIE
+		append-ldflags -nopie
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with booke)
+		$(use_with lzma)
+		$(use_with xen)
+		$(use_with zlib)
+		)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	dodoc "${FILESDIR}"/README.Gentoo
+
+	newinitd "${FILESDIR}"/kexec.init-${PVR} kexec
+	newconfd "${FILESDIR}"/kexec.conf-${PV} kexec
+
+	insinto /etc
+	doins "${FILESDIR}"/kexec.conf
+
+	systemd_dounit "${FILESDIR}"/kexec.service
+}
+
+pkg_postinst() {
+	if systemd_is_booted || has_version sys-apps/systemd; then
+		elog "For systemd support the new config file is"
+		elog "   /etc/kexec.conf"
+		elog "Please adopt it to your needs as there is no autoconfig anymore"
+	fi
+}
diff --git a/sys-apps/kexec-tools/kexec-tools-9999.ebuild b/sys-apps/kexec-tools/kexec-tools-9999.ebuild
index 1bd1daa82059..a3ab07661f38 100644
--- a/sys-apps/kexec-tools/kexec-tools-9999.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-9999.ebuild
@@ -1,39 +1,70 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/kexec-tools-9999.ebuild,v 1.7 2011/09/21 08:31:54 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/kexec-tools-9999.ebuild,v 1.8 2013/09/21 11:35:53 jlec Exp $
 
-EAPI=2
+EAPI=5
 
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git"
-inherit git-2 autotools
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils flag-o-matic git-2 linux-info systemd
 
 DESCRIPTION="Load another kernel from the currently executing Linux kernel"
 HOMEPAGE="http://kernel.org/pub/linux/utils/kernel/kexec/"
 SRC_URI=""
+EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="xen zlib"
-DEPEND="zlib? ( sys-libs/zlib )"
+IUSE="booke lzma xen zlib"
+
+DEPEND="
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib )"
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-	git-2_src_unpack
-	cd "${S}"
-	eautoreconf
+CONFIG_CHECK="~KEXEC"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.0.4-disable-kexec-test.patch )
+
+pkg_setup() {
+	# GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC)
+	export ASFLAGS="${CCASFLAGS}"
+	# to disable the -fPIE -pie in the hardened compiler
+	if gcc-specs-pie ; then
+		filter-flags -fPIE
+		append-ldflags -nopie
+	fi
 }
 
 src_configure() {
-	econf $(use_with zlib) $(use_with xen)
+	local myeconfargs=(
+		$(use_with booke)
+		$(use_with lzma)
+		$(use_with xen)
+		$(use_with zlib)
+		)
+	autotools-utils_src_configure
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
+	autotools-utils_src_install
+
+	dodoc "${FILESDIR}"/README.Gentoo
+
+	newinitd "${FILESDIR}"/kexec.init-${PV} kexec
+	newconfd "${FILESDIR}"/kexec.conf-${PV} kexec
 
-	doman kexec/kexec.8
-	dodoc News AUTHORS TODO doc/*.txt
+	insinto /etc
+	doins "${FILESDIR}"/kexec.conf
+
+	systemd_dounit "${FILESDIR}"/kexec.service
+}
 
-	newinitd "${FILESDIR}"/kexec.init kexec || die
-	newconfd "${FILESDIR}"/kexec.conf kexec || die
+pkg_postinst() {
+	if systemd_is_booted || has_version sys-apps/systemd; then
+		elog "For systemd support the new config file is"
+		elog "   /etc/kexec.conf"
+		elog "Please adopt it to your needs as there is no autoconfig anymore"
+	fi
 }