slitaz-modular rev 56
Fixed mktaz2xz function in slitaz-modular script. Also added -nopad option to both create_module functions in slitaz-modular and liblinuxlive scripts.
author | Christopher Rogers <slaxemulator@gmail.com> |
---|---|
date | Sun Apr 10 17:27:45 2011 +0000 (2011-04-10) |
parents | 3960f7d3f3a3 |
children | 309d8b00944f |
files | initramfs/liblinuxlive initramfs/usr/bin/slitaz-modular |
line diff
1.1 --- a/initramfs/liblinuxlive Sun Apr 10 17:18:56 2011 +0000 1.2 +++ b/initramfs/liblinuxlive Sun Apr 10 17:27:45 2011 +0000 1.3 @@ -480,7 +480,7 @@ 1.4 { 1.5 debug_log "create_module" "$*" 1.6 rm -f "$2" # overwrite, never append to existing file 1.7 - mksquashfs "$1" "$2" -b 256K $3 $4 $5 $6 $7 $8 $9>/dev/null 1.8 + mksquashfs "$1" "$2" -nopad -b 256K $3 $4 $5 $6 $7 $8 $9>/dev/null 1.9 if [ $? -ne 0 ]; then return 1; fi 1.10 chmod a-wx "$2" # remove execute and write attrib 1.11 chmod a+r "$2" # add read for everyone
2.1 --- a/initramfs/usr/bin/slitaz-modular Sun Apr 10 17:18:56 2011 +0000 2.2 +++ b/initramfs/usr/bin/slitaz-modular Sun Apr 10 17:27:45 2011 +0000 2.3 @@ -187,16 +187,18 @@ 2.4 PACKAGE_FILE="$(find -name "$1*.tazpkg")" 2.5 if [ -f "$PACKAGE_FILE" ]; then 2.6 { cpio --quiet -i receipt > /dev/null 2>&1; } < $PACKAGE_FILE 2.7 + unset PKGNAME PACKAGE VERSION EXTRAVERSION 2.8 source receipt || exit 1 2.9 - tazpkg extract $PACKAGE-$VERSION.tazpkg 2.10 + PKGNAME="${PACKAGE}-${VERSION}${EXTRAVERSION}" 2.11 + tazpkg extract $PACKAGE.tazpkg 2.12 for i in $INSTALL_FILES; do 2.13 - if [ -f "$PACKAGE-$VERSION/$i" ]; then 2.14 - mkdir -p $PACKAGE-$VERSION/fs/$INSTALLED/$PACKAGE 2.15 - cp -a $PACKAGE-$VERSION/$i $PACKAGE-$VERSION/fs/$INSTALLED/$PACKAGE/$i 2.16 + if [ -f "$PKGNAME/$i" ]; then 2.17 + mkdir -p $PKGNAME/fs/$INSTALLED/$PACKAGE 2.18 + cp -a $PKGNAME/$i $PKGNAME/fs/$INSTALLED/$PACKAGE/$i 2.19 fi 2.20 done 2.21 - md5sum $PACKAGE-$VERSION.tazpkg > $PACKAGE-$VERSION/fs/$INSTALLED/$PACKAGE/pkgmd5 2.22 - create_module $PACKAGE-$VERSION/fs $CUR_DIR/$PACKAGE-$VERSION.$EXT /var/lib/tazpkg/installed 2.23 + md5sum $PKGNAME.tazpkg > $PKGNAME/fs/$INSTALLED/$PACKAGE/pkgmd5 2.24 + create_module $PKGNAME/fs $CUR_DIR/$PKGNAME.$EXT /var/lib/tazpkg/installed 2.25 fi 2.26 } 2.27 2.28 @@ -231,7 +233,7 @@ 2.29 # fi 2.30 #fi 2.31 rm -f "$2" # overwrite, never append to existing file 2.32 - mksquashfs "$1" "$2" -b 256K -comp $COMPRESSION >/dev/null 2.33 + mksquashfs "$1" "$2" -b 256K -nopad -comp $COMPRESSION >/dev/null 2.34 if [ $? -ne 0 ]; then return 1; fi 2.35 chmod a-wx "$2" # remove execute and write attrib 2.36 chmod a+r "$2" # add read for everyone