diff options
| author |   Peter Volkov <pva@gentoo.org> | 2011-04-01 10:31:46 +0000 |
|---|---|---|
| committer | Peter Volkov <pva@gentoo.org> | 2011-04-01 10:31:46 +0000 |
| commit | deece8f89d2cd08e265dc0ea1c2a6fb3942de9ad (patch) | |
| tree | 65037b88c3a0c500355e89e6e0aaef3fece08e18 | |
| parent | sys-cluster/vzctl: fix vzeventd (diff) | |
| download | pva-deece8f89d2cd08e265dc0ea1c2a6fb3942de9ad.tar.gz pva-deece8f89d2cd08e265dc0ea1c2a6fb3942de9ad.tar.bz2 pva-deece8f89d2cd08e265dc0ea1c2a6fb3942de9ad.zip | |
sys-cluster/vzctl: small update.
svn path=/; revision=476
| -rw-r--r-- | sys-cluster/vzctl/Manifest | 4 | ||||
| -rw-r--r-- | sys-cluster/vzctl/files/vzctl-3.0.26.2-vzeventd.patch | 34 |
2 files changed, 30 insertions, 8 deletions
diff --git a/sys-cluster/vzctl/Manifest b/sys-cluster/vzctl/Manifest index 4973a12..d384573 100644 --- a/sys-cluster/vzctl/Manifest +++ b/sys-cluster/vzctl/Manifest @@ -1,5 +1,5 @@ -AUX vzctl-3.0.26.2-vzeventd.patch 1643 RMD160 235708434edf731723feb5139e4226bfe3d14e5b SHA1 efe6777f654a760592abdf2eb162a73656ddb5d4 SHA256 b304c3e8fa374a3f7163d357c006339f5212027b65583407d7538d8a0b96348e +AUX vzctl-3.0.26.2-vzeventd.patch 2315 RMD160 ebc24de1454ccdb6375be8562dbde0c0e233ecd0 SHA1 1b52d832b09dfc55e63e9c87324734311f6f27a6 SHA256 1f767c686841f24432ac4e75a9743b41362e096fbb01d99263e82853636c8c9e DIST vzctl-3.0.26.2.tar.bz2 405656 RMD160 e67c18ccf54b92a12cd7d3470a2fc302869c9d98 SHA1 cbdb995999f96bf2192e820dccad222a0548ee0e SHA256 6533c15c967a294bf7566a2d0c8b486519f11af22d669df518f451510256887f -EBUILD vzctl-3.0.26.2-r1.ebuild 2791 RMD160 8fc7a9be11c8791792896fdff60d145533a5773a SHA1 5817b30744ef297b78c77d0466322909acba8c49 SHA256 c61a4d2b780c2c9fcddf1ab343a4675d617abf6580908542bbc1f8e6df63da29 +EBUILD vzctl-3.0.26.2-r1.ebuild 2355 RMD160 7eaa93a1e62f4fbc4d3fd37655a2ce6dab5e8f54 SHA1 7be76147664939798d7cce0a1b0a79027de3c03b SHA256 ec4e21bdf9e2047f78217f0fe899f12a82c7c4fdefad830ddc686f5ce427da89 MISC ChangeLog 15778 RMD160 83b14d646874d98d7f9837a8ff1d4f586cd6c949 SHA1 99be2147cf37e7e362d9edfde4bb7e6ac2649318 SHA256 ce0aa0d4e66d73a556e1663e78084eee2075ffa7d18f2ec41db3ef163678f3f9 MISC metadata.xml 250 RMD160 859a9aa257ba731f151779434edc614d186d86cf SHA1 0e65923b7b0996ac7e063048e2fe5814453407b7 SHA256 70752023c9e02de0ce3540c4c09bc3256c72568be427bb5c7e9886745b5d2215 diff --git a/sys-cluster/vzctl/files/vzctl-3.0.26.2-vzeventd.patch b/sys-cluster/vzctl/files/vzctl-3.0.26.2-vzeventd.patch index 6c0b375..620c86d 100644 --- a/sys-cluster/vzctl/files/vzctl-3.0.26.2-vzeventd.patch +++ b/sys-cluster/vzctl/files/vzctl-3.0.26.2-vzeventd.patch @@ -1,8 +1,24 @@ +From f24b1603090c6d4af163d42eff620fcfaa7c6297 Mon Sep 17 00:00:00 2001 +From: Peter Volkov <pva@gentoo.org> +Date: Fri, 1 Apr 2011 14:25:45 +0400 +Subject: [PATCH] vzeventd-gentoo: set reboot_event, solid kernel + +Allow it to work when modules are built in (MODULES_DISABLED=yes). +Set /sys/module/vzevent/parameters/reboot_event=1 on service startup. +Small clenups. + +Fixes Gentoo bugs: +http://bugs.gentoo.org/show_bug.cgi?id=361453 +http://bugs.gentoo.org/show_bug.cgi?id=361457 +--- + etc/init.d/vzeventd-gentoo.in | 40 ++++++++++++++++++++++++++++------------ + 1 files changed, 28 insertions(+), 12 deletions(-) + diff --git a/etc/init.d/vzeventd-gentoo.in b/etc/init.d/vzeventd-gentoo.in -index e8fe64e..c4b99a7 100644 +index e8fe64e..2c0da26 100644 --- a/etc/init.d/vzeventd-gentoo.in +++ b/etc/init.d/vzeventd-gentoo.in -@@ -6,25 +6,38 @@ depend() { +@@ -6,25 +6,41 @@ depend() { } check_config() { @@ -14,13 +30,16 @@ index e8fe64e..c4b99a7 100644 } +load_module() { -+ local rv=0 + if [ "${MODULES_DISABLED}" != "yes" ]; then ++ local rv=0 + ebegin "Loading vzevent module" + modprobe -r vzevent >/dev/null 2>&1 + modprobe vzevent reboot_event=1 >/dev/null 2>&1 + rv=$? -+ eend ${rv} ++ if [ ${rv} -ne 0 ]; then ++ eend ${rv} ++ return ${rv} ++ fi + fi + + local param=/sys/module/vzevent/parameters/reboot_event @@ -30,7 +49,7 @@ index e8fe64e..c4b99a7 100644 + ewarn "echo 1 > ${param}" + echo 1 > "${param}" + fi -+ return ${rc} ++ return 0 +} + start() { @@ -52,7 +71,7 @@ index e8fe64e..c4b99a7 100644 --pidfile /var/run/vzeventd.pid \ -- ${VZEVENTD_OPTS} eend $? -@@ -33,7 +46,7 @@ start() { +@@ -33,7 +49,7 @@ start() { stop() { check_config || return ebegin "Stopping vzeventd" @@ -61,3 +80,6 @@ index e8fe64e..c4b99a7 100644 --pidfile /var/run/vzeventd.pid eend $? } +-- +1.7.3.4 + |