From: Tim Yamin <plasmaroo@gentoo.org>
Date: Sun, 28 Mar 2004 22:23:21 +0000 (+0000)
Subject: Applied the fixed for ``docache'' to work properly on zisofs.
X-Git-Tag: v3.4.10.902~651
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fc197aad3f587920f889fe84c5a99177913da89c;p=genkernel.git

Applied the fixed for ``docache'' to work properly on zisofs.


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

diff --git a/generic/linuxrc b/generic/linuxrc
index 2648005..a6d1e70 100644
--- a/generic/linuxrc
+++ b/generic/linuxrc
@@ -235,13 +235,13 @@ then
 	    check_loop
 	    if [ "${DO_cache}" ]
 	    then
-		echo "${GOOD}>>${NORMAL}${BOLD} Copying loop file for caching...${NORMAL}"
-		cp /newroot/mnt/cdrom/${LOOP} /newroot/mnt/${LOOP}
+		echo -e "${GOOD}>>${NORMAL}${BOLD} Copying loop file for caching...${NORMAL}"
+		cp -a /newroot/mnt/cdrom/${LOOP} /newroot/mnt/${LOOP}
 		if [ $? -ne 0 ]
 		then
-			echo "${BAD}!!${NORMAL}${BOLD} Failed to cache the loop file! Lack of space?"
-			rm /newroot/mnt/livecd.* 2>/dev/null
-			rm /newroot/mnt/zisofs 2>/dev/null
+			echo -e "${BAD}!!${NORMAL}${BOLD} Failed to cache the loop file! Lack of space?"
+			rm -rf /newroot/mnt/livecd.* 2>/dev/null
+			rm -rf /newroot/mnt/zisofs 2>/dev/null
 		else
 			LOOPEXT="../"
 		fi
@@ -295,7 +295,7 @@ then
 		FS_LOCATION="mnt/cdrom"
 	fi
 
-	echo "${GOOD}>>${NORMAL}${BOLD} Filling filesystem...${NORMAL}"
+	echo -e "${GOOD}>>${NORMAL}${BOLD} Filling filesystem...${NORMAL}"
 	for x in ${ROOT_LINKS}
 	do
 		ln -s "${FS_LOCATION}/${x}" "${x}"