summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Shvetsov <alexxy@gentoo.org>2009-07-23 17:53:58 +0000
committerAlexey Shvetsov <alexxy@gentoo.org>2009-07-23 17:53:58 +0000
commitaa20b917282c45814bc520cf8d81ad07fb8f3cdd (patch)
treebd4c932d94945b1f94b8065280c2835a1ec7b92d /sys-block
parent[sys-block/aoetools] version bump. thanks to Andrei Vinogradov aka slepnoga (diff)
downloadhistorical-aa20b917282c45814bc520cf8d81ad07fb8f3cdd.tar.gz
historical-aa20b917282c45814bc520cf8d81ad07fb8f3cdd.tar.bz2
historical-aa20b917282c45814bc520cf8d81ad07fb8f3cdd.zip
[sys-block/vblade] Fix init.d to work with openrc. thanks to Andrei Vinogradov aka slepnoga. fix bug #218043
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
Diffstat (limited to 'sys-block')
-rw-r--r--sys-block/vblade/ChangeLog9
-rw-r--r--sys-block/vblade/files/init.d-vblade.vblade018
2 files changed, 20 insertions, 7 deletions
diff --git a/sys-block/vblade/ChangeLog b/sys-block/vblade/ChangeLog
index 5c8c097bb6fc..36d70392bacd 100644
--- a/sys-block/vblade/ChangeLog
+++ b/sys-block/vblade/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-block/vblade
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/vblade/ChangeLog,v 1.21 2008/08/03 23:53:19 caleb Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/vblade/ChangeLog,v 1.22 2009/07/23 17:53:58 alexxy Exp $
+
+ 23 Jul 2009; Alexey Shvetsov <alexxy@gentoo.org>
+ files/init.d-vblade.vblade0:
+ Fix init.d to work with openrc. thanks to Andrei Vinogradov aka slepnoga.
+ fix bug #218043
*vblade-18 (03 Aug 2008)
diff --git a/sys-block/vblade/files/init.d-vblade.vblade0 b/sys-block/vblade/files/init.d-vblade.vblade0
index 198d0939209b..f27d4d8dee34 100644
--- a/sys-block/vblade/files/init.d-vblade.vblade0
+++ b/sys-block/vblade/files/init.d-vblade.vblade0
@@ -1,7 +1,6 @@
#!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-block/vblade/files/init.d-vblade.vblade0,v 1.4 2008/08/03 23:53:20 caleb Exp $
opts="${opts} checkconfig"
@@ -9,9 +8,18 @@ depend() {
need net
}
-conf="$(add_suffix /etc/conf.d/vblade)"
-[[ -e "${conf}" ]] && source "${conf}"
-vblade_name="${myservice#*.}"
+# bug #218043
+
+ if [ ! -f /etc/init.d/sysfs ]; then
+ conf="$(add_suffix /etc/conf.d/vblade)"
+ [[ -e "${conf}" ]] && source "${conf}"
+ vblade_name="${myservice#*.}"
+ else
+ conf="/etc/conf.d/vblade"
+ [[ -e "${conf}" ]] && source "${conf}"
+ vblade_name="${RC_SVCNAME#*.}"
+ fi
+
vblade_conf_variable="config_${vblade_name}"
vblade_conf="${!vblade_conf_variable}"
pidfile="/var/run/vblade-${vblade_name}.pid"