Swap NAME/SYMLINK. Now /dev/mapper/NAME is the device-node, and /dev/dm-* is a symlink on it. This should fix Bug #190819 for now.

Package-Manager: portage-2.1.3.12

5 files changed, 124 insertions, 8 deletions

diff --git a/sys-fs/device-mapper/ChangeLog b/sys-fs/device-mapper/ChangeLog
index a0048cce95d8..ba1b5d863c6b 100644
--- a/sys-fs/device-mapper/ChangeLog
+++ b/sys-fs/device-mapper/ChangeLog
@@ -1,6 +1,14 @@
 # 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.92 2007/10/09 14:19:55 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/device-mapper/ChangeLog,v 1.93 2007/10/11 12:06:10 zzam Exp $
+
+*device-mapper-1.02.22-r5 (11 Oct 2007)
+
+  11 Oct 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +files/64-device-mapper.rules-1.02.22-r5,
+  +device-mapper-1.02.22-r5.ebuild:
+  Swap NAME/SYMLINK. Now /dev/mapper/NAME is the device-node, and /dev/dm-* is
+  a symlink on it. This should fix Bug #190819 for now.
 
 *device-mapper-1.02.22-r4 (09 Oct 2007)
 
diff --git a/sys-fs/device-mapper/Manifest b/sys-fs/device-mapper/Manifest
index 5816fc624846..9a62520577d5 100644
--- a/sys-fs/device-mapper/Manifest
+++ b/sys-fs/device-mapper/Manifest
@@ -13,6 +13,10 @@ AUX 64-device-mapper.rules-1.02.22 999 RMD160 e29014e213c2d41ae360419c038d5644cd
 MD5 307bdee766d6398e55306f4b2de1bbbf files/64-device-mapper.rules-1.02.22 999
 RMD160 e29014e213c2d41ae360419c038d5644cd931021 files/64-device-mapper.rules-1.02.22 999
 SHA256 84544cac9d4de6cfc44cec816836f194f5f69fbb74cbdd07073f96dae427c0ed files/64-device-mapper.rules-1.02.22 999
+AUX 64-device-mapper.rules-1.02.22-r5 1010 RMD160 3dbb70b60b0c86a77fb9d0e8a0a9cd16a7dd03cc SHA1 fec62b9d4357fe4160e3d017c103767b6c9bf232 SHA256 7c92c2ff3c8dee6588ac51f8367a7b4bcb31d42f2d306ed08ce01be809b9ffcd
+MD5 5912671c225f9d623061fa17e333284a files/64-device-mapper.rules-1.02.22-r5 1010
+RMD160 3dbb70b60b0c86a77fb9d0e8a0a9cd16a7dd03cc files/64-device-mapper.rules-1.02.22-r5 1010
+SHA256 7c92c2ff3c8dee6588ac51f8367a7b4bcb31d42f2d306ed08ce01be809b9ffcd files/64-device-mapper.rules-1.02.22-r5 1010
 AUX device-mapper-1.02.22-export-format-r1.diff 11073 RMD160 ac3adb7316dc4f6bb7e9ea3bcf54f8b8b878570d SHA1 208c3f92a9a257e62fb6f7b8600b22b486d473bb SHA256 8b071762684b9c72dafe7bbd0e9a508999d3d0bc34ced088baa7a206d859f331
 MD5 3c2c685b2ae1784429b1761969e6a474 files/device-mapper-1.02.22-export-format-r1.diff 11073
 RMD160 ac3adb7316dc4f6bb7e9ea3bcf54f8b8b878570d files/device-mapper-1.02.22-export-format-r1.diff 11073
@@ -63,14 +67,18 @@ EBUILD device-mapper-1.02.22-r4.ebuild 2117 RMD160 5f50d27861e038034db772ff7450a
 MD5 81c28bbdc590ab8cecb8891dbaa4bc70 device-mapper-1.02.22-r4.ebuild 2117
 RMD160 5f50d27861e038034db772ff7450a10ba5ef5ec1 device-mapper-1.02.22-r4.ebuild 2117
 SHA256 b5abf6b8adce7a9a05a7114dd7d65aa69479d065c1d8cdec2e885f8f48ada901 device-mapper-1.02.22-r4.ebuild 2117
+EBUILD device-mapper-1.02.22-r5.ebuild 2118 RMD160 e8ffe8bcfb6eecfa93d5a373b0f0df9c309f8506 SHA1 5e7744da8ca3a92372e630fefee126a63e3947fe SHA256 6c6e540fc536041b3b10869d66aa9d95b4136fec193eef95021aa4dfef0c8bc2
+MD5 c4e79cb1dbd754e8c2596cd6cec3e167 device-mapper-1.02.22-r5.ebuild 2118
+RMD160 e8ffe8bcfb6eecfa93d5a373b0f0df9c309f8506 device-mapper-1.02.22-r5.ebuild 2118
+SHA256 6c6e540fc536041b3b10869d66aa9d95b4136fec193eef95021aa4dfef0c8bc2 device-mapper-1.02.22-r5.ebuild 2118
 EBUILD device-mapper-1.02.22.ebuild 1853 RMD160 a9d4a38a94e59535f65c4925e6296380c9037e77 SHA1 7ebfcbc91a491faefc310d234e49fd1559615c60 SHA256 3b047a69a1c0d04b88531f379505fbbf22ed5b4d23aee57f70245e118a26c715
 MD5 2d562379212678019c5d74bfe1085775 device-mapper-1.02.22.ebuild 1853
 RMD160 a9d4a38a94e59535f65c4925e6296380c9037e77 device-mapper-1.02.22.ebuild 1853
 SHA256 3b047a69a1c0d04b88531f379505fbbf22ed5b4d23aee57f70245e118a26c715 device-mapper-1.02.22.ebuild 1853
-MISC ChangeLog 16928 RMD160 0191db2b675f472652c3921979a1dbc4293e025f SHA1 483da5bf767902b2ab2a1e3b5a3a0ecdb4dcd05c SHA256 5af0afbcd86e6a8a28ec14afb2d65a94dadd62bfccf92f4c296e7eac4835738f
-MD5 875d0f57de3c81ec2ab240ad46ff0b02 ChangeLog 16928
-RMD160 0191db2b675f472652c3921979a1dbc4293e025f ChangeLog 16928
-SHA256 5af0afbcd86e6a8a28ec14afb2d65a94dadd62bfccf92f4c296e7eac4835738f ChangeLog 16928
+MISC ChangeLog 17236 RMD160 ae31ed80df65a61f10bdfbc84baa2b3d47e8b314 SHA1 fdb2012932f22f15e6ec6c92ce4199a4c7d589a4 SHA256 404a678fe26b901196f3472cf6416ff2fbc0e2f659075a3dcdffb1ab3388befb
+MD5 2718b46f0072b225b2cdbb5d2a88cb3c ChangeLog 17236
+RMD160 ae31ed80df65a61f10bdfbc84baa2b3d47e8b314 ChangeLog 17236
+SHA256 404a678fe26b901196f3472cf6416ff2fbc0e2f659075a3dcdffb1ab3388befb ChangeLog 17236
 MISC metadata.xml 300 RMD160 ede7eb0cde3ab4e83a90578f08e068486a2a59cd SHA1 2f199ce422f4fad87bcbdcb681d8197620bae236 SHA256 4f6e65a7f6e72548a3d0c35a34f7a119dc7f5c13dfc0820939bc8d1b72b75a4d
 MD5 80dc99dec1aed7022edd3fe784b02759 metadata.xml 300
 RMD160 ede7eb0cde3ab4e83a90578f08e068486a2a59cd metadata.xml 300
@@ -93,10 +101,13 @@ SHA256 207b1f7f3f2ca78603fe601fc4341f8ecffed55fb15d0389038a56be628dcd3f files/di
 MD5 62e7d71d52d2cb211d70a2551fefab8b files/digest-device-mapper-1.02.22-r4 256
 RMD160 496d0beb23a751b928d81fb40be062cc1db7ec3f files/digest-device-mapper-1.02.22-r4 256
 SHA256 207b1f7f3f2ca78603fe601fc4341f8ecffed55fb15d0389038a56be628dcd3f files/digest-device-mapper-1.02.22-r4 256
+MD5 62e7d71d52d2cb211d70a2551fefab8b files/digest-device-mapper-1.02.22-r5 256
+RMD160 496d0beb23a751b928d81fb40be062cc1db7ec3f files/digest-device-mapper-1.02.22-r5 256
+SHA256 207b1f7f3f2ca78603fe601fc4341f8ecffed55fb15d0389038a56be628dcd3f files/digest-device-mapper-1.02.22-r5 256
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHC456oeSe8B0zEfwRAgvuAJ0c+HSr/EC9DAjkX0/FdwxQCm3GZgCfRT6t
-bHfMtXyQEdhIqwHvkarCG9A=
-=qMqo
+iD8DBQFHDhG4t2vP6XvVdOcRAn1UAJ9IzA1bLL0+xg/y2HiybhZqB8AsxACfZP07
+mh4khRoyPmnnEzM1EmFP4Gw=
+=T3fI
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/device-mapper/device-mapper-1.02.22-r5.ebuild b/sys-fs/device-mapper/device-mapper-1.02.22-r5.ebuild
new file mode 100644
index 000000000000..bb341ecc49b2
--- /dev/null
+++ b/sys-fs/device-mapper/device-mapper-1.02.22-r5.ebuild
@@ -0,0 +1,69 @@
+# 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-r5.ebuild,v 1.1 2007/10/11 12:06:10 zzam 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-r1.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-1.02.22-r3 device-mapper || die
+	newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 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-r5 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/64-device-mapper.rules-1.02.22-r5 b/sys-fs/device-mapper/files/64-device-mapper.rules-1.02.22-r5
new file mode 100644
index 000000000000..36c085b56b97
--- /dev/null
+++ b/sys-fs/device-mapper/files/64-device-mapper.rules-1.02.22-r5
@@ -0,0 +1,25 @@
+# do not edit this file, it will be overwritten on update
+
+KERNEL=="device-mapper", SYMLINK+="mapper/control"
+
+KERNEL!="dm-*", GOTO="device_mapper_end"
+ACTION!="add|change", GOTO="device_mapper_end"
+
+IMPORT{program}="/sbin/dmsetup info --export -j%M -m%m"
+ENV{DM_NAME}!="?*", GOTO="device_mapper_end"
+NAME="mapper/$env{DM_NAME}", SYMLINK+="%k"
+
+SYMLINK+="disk/by-id/dm-name-$env{DM_NAME}"
+ENV{DM_UUID}=="?*", SYMLINK+="disk/by-id/dm-uuid-$env{DM_UUID}"
+
+ENV{DM_SUSPENDED}=="1", GOTO="device_mapper_end"
+ENV{DM_EXISTS}=="0", GOTO="device_mapper_end"
+ENV{DM_TARGET_TYPES}=="|*error*", GOTO="device_mapper_end"
+
+IMPORT{program}="vol_id --export $tempnode"
+OPTIONS="link_priority=-100"
+ENV{DM_TARGET_TYPES}=="*snapshot-origin*", OPTIONS="link_priority=-90"
+ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"
+ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}"
+
+LABEL="device_mapper_end"
diff --git a/sys-fs/device-mapper/files/digest-device-mapper-1.02.22-r5 b/sys-fs/device-mapper/files/digest-device-mapper-1.02.22-r5
new file mode 100644
index 000000000000..9b8f6a284ce3
--- /dev/null
+++ b/sys-fs/device-mapper/files/digest-device-mapper-1.02.22-r5
@@ -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