Changeset 8bea2c8 for common

Timestamp:

11/01/2006 03:41:52 PM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk

Children:

781acdc

Parents:

03a18bf

Message:

Fixed du bug related to lost+found permissions.
Using PRT_DU and PRT_DU_CHR in all places.
Using logs/$@ in all places.
Fixed du meassurament in LFS build for changingowner and kernfs scripts.

File:

• common/common-functions (modified) (8 diffs)

common/common-functions

@@ -67 +67 @@
 wrt_RunAsRoot() {                  # Some scripts must be run as root..
 #----------------------------------#
-  local ENV_MOUNT
+  local MOUNT_ENV
   local this_script=$1
   local file=$2
@@ -83 +83 @@
 cat << EOF
         @( time { export ${MOUNT_ENV}=\$(MOUNT_PT) && ${PROGNAME}-commands/`dirname $file`/\$@ >>logs/\$@ 2>&1 ; } ) 2>>logs/\$@ && \\
-        \$(PRT_DU_CR) >>logs/\$@
+        \$(PRT_DU) >>logs/\$@
 EOF
 ) >> $MKFILE.tmp
@@ -98 +98 @@
 (
 cat << EOF
-        @( time { source envars && \$(CMDSDIR)/$file >>logs/$this_script 2>&1 ; } ) 2>>logs/$this_script && \\
-        \$(PRT_DU_CR) >>logs/$this_script
+        @( time { source envars && \$(CMDSDIR)/$file >>logs/\$@ 2>&1 ; } ) 2>>logs/\$@ && \\
+        \$(PRT_DU_CR) >>logs/\$@
 EOF
 ) >> $MKFILE.tmp
@@ -140 +140 @@
         @\$(call echo_message, Building)
         @./progress_bar.sh \$@ \$\$PPID &
-        @echo -e "\n\`date\`\n\nKB: \`du -skx --exclude=\$(SCRIPT_ROOT) \$(MOUNT_PT)\`\n" >logs/\$@
+        @echo -e "\n\`date\`\n" >logs/\$@ &
+        @\$(PRT_DU) >>logs/\$@
 EOF
 ) >> $MKFILE.tmp
@@ -229 +230 @@
   case $i in
     iteration* ) local LOGFILE="${this_script}.log" ;;
-             * ) local LOGFILE="${this_script}"      ;;
+             * ) local LOGFILE="\$@"      ;;
   esac
 (
@@ -237 +238 @@
         @\$(call echo_message, Building)
         @./progress_bar.sh \$@ \$\$PPID &
-        @echo -e "\n\`date\`\n\nKB: \`du -skx --exclude=\$(SCRIPT_ROOT) / \`\n" >logs/$LOGFILE
+        @echo -e "\n\`date\`\n" >logs/$LOGFILE &
+        @\$(PRT_DU_CR) >>logs/$LOGFILE
 EOF
 ) >> $MKFILE.tmp
@@ -284 +286 @@
 (
 cat << EOF
-        @( time { source envars && \$(crCMDSDIR)/$file >>logs/$this_script 2>&1 ; } ) 2>>logs/$this_script && \\
-        \$(PRT_DU_CR) >>logs/$this_script
+        @( time { source envars && \$(crCMDSDIR)/$file >>logs/\$@ 2>&1 ; } ) 2>>logs/\$@ && \\
+        \$(PRT_DU_CR) >>logs/\$@
 EOF
 ) >> $MKFILE.tmp
@@ -297 +299 @@
 (
 cat << EOF
-        @( time { cp -v /sources/fstab /etc/fstab >>logs/${this_script} 2>&1 ; } ) 2>>logs/${this_script}
+        @( time { cp -v /sources/fstab /etc/fstab >>logs/\$@ 2>&1 ; } ) 2>>logs/\$@
 EOF
 ) >> $MKFILE.tmp