slitaz-modular rev 2
Added CLEAN_INITRAMFS variable into mkiso.sh. Made sure union does run if MODULES in null.
author | Christopher Rogers <slaxemulator@gmail.com> |
---|---|
date | Fri Nov 26 05:13:44 2010 +0000 (2010-11-26) |
parents | 393f2374d675 |
children | fcd81ec926be |
files | mkiso.sh |
line diff
1.1 --- a/mkiso.sh Thu Nov 25 03:32:42 2010 +0000 1.2 +++ b/mkiso.sh Fri Nov 26 05:13:44 2010 +0000 1.3 @@ -41,6 +41,7 @@ 1.4 BACKUP_SOURCES="no" 1.5 BACKUP_PACKAGES="no" 1.6 CLEAN_MODULES_DIR="no" 1.7 +CLEAN_INITRAMFS="no" 1.8 HG_LIST="flavors flavors-stable slitaz-base-files slitaz-boot-scripts slitaz-configs slitaz-doc slitaz-pizza slitaz-tools tank tazlito tazpkg tazusb tazwok website wok" 1.9 1.10 error () { echo -e "\033[1;31;40m!!! \033[1;37;40m$@\033[1;0m"; } 1.11 @@ -99,6 +100,12 @@ 1.12 exit 1 1.13 fi 1.14 1.15 + if [ "$CLEAN_INITRAMFS" = "yes" ]; then 1.16 + if [ -d ${INITRAMFS} ]; then 1.17 + rm -Rf ${INITRAMFS} 1.18 + fi 1.19 + fi 1.20 + 1.21 info "Making bootable image" 1.22 cat "$PROFILE/list/initramfs.list" | grep -v "^#" | while read pkgname; do 1.23 if [ ! -d ${INITRAMFS}/var/lib/tazpkg/installed/${pkgname} ]; then 1.24 @@ -138,7 +145,7 @@ 1.25 elif [ -d ${HG_DIR}/hg-${1}/home/slitaz/hg/$1 -a ${UPDATE_HG} = "yes" ]; then 1.26 info "Updating $1 repo ..." 1.27 cd ${HG_DIR}/hg-${1}/home/slitaz/hg/$1 && 1.28 - hg pull && hg update 1.29 + hg pull -u 1.30 cd $PROFILE 1.31 fi 1.32 } 1.33 @@ -350,6 +357,11 @@ 1.34 md5sum "${IMGNAME}" > $IMGMD5NAME 1.35 } 1.36 1.37 +if [ "$MODULES" != "" ]; then 1.38 + union 1.39 +else 1.40 + error "MODULES was empty. exiting." 1.41 + exit 1 1.42 +fi 1.43 1.44 -union 1.45 make_iso