summaryrefslogtreecommitdiff
path: root/virtual
diff options
context:
space:
mode:
authorrandomdan <randomdan@localhost>2013-03-21 17:22:38 +0000
committerrandomdan <randomdan@localhost>2013-03-21 17:22:38 +0000
commit9b256a7cc417d2bdec764b973b29228f8b5bcc23 (patch)
treea23107eb7af63be4fa3b1dc717b2fef228ca4d9f /virtual
parentBugfix hack and rollback point (diff)
downloadportage-9b256a7cc417d2bdec764b973b29228f8b5bcc23.tar.bz2
portage-9b256a7cc417d2bdec764b973b29228f8b5bcc23.tar.xz
portage-9b256a7cc417d2bdec764b973b29228f8b5bcc23.zip
Add kexec support
Diffstat (limited to 'virtual')
-rw-r--r--virtual/miller-base/Manifest4
-rwxr-xr-xvirtual/miller-base/files/update-kernel9
-rw-r--r--virtual/miller-base/miller-base-9-r7.ebuild (renamed from virtual/miller-base/miller-base-9-r6.ebuild)2
3 files changed, 12 insertions, 3 deletions
diff --git a/virtual/miller-base/Manifest b/virtual/miller-base/Manifest
index 406fae7..dd46c39 100644
--- a/virtual/miller-base/Manifest
+++ b/virtual/miller-base/Manifest
@@ -46,11 +46,11 @@ AUX service-check 28 SHA256 c15c00ba79267a7b47c73a361226f263c852f94ba3096582bb38
AUX sync-distclean-exec.cron 60 SHA256 043df18d533148d33abe2f2cf588953b0193c4a47ea0a428e5e2d531ee4d5d0e SHA512 e8075f330b879f3888f47086e5fdd0144be7decbe264a105e5071f851065bd6eb55a22be6fb4eb90a4e3bca00e76fee79f372adc5c3a8f25660c61bd9379ab0f WHIRLPOOL f1afae03bdf094cb08d3389cf329d10debd89c73f360c0e16f686cc267eb49c1e5780bbfe78fdd8518c9cdba1cefe6849b598c9f8d5da667516d705bd650c966
AUX update-autoshutdown 88 SHA256 e90d95d158222c493d4fbf8ebcd9c2927535048d97ee743fe658d47e50aa6fb6 SHA512 0f2480fe16ae69279937cab620fa2a4764114659759654b63e844415ba937e1ede8aa3974979c7adec3b8dbb8bf2f68eb80f7da5c97daeccd69df28e8fbf0430 WHIRLPOOL f4619f0bf51faf9d1ab572f32c14b7fc9dec1b8b101f78e8c80e7fa3fb3832567dbeba462f4f27490a3398916aa6f08e1d7e66d69ed4b43c68451bbf15187e00
AUX update-install2 457 SHA256 40fcd47ac532d65e0ea54712df2fc0e0ae1685cb2afd8827082d0ee5575815c7 SHA512 531b7e48c40b4b404c3b5e378ddad6d800a6d637708c0e3755de08e9693abe8785ba5281afcfc835aa391b4eba7345170523fc1f66f2192e5f17abf2d77ee98d WHIRLPOOL 5fa8d93af40819a210b976f8bcd3f1d5ea1ac38d47e208c81014beb0c3b5bdf3304d479eb37e4ca11fc7ea454b947f05bb22a525195f10ec131c571913a6f2ba
-AUX update-kernel 604 SHA256 64cdff8a022873296fe69e6c35eefb163304e4dde04898247661d1c2d7beeb2c SHA512 6e46f9a4971644e93eaa013e737b0dc28055b982dfd4e583a38979929d3a894b9fce7064a47f69adab49def753d2d17987a9b3ec798e8b5564f7d252367ad5d0 WHIRLPOOL 6d13eb151dd6d7afcb316b08c2ec23cf086a8440abccb95bf64ff5fbc722672c4bfb02785c761c2415dfd38bd20ac9f21d0032adde44bbb71218929e9a0f1969
+AUX update-kernel 815 SHA256 054742e544c40656b77baff6a748654cf78179c3887945f7e3b30a8d4e274d9c SHA512 9d4833374c09f74be9bb421224f3648f79c9a73ebd6b06abfb05c4acf0a3fb6c546bff678669fa1e4e26ef3dcf4f58403acfedde912bede4e4281b09f1f5cfd0 WHIRLPOOL 074535d8aad65a59a41ebd15b5eebe1f96d294a70fc5affb270a9c72d4bc94750953f8bdb911aaf262c2b86003f7f93f35be435812bfdc6ebd4b0038875e4d84
AUX update.portage.cron 171 SHA256 394b727e294166db136d5b5c46ab0ac180952d6f20cd93b4a356a2cfc9bedf03 SHA512 02ca67cf126591a18f5243261c4bcb5ec2f67c75ded69709932d2972bcd43c500eb5d82160f0d23539141285670d12713e12f1f55aba5ca02ad72e4672ff18fa WHIRLPOOL 07630c59b46c9ae0fd8369e5d66375bcc5ad901473721746e1ad8983dbe43bf5182302149334d4367cc49c6da853ca56a2733b2c0e53d953f7b5e55b67bae17f
AUX update.portage.cron-2 180 SHA256 19f7c7171b3c86f60605f6576dd14ceccd1f156c1de600fefe66d00554d153b6 SHA512 742b9e9f792a9e9445a515320b9432fd6f64d148a383c6abd142d44af5806f0c4126800b31261a6b37c7e71fc4d29777ceb68f0019695bd07b510f3393b351b5 WHIRLPOOL a5facd48808b08d561c762d14f82bf42f5dc61cf7adcf6fb59295a5b5fe1b78ed62621998a84d08d4524a3640a43d7fc64804c5331704cb176079bb0d48bc68d
AUX weekly-av-scan.cron 257 SHA256 79c7bca330ec2c2e7d3fe542d8744cdeea84cf97f325f3554dbac849fe80d020 SHA512 c4ff727ab7f9d492a35c42d0b8f1a4153e61e8ea5282f5bdfb2377a0b7af640bea0aa7089a2ac518fe4c771421014c8827022be0ca43b0842bd55a880d3c8bd2 WHIRLPOOL 4064b8bf952fe143070de7d8ecf091ccfc2fb542fb8a8e31da265451971627613d61f33e04cde5b3ba5c9407588f76d26cb2ac1ba091112d6a3e0f764398bfbb
AUX weekly-distclean-exec-eclean.cron 40 SHA256 dbb37593b994102324c5a24b5d5d21597c215924a29d065d84b8c64af3049b38 SHA512 9caeec20a9c19c0eb6c73d1c06b3f0c3ba0477f82b6390ab1392ffbad9e22a3b39d7c58c2d4b58d4a04729b8c3be2adc2735d38a8dd4a5e01862a4911bf67d8e WHIRLPOOL e7e03e6a02883dd35e8a55a67b53f070b7eece1613b5ad60a2d3bd6940ff2fa3319e7371a0b1fe78481e235d665734ae3c8fb158e22c315e15794b7ff4337659
AUX weekly-distclean-exec.cron 664 SHA256 98808e9a3402beea0f023db32cd09df6195d608256672e01d7f05e21536af141 SHA512 a0c52724253294dd9693577b38e9fa85e328c2c251b6230a436975accc6cf72abbff6083eb0a6c0bc07145ef592d2d224d88a29acb3ef958df1eeeeafc7672a0 WHIRLPOOL 3a894420a2fd430bf0366c995000b851893dad99bba48fa778c95c5f80fa9cced938a6c06c6e4b2dc7909380a0875da733445638cdda8b91350f03b6fe28605e
AUX write-new-updates 123 SHA256 98d35a82d75ed3e4a7b9857c57ab41f3cbf60a82dc255b7c62d372e0ed410d84 SHA512 02d696e3abffe919fdbea7f580efc4ee8988f1f10c815dfaf00b0bf7ba4b3386e935883f28821d5c064c8706769eed2e55ba7cc184d4355c74e75fdf1feba116 WHIRLPOOL 8a6b1a03e7552701d7053c7eefe092ac0473940eff419445f6c45e959a910c8920cdde8b512699210ed578ad7312657e638710ea3d66fd6ad9ead32299d2f3b8
-EBUILD miller-base-9-r6.ebuild 3553 SHA256 674bb9de50b4daef01ba3c6609a1d7a87fe07a66929013ba70fc8fa5321533de SHA512 681a2e74b0d943bc5e9c49231b71a3fe5ae58c7c9e7e1ba857e195cb280660a437068f5c0b4b5b222815a78b8123a58e59d0d5bfd00dfa29ab282c8a2d78c854 WHIRLPOOL 1493a7ba2d804222f43d7e7c1aade6256c01d54b9fba9f2950dfc0576ff5c28ccb664b4f09789b9335a24fa38cc669f9e83d34456c40588b5fe9e3f319f33b37
+EBUILD miller-base-9-r7.ebuild 3593 SHA256 9f6e1761281a10a1311ae7443c3458e505e7f502e7a6269bb15cb25ac47ff112 SHA512 60b6ede6d2bf4a7e9e50d1b42c33d3f665de3f3ec9a88666b5033f0c6a7247a1b05b511d5aadf8e72fb90e7a67008053088b7d57696a39af5ebc213b3772ce64 WHIRLPOOL 49605815d5be677b3bf90d9406edea702265f2908717489789a71121b70001609c625d41f5bd6b5349316dd47976f689cd461c7b98a1277c17beb82959a28802
diff --git a/virtual/miller-base/files/update-kernel b/virtual/miller-base/files/update-kernel
index dc252a3..1f50c98 100755
--- a/virtual/miller-base/files/update-kernel
+++ b/virtual/miller-base/files/update-kernel
@@ -7,9 +7,16 @@ make modules -j2 || ( echo "Make modules failed" ; exit 1 )
make modules_install -j2 || ( echo "Make modules install failed" ; exit 1 )
emerge -q1 @module-rebuild || exit 1
make install -j2 || ( echo "Make install failed" ; exit 1 )
+
+KV=$(head /boot/config -n3 | tail -n1 | cut -d ' ' -f 3)
if [ -x /usr/bin/dracut ] ; then
- KV=$(head /boot/config -n3 | tail -n1 | cut -d ' ' -f 3)
/usr/bin/dracut -H -f --lzma /boot/initramfs-$KV.img $KV
fi
+if [ -x /usr/sbin/kexec ] ; then
+ if [ -x /run/openrc/started/kexec ] ; then
+ /run/openrc/started/kexec stop
+ fi
+ kexec -l "/boot/vmlinuz-$KV" --append="`cat /proc/cmdline`" --initrd=/boot/initramfs-$KV.img
+fi
grub2-mkconfig -o /boot/grub2/grub.cfg
diff --git a/virtual/miller-base/miller-base-9-r6.ebuild b/virtual/miller-base/miller-base-9-r7.ebuild
index 642457e..514d2c1 100644
--- a/virtual/miller-base/miller-base-9-r6.ebuild
+++ b/virtual/miller-base/miller-base-9-r7.ebuild
@@ -8,6 +8,8 @@ minimal autoupdate autoshutdown autoservicerestart lvmboot lvmroot sw-suspend ra
video_cards_nvidia video_cards_radeon"
DEPEND="
+ sys-apps/kexec-tools
+ sys-process/htop
sys-apps/less
app-admin/eclean-kernel
!minimal? ( www-servers/apache )