fix baselayout-2 init script to use start_addon

(Portage version: 2.1.3.11)

4 files changed, 101 insertions, 1 deletions

diff --git a/sys-fs/device-mapper/ChangeLog b/sys-fs/device-mapper/ChangeLog
index fa2ecc9cf17b..133cda5db120 100644
--- a/sys-fs/device-mapper/ChangeLog
+++ b/sys-fs/device-mapper/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/device-mapper
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/device-mapper/ChangeLog,v 1.84 2007/10/02 09:38:20 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/device-mapper/ChangeLog,v 1.85 2007/10/04 14:15:38 cardoe Exp $
+
+*device-mapper-1.02.22-r2 (04 Oct 2007)
+
+  04 Oct 2007; Doug Goldstein <cardoe@gentoo.org>
+  +files/device-mapper.rc-r1, +device-mapper-1.02.22-r2.ebuild:
+  fix baselayout-2 init script to use start_addon
 
   02 Oct 2007; Robin H. Johnson <robbat2@gentoo.org>
   device-mapper-1.02.22-r1.ebuild:
diff --git a/sys-fs/device-mapper/device-mapper-1.02.22-r2.ebuild b/sys-fs/device-mapper/device-mapper-1.02.22-r2.ebuild
new file mode 100644
index 000000000000..94a6e668a44c
--- /dev/null
+++ b/sys-fs/device-mapper/device-mapper-1.02.22-r2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/device-mapper/device-mapper-1.02.22-r2.ebuild,v 1.1 2007/10/04 14:15:38 cardoe Exp $
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="Device mapper ioctl library for use with LVM2 utilities"
+HOMEPAGE="http://sources.redhat.com/dm/"
+SRC_URI="ftp://sources.redhat.com/pub/dm/${PN}.${PV}.tgz
+	ftp://sources.redhat.com/pub/dm/old/${PN}.${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="selinux"
+
+DEPEND="selinux? ( sys-libs/libselinux )"
+
+S="${WORKDIR}/${PN}.${PV}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/device-mapper-1.02.22-export-format.diff
+}
+
+src_compile() {
+	econf --sbindir=/sbin $(use_enable selinux) --enable-dmeventd || die "econf failed"
+	emake || die "compile problem"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+
+	# move shared libs to /
+	mv "${D}"/usr/$(get_libdir) "${D}"/ || die "move libdir"
+	dolib.a lib/ioctl/libdevmapper.a || die "dolib.a"
+	gen_usr_ldscript libdevmapper.so
+
+	insinto /etc
+	doins "${FILESDIR}"/dmtab
+	insinto /lib/rcscripts/addons
+	doins "${FILESDIR}"/dm-start.sh
+
+	newinitd "${FILESDIR}"/device-mapper.rc-r1 device-mapper || die
+
+	newinitd "${FILESDIR}"/1.02.22-dmeventd.initd dmeventd || die
+	dolib.a dmeventd/libdevmapper-event.a || die
+	gen_usr_ldscript libdevmapper-event.so
+
+	insinto /etc/udev/rules.d/
+	newins "${FILESDIR}"/64-device-mapper.rules-1.02.22 64-device-mapper.rules
+
+	dodoc INSTALL INTRO README VERSION WHATS_NEW
+}
+
+pkg_preinst() {
+	local l="${ROOT}"/$(get_libdir)/libdevmapper.so.1.01
+	[[ -e ${l} ]] && cp "${l}" "${D}"/$(get_libdir)/
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /$(get_libdir)/libdevmapper.so.1.01
+
+	elog "device-mapper volumes are no longer automatically created for"
+	elog "baselayout-2 users. If you are using baselayout-2, be sure to"
+	elog "run: # rc-update add device-mapper boot"
+}
diff --git a/sys-fs/device-mapper/files/device-mapper.rc-r1 b/sys-fs/device-mapper/files/device-mapper.rc-r1
new file mode 100644
index 000000000000..d5693c43d273
--- /dev/null
+++ b/sys-fs/device-mapper/files/device-mapper.rc-r1
@@ -0,0 +1,23 @@
+#!/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/device-mapper/files/device-mapper.rc-r1,v 1.1 2007/10/04 14:15:39 cardoe Exp $
+
+depend() {
+	if [ -e /lib/librc.so ]; then
+		# on baselayout-1 this causes
+		# a dependency loop 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
+
+	start_addon dm	
+}
+
diff --git a/sys-fs/device-mapper/files/digest-device-mapper-1.02.22-r2 b/sys-fs/device-mapper/files/digest-device-mapper-1.02.22-r2
new file mode 100644
index 000000000000..9b8f6a284ce3
--- /dev/null
+++ b/sys-fs/device-mapper/files/digest-device-mapper-1.02.22-r2
@@ -0,0 +1,3 @@
+MD5 6b94db57cdc9022af1583b3f2acb91cd device-mapper.1.02.22.tgz 189726
+RMD160 8bf9986536c49f53c398d6a2180e21e1235bea18 device-mapper.1.02.22.tgz 189726
+SHA256 ff833a6cd6246686f5b3f5692fd6597f1ffbc60f08929e5fe68304cdafb61595 device-mapper.1.02.22.tgz 189726