Revert scripts/live 1.110.7-2_grml.03
authorMichael Prokop <devnull@localhost>
Wed, 20 Feb 2008 17:07:03 +0000 (18:07 +0100)
committerMichael Prokop <devnull@localhost>
Wed, 20 Feb 2008 17:07:03 +0000 (18:07 +0100)
scripts/live

index dad1a2b..80f77e9 100755 (executable)
@@ -564,7 +564,7 @@ copy_live_to ()
                then
                        size=$( expr $(ls -la ${MODULETORAMFILE} | awk '{print $5}') / 1024 + 5000 )
                else
-                       echo " * Error: toram-module ${MODULETORAM} (${MODULETORAMFILE}) could not be read." >/dev/console
+                       log_warning_msg "Error: toram-module ${MODULETORAM} (${MODULETORAMFILE}) could not be read."
                        return 1
                fi
        fi
@@ -593,7 +593,7 @@ copy_live_to ()
 
        if [ "${freespace}" -lt "${size}" ]
        then
-               echo " * Error: Not enough free ${free_string} (${freespace}k free, ${size}k needed) to copy live media in ${copytodev}." >/dev/console
+               [ "${quiet}" != "y" ] && log_warning_msg "Not enough free ${free_string} (${freespace}k free, ${size}k needed) to copy live media in ${copytodev}."
                return 1
        fi
 
@@ -612,19 +612,9 @@ copy_live_to ()
        else
                if [ -n "${MODULETORAMFILE}" ]
                then
-                       if [ -x /usr/bin/rsync ] ; then
-                       echo " * Copying $MODULETORAMFILE to RAM" 1>/dev/console
-                          rsync -a --progress ${MODULETORAMFILE} ${copyto} 1>/dev/console # copy only the filesystem module
-                       else
-                          cp ${MODULETORAMFILE} ${copyto} # copy only the filesystem module
-                       fi
-               else
-                       if [ -x /usr/bin/rsync ] ; then
-                       echo " * Copying medium to RAM" 1>/dev/console
-                          rsync -a --progress ${copyfrom}/* ${copyto} 1>/dev/console  # "cp -a" from busybox also copies hidden files
-                       else
-                          cp -a ${copyfrom}/* ${copyto}   # "cp -a" from busybox also copies hidden files
-                       fi
+                       cp ${MODULETORAMFILE} ${copyto} # copy only the filesystem module
+               else
+                       cp -a ${copyfrom}/* ${copyto}   # "cp -a" from busybox also copies hidden files
                fi
 
                livefs_root