Package management: compute times and sizes without packing times and sizes
This commit is contained in:
parent
6a7c2181fc
commit
f7d138607b
4 changed files with 9 additions and 4 deletions
|
@ -953,7 +953,6 @@ menu "Advanced Features"
|
|||
depends !BOOK_BLFS
|
||||
|
||||
config REPORT
|
||||
depends !PKGMNGT
|
||||
bool "Create SBU and disk usage report"
|
||||
default y
|
||||
|
||||
|
|
|
@ -236,7 +236,9 @@ done
|
|||
for dir in $PKG_DEST/{boot,etc,lib,bin,sbin}; do
|
||||
[[ -z $(ls $dir) ]] && rmdir -v $dir
|
||||
done
|
||||
PREV_SEC=${SECONDS}
|
||||
packInstall
|
||||
SECONDS=${PREV_SEC}
|
||||
rm -rf $PKG_DEST
|
||||
</xsl:text>
|
||||
</xsl:if>
|
||||
|
@ -308,7 +310,9 @@ cd $PKGDIR
|
|||
@role != 'nodump']/userinput[@remap != 'adjust']"
|
||||
mode="pkgmngt"/>
|
||||
<xsl:if test="$dirname = 'chapter06'">
|
||||
<xsl:text>packInstall
|
||||
<xsl:text>PREV_SEC=${SECONDS}
|
||||
packInstall
|
||||
SECONDS=${PREV_SEC}
|
||||
rm -rf $PKG_DEST
|
||||
</xsl:text>
|
||||
</xsl:if>
|
||||
|
@ -489,7 +493,9 @@ PKGDIR=$(dirname $PKGDIR)/tzdata-</xsl:text>
|
|||
<xsl:text>ZONEINFO=$PKG_DEST</xsl:text>
|
||||
<xsl:copy-of select="substring-after(string(),'ZONEINFO=')"/>
|
||||
<xsl:text>
|
||||
PREV_SEC=${SECONDS}
|
||||
packInstall
|
||||
SECONDS=${PREV_SEC}
|
||||
rm -rf $PKG_DEST
|
||||
PKG_DEST=$OLD_PKG_DEST
|
||||
unset OLD_PKG_DEST
|
||||
|
|
|
@ -121,7 +121,7 @@ done
|
|||
# For printing the last 'Installed files disk usage', we need to 'du' the
|
||||
# root dir, excluding the jhalfs directory (and lost+found). We assume
|
||||
# that the rootdir is $LOGSDIR/../..
|
||||
DU1=`du -skx --exclude=jhalfs --exclude=lost+found $LOGSDIR/../.. | cut -f1`
|
||||
DU1=`du -skx --exclude=jhalfs --exclude=lost+found --exclude /var/lib $LOGSDIR/../.. | cut -f1`
|
||||
DU1MB=`perl -e 'printf "%.3f" , ('$DU1' / '1024')';`
|
||||
INSTALL=`perl -e 'print ('$DU1' - '$DU1PREV')';`
|
||||
INSTALLMB=`perl -e 'printf "%.3f" , ('$DU1MB' - '$DU1MBPREV')';`
|
||||
|
|
|
@ -39,7 +39,7 @@ crFILELOGDIR = /\$(SCRIPT_ROOT)/$FILELOGDIRBASE
|
|||
SU_LUSER = sudo -u \$(LUSER) -i sh -c
|
||||
LUSER_HOME = \$(LHOME)/\$(LUSER)
|
||||
PRT_DU = echo -e "\nKB: \`du -skx --exclude=\$(SCRIPT_ROOT) --exclude=lost+found \$(MOUNT_PT) \`\n"
|
||||
PRT_DU_CR = echo -e "\nKB: \`du -skx --exclude=\$(SCRIPT_ROOT) --exclude=lost+found / \`\n"
|
||||
PRT_DU_CR = echo -e "\nKB: \`du -skx --exclude=\$(SCRIPT_ROOT) --exclude=lost+found --exclude /var/lib / \`\n"
|
||||
|
||||
ADD_REPORT = $REPORT
|
||||
ADD_CUSTOM_TOOLS = $CUSTOM_TOOLS
|
||||
|
|
Reference in a new issue