slitaz-modular rev 15
Updated mkiso.sh script. Now initramfs is base of union. This is so we can save 10mb on iso.
author | Christopher Rogers <slaxemulator@gmail.com> |
---|---|
date | Thu Dec 16 09:27:14 2010 +0000 (2010-12-16) |
parents | b4d482e0ed14 |
children | 0e5731bcfb46 |
files | mkiso.sh |
line diff
1.1 --- a/mkiso.sh Thu Dec 16 09:25:30 2010 +0000 1.2 +++ b/mkiso.sh Thu Dec 16 09:27:14 2010 +0000 1.3 @@ -21,8 +21,8 @@ 1.4 RMSTUFF=n 1.5 MVSTUFF=n 1.6 UNGZIP=n 1.7 -EXT="sqfs" 1.8 -COMPRESSION="gzip" 1.9 +EXT="xz" 1.10 +COMPRESSION="xz -Xbcj x86" 1.11 MKOPTION="-b 256k" 1.12 MODULES="" 1.13 WORKING="$PROFILE/working" 1.14 @@ -32,9 +32,11 @@ 1.15 ISODIR="$WORKING/iso" 1.16 IMGNAME="$PROFILE/$CDNAME-$(date +%F).iso" 1.17 IMGMD5NAME="$IMGNAME.md5" 1.18 -LASTBR="$WORKING/empty" 1.19 +LASTBR="$INITRAMFS" 1.20 SGNFILE="$ISODIR/$CDNAME/livecd.sgn" 1.21 MODULES_DIR="$WORKING/modules" 1.22 +ROOT_MOD="$(ls -1 ${PROFILE}/list | head -1)" 1.23 +INIT_ROOT="$MODULES_DIR/$(basename ${ROOT_MOD} .list)" 1.24 HG_DIR="$WORKING/hg" 1.25 COPY_HG="no" 1.26 UPDATE_HG="no" 1.27 @@ -124,22 +126,19 @@ 1.28 mkdir -p $ISODIR/boot 1.29 fi 1.30 1.31 - if [ ! -f $ISODIR/boot/bzImage ]; then 1.32 + #if [ ! -f $ISODIR/boot/bzImage ]; then 1.33 cp -f $INITRAMFS/boot/vmlinuz* $ISODIR/boot/bzImage 1.34 rm -f $INITRAMFS/boot/vmlinuz* 1.35 - fi 1.36 + #fi 1.37 1.38 info "Copying isolinux files..." 1.39 - if [ -d $INITRAMFS/boot/isolinux ]; then 1.40 - cp -a $INITRAMFS/boot/isolinux $ISODIR/boot 1.41 + if [ -d $INST_ROOT/boot/isolinux ]; then 1.42 + cp -a $INST_ROOT/boot/isolinux $ISODIR/boot 1.43 fi 1.44 1.45 if [ -d $PROFILE/initramfs ]; then 1.46 cp -af $PROFILE/initramfs/* $INITRAMFS 1.47 fi 1.48 - 1.49 - info "Creating rootfs.gz" 1.50 - pack_rootfs $INITRAMFS $ISODIR/boot/rootfs.gz 1.51 } 1.52 1.53 copy_hg() { 1.54 @@ -209,13 +208,17 @@ 1.55 error "Error loading Union filesystem module. (aufs)" 1.56 exit 1 1.57 fi 1.58 + 1.59 + # $INITRAMFS is now $LASTBR 1.60 + # This will be copyed to /mnt/memory/changes on boot 1.61 + initramfs 1.62 1.63 mount -t aufs -o br:${LASTBR}=rw aufs ${UNION} 1.64 if [ $? -ne 0 ]; then 1.65 error "Error mounting $union." 1.66 exit 1 1.67 fi 1.68 - 1.69 + 1.70 info "====> Installing packages to '$UNION'" 1.71 for mod in $MODULES; do 1.72 1.73 @@ -343,7 +346,10 @@ 1.74 1.75 make_iso () { 1.76 imgcommon 1.77 - initramfs 1.78 + #initramfs 1.79 + 1.80 + info "Creating rootfs.gz" 1.81 + pack_rootfs $INITRAMFS $ISODIR/boot/rootfs.gz 1.82 1.83 if [ -d ${PROFILE}/overlay ]; then 1.84 _overlay