diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-05-25 04:25:01 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-05-25 04:25:01 +0000 |
| commit | e814587bb3ca8144e8adc025b3c9167a6b950038 (patch) | |
| tree | c9337e7d20f85736d77d37922eaac78ffde5ad30 /sys-fs | |
| parent | hppa love (diff) | |
| download | historical-e814587bb3ca8144e8adc025b3c9167a6b950038.tar.gz historical-e814587bb3ca8144e8adc025b3c9167a6b950038.tar.bz2 historical-e814587bb3ca8144e8adc025b3c9167a6b950038.zip | |
modprobe device-mapper if it doesnt exist #71032
Package-Manager: portage-2.0.51.22-r1
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/lvm2/Manifest | 10 | ||||
| -rwxr-xr-x | sys-fs/lvm2/files/lvm2-start.sh | 28 |
2 files changed, 22 insertions, 16 deletions
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest index 1e0fad7b41f5..8a766e341080 100644 --- a/sys-fs/lvm2/Manifest +++ b/sys-fs/lvm2/Manifest @@ -1,22 +1,22 @@ MD5 c40277dd00b0df82d92113508eb90922 ChangeLog 6835 +MD5 a636df9fc4c3a76e1e274bdad2e4701d lvm2-2.00.15.ebuild 852 MD5 2896cc17098babbb186ab2f3846e4186 lvm2-2.00.08.ebuild 806 MD5 9934e11f9ed27c97b024100380fde4d9 metadata.xml 250 -MD5 a636df9fc4c3a76e1e274bdad2e4701d lvm2-2.00.15.ebuild 852 MD5 056d25e2914e4167093061a9800e16df lvm2-2.00.15-r1.ebuild 1187 MD5 64b58b520ae926a0ed181185a1d603f3 lvm2-2.00.25.ebuild 949 MD5 d2f05ce076e6d82926716a9f7fac4ed6 lvm2-2.00.33-r1.ebuild 1073 -MD5 22bfbc60fc64c45a89c9d8e1067d26e9 lvm2-2.00.33-r2.ebuild 1043 MD5 2c5ed7997e4c96d5129f3c9227ca8f67 lvm2-2.00.33.ebuild 949 +MD5 22bfbc60fc64c45a89c9d8e1067d26e9 lvm2-2.00.33-r2.ebuild 1043 MD5 e30336a017203e0954d3962aefca8a58 lvm2-2.00.33-r4.ebuild 1282 MD5 48de02bb6413f512056eeec48ea6968e lvm2-2.01.09.ebuild 1272 -MD5 7d15c279aadf5df9c1486c878916c893 files/digest-lvm2-2.00.08 61 MD5 0409dfc70844e92c416235b013569411 files/digest-lvm2-2.00.15 61 +MD5 7d15c279aadf5df9c1486c878916c893 files/digest-lvm2-2.00.08 61 MD5 0409dfc70844e92c416235b013569411 files/digest-lvm2-2.00.15-r1 61 MD5 1eebcc64220260347d8a9b9336684346 files/digest-lvm2-2.00.25 61 MD5 f8399f304f8ba8257277f8e57b0c4687 files/digest-lvm2-2.00.33 61 MD5 f8399f304f8ba8257277f8e57b0c4687 files/digest-lvm2-2.00.33-r1 61 -MD5 f8399f304f8ba8257277f8e57b0c4687 files/digest-lvm2-2.00.33-r2 61 -MD5 5c0208edfc72c85c17a962ef6145e278 files/lvm2-start.sh 777 +MD5 aeb6550dc5067db0afb5cb3b957dae46 files/lvm2-start.sh 934 MD5 f2e7b2e4a91f96e336f12556975346c6 files/lvm2-stop.sh 1709 +MD5 f8399f304f8ba8257277f8e57b0c4687 files/digest-lvm2-2.00.33-r2 61 MD5 f8399f304f8ba8257277f8e57b0c4687 files/digest-lvm2-2.00.33-r4 61 MD5 540e8a304be1860275577f326c7bd0f0 files/digest-lvm2-2.01.09 61 diff --git a/sys-fs/lvm2/files/lvm2-start.sh b/sys-fs/lvm2/files/lvm2-start.sh index 8bfa895a9a75..c70e1e0d60d6 100755 --- a/sys-fs/lvm2/files/lvm2-start.sh +++ b/sys-fs/lvm2/files/lvm2-start.sh @@ -1,5 +1,5 @@ # /lib/rcscripts/addons/lvm2-start.sh -# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvm2-start.sh,v 1.2 2005/02/23 03:35:18 rocket Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvm2-start.sh,v 1.3 2005/05/25 04:25:01 vapier Exp $ # LVM support for /usr, /home, /opt .... # This should be done *before* checking local @@ -7,18 +7,24 @@ # NOTE: Add needed modules for LVM or RAID, etc # to /etc/modules.autoload if needed -if [ -z "${CDBOOT}" -a -x /sbin/vgscan ] && \ - [ -d /proc/lvm -o "$(grep device-mapper /proc/misc 2>/dev/null)" ] -then - ebegin "Setting up the Logical Volume Manager" - #still echo stderr for debugging - /sbin/vgscan >/dev/null - if [ "$?" -eq 0 ] && [ -x /sbin/vgchange ] && \ - [ -f /etc/lvmtab -o -d /etc/lvm ] +if [[ -z ${CDBOOT} ]] && [[ -x /sbin/vgscan ]] ; then + if [[ -e /proc/modules ]] && \ + ! grep -qs 'device-mapper' /proc/{devices,misc} then - /sbin/vgchange -a y >/dev/null + modprobe dm-mod &>/dev/null + fi + + if [[ -d /proc/lvm ]] || grep -qs 'device-mapper' /proc/{devices,misc} ; then + ebegin "Setting up the Logical Volume Manager" + #still echo stderr for debugging + /sbin/vgscan >/dev/null + if [[ $? == 0 ]] && [[ -x /sbin/vgchange ]] && \ + [[ -f /etc/lvmtab || -d /etc/lvm ]] + then + /sbin/vgchange -a y >/dev/null + fi + eend $? "Failed to setup the LVM" fi - eend $? "Failed to setup the LVM" fi # vim:ts=4 |