Inverted check on CDROOT_DEV, as it should be -z not -n. Thanks to Jakub Moc <jakub...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@462 67a159dc-881f-0410-a524-ba9dfbe2cb84

diff --git a/ChangeLog b/ChangeLog
index dd7731f2eedfeeb7a890476e1c36719831d01a04..cdbcef191166c1006b1af1312212028604c15560 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 2006-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Nov 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  generic/initrd.scripts:
+  Inverted check on CDROOT_DEV, as it should be -z not -n. Thanks to Jakub Moc
+  <jakub@gentoo.org> for coming up with the quick fix in bug #153554. I lied
+  before. This one is really 3.4.5.
+
   13 Nov 2006; Chris Gianelloni <wolf31o2@gentoo.org> generic/linuxrc,
   genkernel:
   Added typo fix from Jason Pepas <j.pepas@mail.utexas.edu> in bug #153516.

diff --git a/generic/initrd.scripts b/generic/initrd.scripts
index 299870e08b06901ca599dffc6197b45a6f607c8b..672d61e68a2b173f185029bacacbe13ffda4d338 100644 (file)
--- a/generic/initrd.scripts
+++ b/generic/initrd.scripts
@@ -72,7 +72,7 @@ findcdmount() {
                        if [ -b "${x}" ]
                        then
                                good_msg "Attempting to mount media:- ${x}"
-                               if [ -n "${CDROOT_DEV}" ]
+                               if [ -z "${CDROOT_DEV}" ]
                                then
                                        mount -r -t auto ${x} ${NEW_ROOT}/mnt/cdrom \
                                                > /dev/null 2>&1