Apply patch from bug 210457 to fix variable substitution. Thanks to Paul Taylor ...

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

diff --git a/ChangeLog b/ChangeLog
index f19024172bc4b5cd24b2edb556bb0ed7a7f760cd..bba35b199a8663cea045c6ac107bf354abea49e8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 2006-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  19 Feb 2008; Andrew Gaffney <agaffney@gentoo.org> generic/initrd.scripts:
+  Apply patch from bug 210457 to fix variable substitution. Thanks to Paul
+  Taylor <birder@ozemail.com.au> for reporting
+
   19 Feb 2008; Andrew Gaffney <agaffney@gentoo.org> generic/linuxrc:
   Remove quotes from around ${ROOT_TREES} so that the dirs are parsed
   separately by bash/cp

diff --git a/generic/initrd.scripts b/generic/initrd.scripts
index d703b3e364da670d57fb7eaef45090ff0c6053e5..b2e681de9c30ecfb494648cd56deb2198f610ce2 100644 (file)
--- a/generic/initrd.scripts
+++ b/generic/initrd.scripts
@@ -934,6 +934,6 @@ find_loop() {
 find_looptype() {
        LOOPTYPE="${LOOP##*.}"
        [ "${LOOPTYPE}" == "loop" ] && LOOPTYPE="normal"
-       [ "${LOOP}" == "/zisofs" ] && LOOPTYPE="${LOOP:1}"
+       [ "${LOOP}" == "/zisofs" ] && LOOPTYPE="${LOOP#/}"
        [ -z "${LOOPTYPE}" ] && LOOPTYPE="noloop"
 }