diff options
| author |   Doug Goldstein <cardoe@gentoo.org> | 2007-05-31 14:34:11 +0000 |
|---|---|---|
| committer | Doug Goldstein <cardoe@gentoo.org> | 2007-05-31 14:34:11 +0000 |
| commit | 01fb43d40307ab6f2c41018bc10b0b8a4ecd8163 (patch) | |
| tree | 20d56029424520a9a2b4a0b7a317e3391ca7ba89 /sys-fs | |
| parent | Marking tor-0.1.2.14 ppc64 stable for bug#180139 (diff) | |
| download | historical-01fb43d40307ab6f2c41018bc10b0b8a4ecd8163.tar.gz historical-01fb43d40307ab6f2c41018bc10b0b8a4ecd8163.tar.bz2 historical-01fb43d40307ab6f2c41018bc10b0b8a4ecd8163.zip | |
Fix from Jimmy.Jazz@gmx.net in bug #180340 where we would fail to boot because vgscan detected other partitions then lvm. This ignores that result and tries vgchange anyway.
Package-Manager: portage-2.1.2.7
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/lvm2/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-fs/lvm2/Manifest | 16 | ||||
| -rwxr-xr-x | sys-fs/lvm2/files/lvm2-start.sh | 4 |
3 files changed, 16 insertions, 11 deletions
diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog index e348ef63929c..51210108ae8c 100644 --- a/sys-fs/lvm2/ChangeLog +++ b/sys-fs/lvm2/ChangeLog @@ -1,6 +1,11 @@ # 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.103 2007/05/29 14:38:05 rocket Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.104 2007/05/31 14:34:11 cardoe Exp $ + + 31 May 2007; Doug Goldstein <cardoe@gentoo.org> files/lvm2-start.sh: + Fix from Jimmy.Jazz@gmx.net in bug #180340 where we would fail to boot + because vgscan detected other partitions then lvm. This ignores that result + and tries vgchange anyway. *lvm2-2.02.25 (28 May 2007) diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest index f34532b1459f..53c73a7637de 100644 --- a/sys-fs/lvm2/Manifest +++ b/sys-fs/lvm2/Manifest @@ -18,10 +18,10 @@ AUX lvm2-2.02.04-vgid.patch 2304 RMD160 9ebe8413ad14c1c0f4cf1c3c4feb0773c6efc256 MD5 330a2eaf6e782fcc230e9a5003432076 files/lvm2-2.02.04-vgid.patch 2304 RMD160 9ebe8413ad14c1c0f4cf1c3c4feb0773c6efc256 files/lvm2-2.02.04-vgid.patch 2304 SHA256 b1fb90ce4fcf5773684e543b5d269f1eba4a15d3ec1256ca75e54244b68aaf9e files/lvm2-2.02.04-vgid.patch 2304 -AUX lvm2-start.sh 1036 RMD160 f7e4485495016cba8a75f587e86867440d0be53c SHA1 2f3ad3c33937965955baa97921e1133fd6eb2794 SHA256 f08b67dc46aef0b753ed3f6ef0da729682f309b18b9723a6b2706339607624fa -MD5 d3888918f9a40671111795a10f471721 files/lvm2-start.sh 1036 -RMD160 f7e4485495016cba8a75f587e86867440d0be53c files/lvm2-start.sh 1036 -SHA256 f08b67dc46aef0b753ed3f6ef0da729682f309b18b9723a6b2706339607624fa files/lvm2-start.sh 1036 +AUX lvm2-start.sh 1026 RMD160 55fef8241e725f5e21a163eb74b9c3b773efa3eb SHA1 45c1d2cdf5f408a95b291c15cd3ac5994fb44ade SHA256 97640d11108b57aac0fd15b9feb13b30ec6792f7fc8b36637dcb015339f954d1 +MD5 6221ee8d213167af93e1569902666558 files/lvm2-start.sh 1026 +RMD160 55fef8241e725f5e21a163eb74b9c3b773efa3eb files/lvm2-start.sh 1026 +SHA256 97640d11108b57aac0fd15b9feb13b30ec6792f7fc8b36637dcb015339f954d1 files/lvm2-start.sh 1026 AUX lvm2-stop.sh 1940 RMD160 c2c60a51a779b95cbe59c588ae41906da5504e6a SHA1 e3d859e545f202c9708998126e1f15fd86e2be53 SHA256 ac9a9d209992f50688f7c4a0e1a52c98362f65707e410f0b4337975fd9d4eb1e MD5 00655aa59deac8796636fc54ede221ed files/lvm2-stop.sh 1940 RMD160 c2c60a51a779b95cbe59c588ae41906da5504e6a files/lvm2-stop.sh 1940 @@ -80,10 +80,10 @@ EBUILD lvm2-2.02.25.ebuild 3307 RMD160 e28ca7576f7ae95c622318917cb448828dd11a2f MD5 20d0ca763d2d472d15dbb11cfa8e5746 lvm2-2.02.25.ebuild 3307 RMD160 e28ca7576f7ae95c622318917cb448828dd11a2f lvm2-2.02.25.ebuild 3307 SHA256 c4ad07c12c5f6f92d25e7d0f322578bd43c0302131ec69a53b357d5da4411d7d lvm2-2.02.25.ebuild 3307 -MISC ChangeLog 15118 RMD160 a4dccffca480a869f1aca3ca2a397a875ccc27c1 SHA1 d67a3c4792b8ed3c5431d61049370b5d9208f206 SHA256 b3eb7bcc113b77da97aa91b5429148cf3fdbb4153f66bef465d367af6c0e302e -MD5 bd250902a342e3b80e50f9517d459fce ChangeLog 15118 -RMD160 a4dccffca480a869f1aca3ca2a397a875ccc27c1 ChangeLog 15118 -SHA256 b3eb7bcc113b77da97aa91b5429148cf3fdbb4153f66bef465d367af6c0e302e ChangeLog 15118 +MISC ChangeLog 15370 RMD160 f1b758e081d5035edeeeb98d4d8106ec9ce0ec19 SHA1 95212b80353fadd661b339557fce1f046752eeb9 SHA256 701f155661893e76fa5abdc0323313225e0d04fc00362f353da9e0ee10acf7ec +MD5 0971a44c99949381e265182b24246b5d ChangeLog 15370 +RMD160 f1b758e081d5035edeeeb98d4d8106ec9ce0ec19 ChangeLog 15370 +SHA256 701f155661893e76fa5abdc0323313225e0d04fc00362f353da9e0ee10acf7ec ChangeLog 15370 MISC metadata.xml 533 RMD160 2a531210d39b2430627aa2c9f26e14a87274a177 SHA1 de63d67b1025673de6afe9022d93d41d6d1797a9 SHA256 ca2838ec755d98163ff9916ee8164b48f66732b090c19789e1bf6074be7d4f52 MD5 a7b8932b89808404da2d2704c2f22c25 metadata.xml 533 RMD160 2a531210d39b2430627aa2c9f26e14a87274a177 metadata.xml 533 diff --git a/sys-fs/lvm2/files/lvm2-start.sh b/sys-fs/lvm2/files/lvm2-start.sh index 7fb6c9aa9af7..cfd5e2d29bd8 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.5 2007/05/21 14:09:47 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvm2-start.sh,v 1.6 2007/05/31 14:34:11 cardoe Exp $ dm_in_proc() { local retval=0 @@ -25,7 +25,7 @@ if [ -z "${CDBOOT}" -a -x /sbin/vgscan ] ; then ebegin "Setting up the Logical Volume Manager" #still echo stderr for debugging /sbin/vgscan --mknodes --ignorelockingfailure >/dev/null - if [ $? = 0 -a -x /sbin/vgchange ] && \ + if [ -x /sbin/vgchange ] && \ [ -f /etc/lvmtab -o -d /etc/lvm ] then /sbin/vgchange --ignorelockingfailure -a y >/dev/null |