summaryrefslogtreecommitdiff
path: root/sys-fs
diff options
context:
space:
mode:
authorDoug Goldstein <cardoe@gentoo.org>2007-05-31 14:34:11 +0000
committerDoug Goldstein <cardoe@gentoo.org>2007-05-31 14:34:11 +0000
commit29904ea7b79380cbbbc2de26a70656f563677166 (patch)
treec53c612d850430f38f8e3543f9eff0650e5a32ef /sys-fs
parentMarking tor-0.1.2.14 ppc64 stable for bug#180139 (diff)
downloadgentoo-2-29904ea7b79380cbbbc2de26a70656f563677166.tar.gz
gentoo-2-29904ea7b79380cbbbc2de26a70656f563677166.tar.bz2
gentoo-2-29904ea7b79380cbbbc2de26a70656f563677166.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.
(Portage version: 2.1.2.7)
Diffstat (limited to 'sys-fs')
-rw-r--r--sys-fs/lvm2/ChangeLog7
-rwxr-xr-xsys-fs/lvm2/files/lvm2-start.sh4
2 files changed, 8 insertions, 3 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/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