summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Goldstein <cardoe@gentoo.org>2007-05-09 16:36:51 +0000
committerDoug Goldstein <cardoe@gentoo.org>2007-05-09 16:36:51 +0000
commitcda3589608af356110705d8a5b697b25da6454d3 (patch)
treed13948b9e4027603133737bb4f4898ee1c39f528 /sys-fs/lvm2
parent kapptemplate, kioslave and umbrello update, see split ebuilds for more infor... (diff)
downloadgentoo-2-cda3589608af356110705d8a5b697b25da6454d3.tar.gz
gentoo-2-cda3589608af356110705d8a5b697b25da6454d3.tar.bz2
gentoo-2-cda3589608af356110705d8a5b697b25da6454d3.zip
added baselayout-2 compatible init script from bug #175983
(Portage version: 2.1.2.7)
Diffstat (limited to 'sys-fs/lvm2')
-rw-r--r--sys-fs/lvm2/ChangeLog6
-rw-r--r--sys-fs/lvm2/files/lvm.rc32
-rw-r--r--sys-fs/lvm2/lvm2-2.02.17.ebuild5
3 files changed, 40 insertions, 3 deletions
diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog
index 8801ec98a802..0097a86b227c 100644
--- a/sys-fs/lvm2/ChangeLog
+++ b/sys-fs/lvm2/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-fs/lvm2
# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.94 2007/02/22 00:51:41 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.95 2007/05/09 16:36:51 cardoe Exp $
+
+ 09 May 2007; Doug Goldstein <cardoe@gentoo.org> +files/lvm.rc,
+ lvm2-2.02.17.ebuild:
+ added baselayout-2 compatible init script from bug #175983
22 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
Redigest for Manifest2
diff --git a/sys-fs/lvm2/files/lvm.rc b/sys-fs/lvm2/files/lvm.rc
new file mode 100644
index 000000000000..0a0e749932d9
--- /dev/null
+++ b/sys-fs/lvm2/files/lvm.rc
@@ -0,0 +1,32 @@
+#!/sbin/runscript
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvm.rc,v 1.1 2007/05/09 16:36:51 cardoe Exp $
+
+depend() {
+ if [ -e /lib/librc.so ]; then
+ # on baselayout-1 this causes
+ # dependency-cycles with checkroot (before *)
+ before checkroot
+ fi
+}
+
+start() {
+ if [ ! -e /lib/librc.so ]; then
+ eerror "The $SVCNAME init-script is written for baselayout-2!"
+ eerror "Please do not use it with baselayout-1!".
+ return 1
+ fi
+
+ # call the old addon to do the real work
+ local ADDON=/lib/rcscripts/addons/${SVCNAME}-start.sh
+ [ -e "${ADDON}" ] && . "${ADDON}"
+}
+
+stop() {
+ # call the old addon to do the real work
+ local ADDON=/lib/rcscripts/addons/${SVCNAME}-stop.sh
+ [ -e "${ADDON}" ] && . "${ADDON}"
+}
+
+# vim:ts=4
diff --git a/sys-fs/lvm2/lvm2-2.02.17.ebuild b/sys-fs/lvm2/lvm2-2.02.17.ebuild
index c84d9318ed61..303d7538727a 100644
--- a/sys-fs/lvm2/lvm2-2.02.17.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.17.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.17.ebuild,v 1.1 2006/12/21 23:27:57 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.17.ebuild,v 1.2 2007/05/09 16:36:51 cardoe Exp $
inherit eutils
@@ -94,6 +94,7 @@ src_install() {
insinto /lib/rcscripts/addons
newins ${FILESDIR}/lvm2-start.sh lvm-start.sh || die
newins ${FILESDIR}/lvm2-stop.sh lvm-stop.sh || die
+ newinitd ${FILESIDR}/lvm.rc lvm || die
if use clvm; then
newinitd ${FILESDIR}/clvmd.rc clvmd || die
fi