Changeset 8bea2c8


Ignore:
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.

Files:
5 edited

Legend:

Unmodified
Added
Removed

  • CLFS/master.sh

    r03a18bf r8bea2c8  
    11471147SU_LUSER     = su - \$(LUSER) -c
    11481148LUSER_HOME   = /home/\$(LUSER)
    1149 PRT_DU       = echo -e "\nKB: \`du -skx --exclude=jhalfs \$(MOUNT_PT)\`\n"
    1150 PRT_DU_CR    = echo -e "\nKB: \`du -skx --exclude=\$(SCRIPT_ROOT) / \`\n"
     1149PRT_DU       = echo -e "\nKB: \`du -skx --exclude=jhalfs --exclude=lost+found \$(MOUNT_PT)\`\n"
     1150PRT_DU_CR    = echo -e "\nKB: \`du -skx --exclude=\$(SCRIPT_ROOT) --exclude=lost+found / \`\n"
    11511151
    11521152export PATH := \${PATH}:/usr/sbin

  • CLFS2/master.sh

    r03a18bf r8bea2c8  
    451451
    452452SU_LUSER   = su - \$(LUSER) -c
    453 PRT_DU     = echo -e "\nKB: \`du -skx --exclude=jhalfs \$(MOUNT_PT)\`\n"
     453PRT_DU     = echo -e "\nKB: \`du -skx --exclude=jhalfs --exclude=lost+found \$(MOUNT_PT)\`\n"
    454454LUSER_HOME = /home/\$(LUSER)
    455455

  • HLFS/master.sh

    r03a18bf r8bea2c8  
    519519SU_LUSER     = su - \$(LUSER) -c
    520520LUSER_HOME   = /home/\$(LUSER)
    521 PRT_DU       = echo -e "\nKB: \`du -skx --exclude=jhalfs \$(MOUNT_PT)\`\n"
    522 PRT_DU_CR    = echo -e "\nKB: \`du -skx --exclude=\$(SCRIPT_ROOT) / \`\n"
     521PRT_DU       = echo -e "\nKB: \`du -skx --exclude=jhalfs --exclude=lost+found \$(MOUNT_PT)\`\n"
     522PRT_DU_CR    = echo -e "\nKB: \`du -skx --exclude=\$(SCRIPT_ROOT) --exclude=lost+found / \`\n"
    523523
    524524export PATH := \${PATH}:/usr/sbin

  • LFS/master.sh

    r03a18bf r8bea2c8  
    226226    # Drop in the name of the target on a new line, and the previous target
    227227    # as a dependency. Also call the echo_message function.
    228     CHROOT_wrt_target "${this_script}${N}" "$PREV"
     228    # In the mount of kernel filesystems we need to set LFS
     229    # and not to use chroot.
     230    case "${this_script}" in
     231      *kernfs)  LUSER_wrt_target  "${this_script}" "$PREV" ;;
     232      *)        CHROOT_wrt_target "${this_script}${N}" "$PREV" ;;
     233    esac
    229234
    230235    # If $pkg_tarball isn't empty, we've got a package...
    … …  
    403408SU_LUSER     = su - \$(LUSER) -c
    404409LUSER_HOME   = /home/\$(LUSER)
    405 PRT_DU       = echo -e "\nKB: \`du -skx --exclude=\$(SCRIPT_ROOT) \$(MOUNT_PT) \`\n"
    406 PRT_DU_CR    = echo -e "\nKB: \`du -skx --exclude=\$(SCRIPT_ROOT) / \`\n"
     410PRT_DU       = echo -e "\nKB: \`du -skx --exclude=\$(SCRIPT_ROOT) --exclude=lost+found \$(MOUNT_PT) \`\n"
     411PRT_DU_CR    = echo -e "\nKB: \`du -skx --exclude=\$(SCRIPT_ROOT) --exclude=lost+found / \`\n"
    407412
    408413export PATH := \${PATH}:/usr/sbin

  • common/common-functions

    r03a18bf r8bea2c8  
    6767wrt_RunAsRoot() {                  # Some scripts must be run as root..
    6868#----------------------------------#
    69   local ENV_MOUNT
     69  local MOUNT_ENV
    7070  local this_script=$1
    7171  local file=$2
    … …  
    8383cat << EOF
    8484        @( time { export ${MOUNT_ENV}=\$(MOUNT_PT) && ${PROGNAME}-commands/`dirname $file`/\$@ >>logs/\$@ 2>&1 ; } ) 2>>logs/\$@ && \\
    85         \$(PRT_DU_CR) >>logs/\$@
     85        \$(PRT_DU) >>logs/\$@
    8686EOF
    8787) >> $MKFILE.tmp
    … …  
    9898(
    9999cat << EOF
    100         @( time { source envars && \$(CMDSDIR)/$file >>logs/$this_script 2>&1 ; } ) 2>>logs/$this_script && \\
    101         \$(PRT_DU_CR) >>logs/$this_script
     100        @( time { source envars && \$(CMDSDIR)/$file >>logs/\$@ 2>&1 ; } ) 2>>logs/\$@ && \\
     101        \$(PRT_DU_CR) >>logs/\$@
    102102EOF
    103103) >> $MKFILE.tmp
    … …  
    140140        @\$(call echo_message, Building)
    141141        @./progress_bar.sh \$@ \$\$PPID &
    142         @echo -e "\n\`date\`\n\nKB: \`du -skx --exclude=\$(SCRIPT_ROOT) \$(MOUNT_PT)\`\n" >logs/\$@
     142        @echo -e "\n\`date\`\n" >logs/\$@ &
     143        @\$(PRT_DU) >>logs/\$@
    143144EOF
    144145) >> $MKFILE.tmp
    … …  
    229230  case $i in
    230231    iteration* ) local LOGFILE="${this_script}.log" ;;
    231              * ) local LOGFILE="${this_script}"      ;;
     232             * ) local LOGFILE="\$@"      ;;
    232233  esac
    233234(
    … …  
    237238        @\$(call echo_message, Building)
    238239        @./progress_bar.sh \$@ \$\$PPID &
    239         @echo -e "\n\`date\`\n\nKB: \`du -skx --exclude=\$(SCRIPT_ROOT) / \`\n" >logs/$LOGFILE
     240        @echo -e "\n\`date\`\n" >logs/$LOGFILE &
     241        @\$(PRT_DU_CR) >>logs/$LOGFILE
    240242EOF
    241243) >> $MKFILE.tmp
    … …  
    284286(
    285287cat << EOF
    286         @( time { source envars && \$(crCMDSDIR)/$file >>logs/$this_script 2>&1 ; } ) 2>>logs/$this_script && \\
    287         \$(PRT_DU_CR) >>logs/$this_script
     288        @( time { source envars && \$(crCMDSDIR)/$file >>logs/\$@ 2>&1 ; } ) 2>>logs/\$@ && \\
     289        \$(PRT_DU_CR) >>logs/\$@
    288290EOF
    289291) >> $MKFILE.tmp
    … …  
    297299(
    298300cat << EOF
    299         @( time { cp -v /sources/fstab /etc/fstab >>logs/${this_script} 2>&1 ; } ) 2>>logs/${this_script}
     301        @( time { cp -v /sources/fstab /etc/fstab >>logs/\$@ 2>&1 ; } ) 2>>logs/\$@
    300302EOF
    301303) >> $MKFILE.tmp
Note: See TracChangeset for help on using the changeset viewer.