Changeset 64cc345 for CLFS/master.sh

Timestamp:

03/28/2006 08:25:02 PM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

experimental

Children:

769a219

Parents:

60b56fd

Message:

Removed a duplicate function.

File:

• CLFS/master.sh (modified) (7 diffs)

CLFS/master.sh

@@ -134 +134 @@
     [[ "$vrs" != "" ]] && wrt_unpack "$name-$vrs.tar.*" &&  echo -e '\ttrue' >> $MKFILE.tmp
     #
-    wrt_run_as_lfs "${this_script}" "${file}"
+    wrt_run_as_su "${this_script}" "${file}"
     #
     [[ "$vrs" != "" ]] && wrt_remove_build_dirs "${name}"
@@ -186 +186 @@
     [[ "$vrs" != "" ]] && wrt_unpack "$name-$vrs.tar.*" && echo -e '\ttrue' >> $MKFILE.tmp
     #
-    wrt_run_as_lfs "${this_script}" "${file}"
+    wrt_run_as_su "${this_script}" "${file}"
     #
     [[ "$vrs" != "" ]] && wrt_remove_build_dirs "${name}"
@@ -264 +264 @@
                    wrt_copy_fstab "${this_script}"
                  else
-                   wrt_run_as_lfs  "${this_script}" "${file}"
+                   wrt_run_as_su  "${this_script}" "${file}"
                  fi
          ;;
-      *)         wrt_run_as_lfs  "${this_script}" "${file}"       ;;
+      *)         wrt_run_as_su  "${this_script}" "${file}"       ;;
     esac
     #
@@ -334 +334 @@
     case $this_script in
       *kernfs)        wrt_run_as_root    "${this_script}" "${file}"  ;;
-      *util-linux)    wrt_run_as_lfs     "${this_script}" "${file}"  ;;
+      *util-linux)    wrt_run_as_su     "${this_script}" "${file}"  ;;
       *)              wrt_run_as_chroot1 "${this_script}" "${file}"  ;;
     esac
@@ -538 +538 @@
 
     # Test if the stripping phase must be skipped
-    case $this_script in 
+    case $this_script in
       *stripping*) [[ "$STRIP" = "0" ]] && continue
        ;;
@@ -1007 +1007 @@
 (
         cat << EOF
-        
+
 all:    023-creatingtoolsdir 024-creatingcrossdir 025-addinguser 026-settingenvironment \
         $cross_tools \
@@ -1045 +1045 @@
 clean-makeboot:
         rm -rf /tools/*
-        rm -f $cross_tools && rm -f $temptools && rm -f $chroottools && rm -f $boottools 
+        rm -f $cross_tools && rm -f $temptools && rm -f $chroottools && rm -f $boottools
         rm -f restore-lfs-env sources-dir
         cd logs && rm -f $cross_tools && rm -f $temptools && rm -f $chroottools && rm -f $boottools && cd ..