r2443 - in jhalfs/branches/experimental: CLFS common

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Tue Mar 28 12:25:03 PST 2006


Author: manuel
Date: 2006-03-28 13:25:02 -0700 (Tue, 28 Mar 2006)
New Revision: 2443

Modified:
   jhalfs/branches/experimental/CLFS/master.sh
   jhalfs/branches/experimental/common/common-functions
Log:
Removed a duplicate function.

Modified: jhalfs/branches/experimental/CLFS/master.sh
===================================================================
--- jhalfs/branches/experimental/CLFS/master.sh	2006-03-28 20:11:42 UTC (rev 2442)
+++ jhalfs/branches/experimental/CLFS/master.sh	2006-03-28 20:25:02 UTC (rev 2443)
@@ -133,7 +133,7 @@
     #
     [[ "$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}"
     #
@@ -185,7 +185,7 @@
     #
     [[ "$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}"
     #
@@ -263,10 +263,10 @@
       *fstab*)   if [[ -n "$FSTAB" ]]; then
                    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
     #
     # Housekeeping...remove any build directory(ies) except if the package build fails.
@@ -333,7 +333,7 @@
     # Select a script execution method
     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
     #
@@ -537,7 +537,7 @@
     this_script=`basename $file`
 
     # Test if the stripping phase must be skipped
-    case $this_script in 
+    case $this_script in
       *stripping*) [[ "$STRIP" = "0" ]] && continue
        ;;
     esac
@@ -1006,7 +1006,7 @@
 if [[ "${METHOD}" = "boot" ]]; then
 (
 	cat << EOF
-	
+
 all:	023-creatingtoolsdir 024-creatingcrossdir 025-addinguser 026-settingenvironment \
 	$cross_tools \
 	$temptools \
@@ -1044,7 +1044,7 @@
 
 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 ..
 

Modified: jhalfs/branches/experimental/common/common-functions
===================================================================
--- jhalfs/branches/experimental/common/common-functions	2006-03-28 20:11:42 UTC (rev 2442)
+++ jhalfs/branches/experimental/common/common-functions	2006-03-28 20:25:02 UTC (rev 2443)
@@ -279,21 +279,6 @@
 }
 
 
-#==================================#
-wrt_run_as_lfs() {                 #
-#==================================#
-  local this_script=$1
-  local file=$2
-(
-cat << EOF
-	@echo -e "\n\`date\`\n\nKB: \`du -sk --exclude={0,1}??-* \$(MOUNT_PT)\`\n" >logs/$this_script && \\
-	su - lfs -c "source /home/lfs/.bashrc && $JHALFSDIR/${PROGNAME}-commands/$file" >>logs/$this_script 2>&1 && \\
-	echo -e "\n\`date\`\n\nKB: \`du -sk --exclude={0,1}??-* \$(MOUNT_PT)\`\n" >>logs/$this_script
-EOF
-) >> $MKFILE.tmp
-}
-
-
 #----------------------------------#
 wrt_run_as_root() {                #
 #----------------------------------#




More information about the alfs-log mailing list