[gentoo-commits] gentoo-x86 commit in sys-fs/lvm2/files: lvm.rc-2.02.105

[gentoo-commits] gentoo-x86 commit in sys-fs/lvm2/files: lvm.rc-2.02.105

[Robin H. Johnson (robbat2)]

robbat2     14/02/02 05:56:20

  Modified:             lvm.rc-2.02.105
  Log:
  Bug #334125: Ignore an error shutting down last LVs, if they are /usr or / we will not be able to shut them down as we are running from them.
  
  (Portage version: 2.2.7/cvs/Linux x86_64, unsigned Manifest commit)

Revision  Changes    Path
1.2                  sys-fs/lvm2/files/lvm.rc-2.02.105

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/lvm2/files/lvm.rc-2.02.105?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/lvm2/files/lvm.rc-2.02.105?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/lvm2/files/lvm.rc-2.02.105?r1=1.1&r2=1.2

Index: lvm.rc-2.02.105
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvm.rc-2.02.105,v
retrieving revision 1.1
retrieving revision 1.2
diff -p -w -b -B -u -u -r1.1 -r1.2
--- lvm.rc-2.02.105	2 Feb 2014 05:52:01 -0000	1.1
+++ lvm.rc-2.02.105	2 Feb 2014 05:56:20 -0000	1.2
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvm.rc-2.02.105,v 1.1 2014/02/02 05:52:01 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvm.rc-2.02.105,v 1.2 2014/02/02 05:56:20 robbat2 Exp $
 
 depend() {
 	before checkfs fsck
@@ -86,10 +86,11 @@ then
 			lvm_commands="${lvm_commands}vgchange --sysinit -a ln ${VGS}\n"
 			# Order of this is important, have to work around dash and LVM readline
 			printf "%b\n" "${lvm_commands}" | $lvm_path /proc/self/fd/0 --config "${config}" >/dev/null
-			eend $? "Failed"
+			eend $? "Failed (possibly some LVs still needed for /usr or root)"
         fi
 
-	einfo "Finished Shutting down the Logical Volume Manager"
+	einfo "Finished shutting down the Logical Volume Manager"
+	return 0
 fi
 }