diff --git a/Config.in b/Config.in index 931bfc9..8fc50ee 100644 --- a/Config.in +++ b/Config.in @@ -953,7 +953,6 @@ menu "Advanced Features" depends !BOOK_BLFS config REPORT - depends !PKGMNGT bool "Create SBU and disk usage report" default y diff --git a/LFS/lfs.xsl b/LFS/lfs.xsl index 7be0078..5cfd2fd 100644 --- a/LFS/lfs.xsl +++ b/LFS/lfs.xsl @@ -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 @@ -308,7 +310,9 @@ cd $PKGDIR @role != 'nodump']/userinput[@remap != 'adjust']" mode="pkgmngt"/> - packInstall + PREV_SEC=${SECONDS} +packInstall +SECONDS=${PREV_SEC} rm -rf $PKG_DEST @@ -489,7 +493,9 @@ PKGDIR=$(dirname $PKGDIR)/tzdata- ZONEINFO=$PKG_DEST +PREV_SEC=${SECONDS} packInstall +SECONDS=${PREV_SEC} rm -rf $PKG_DEST PKG_DEST=$OLD_PKG_DEST unset OLD_PKG_DEST diff --git a/common/create-sbu_du-report.sh b/common/create-sbu_du-report.sh index aac4a59..ad3e441 100755 --- a/common/create-sbu_du-report.sh +++ b/common/create-sbu_du-report.sh @@ -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')';` diff --git a/common/libs/func_wrt_Makefile b/common/libs/func_wrt_Makefile index 49c5bab..d635014 100644 --- a/common/libs/func_wrt_Makefile +++ b/common/libs/func_wrt_Makefile @@ -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