SliTaz Repositories

     1.1 --- a/initramfs/initramfs.list	Sat Dec 18 19:05:13 2010 +0000
     1.2 +++ b/initramfs/initramfs.list	Fri Dec 24 12:31:39 2010 +0000
     1.3 @@ -5,6 +5,7 @@
     1.4  slitaz-base-files
     1.5  slitaz-boot-scripts
     1.6  zlib
     1.7 +syslinux
     1.8  linux-squashfs
     1.9  aufs
    1.10  module-init-tools

     2.1 --- a/mkiso.sh	Sat Dec 18 19:05:13 2010 +0000
     2.2 +++ b/mkiso.sh	Fri Dec 24 12:31:39 2010 +0000
     2.3 @@ -54,12 +54,15 @@
     2.4  #    error "error: This script must be run as root."
     2.5  #    exit 1
     2.6  #fi
     2.7 -if [ "$1" = "" ]; then
     2.8 +if [ ! -d $PROFILE -o "$1" = "" ]; then
     2.9  	echo "$0 profile-name"
    2.10  	echo "ex $0 core"
    2.11  	exit 1
    2.12  fi
    2.13  
    2.14 +ROOT_MOD="$(ls -1 ${PROFILE}/list | head -1)"
    2.15 +INST_ROOT="${MODULES_DIR}/$(basename ${ROOT_MOD} .list)"
    2.16 +
    2.17  if [ -f ${PROFILE}/config ]; then
    2.18  	source ${PROFILE}/config
    2.19  fi
    2.20 @@ -102,7 +105,7 @@
    2.21  initramfs () {
    2.22  
    2.23  	if [ ! -e "$BASEDIR/initramfs/initramfs.list" ]; then
    2.24 -		error "error: $PROFILE/list/initramfs.list doesn't exist, aborting."
    2.25 +		error "error: $BASEDIR/initramfs/initramfs.list doesn't exist, aborting."
    2.26  		exit 1
    2.27  	fi
    2.28  
    2.29 @@ -134,15 +137,6 @@
    2.30  		cp -f $INITRAMFS/boot/vmlinuz* $ISODIR/boot/bzImage
    2.31  		rm -f $INITRAMFS/boot/vmlinuz*
    2.32  	#fi
    2.33 -	
    2.34 -	if [ -d $PROFILE/rootcd ]; then
    2.35 -		cp -af $PROFILE/rootcd/* $ISODIR/
    2.36 -	fi
    2.37 -
    2.38 -	info "Copying isolinux files..."
    2.39 -	if [ -d $INST_ROOT/boot/isolinux ]; then
    2.40 -		cp -a $INST_ROOT/boot/isolinux $ISODIR/boot
    2.41 -	fi
    2.42  
    2.43  	if [ -d $BASEDIR/initramfs ]; then
    2.44  		cp -af $BASEDIR/initramfs/* $INITRAMFS
    2.45 @@ -354,11 +348,19 @@
    2.46  
    2.47  make_iso () {
    2.48  	imgcommon
    2.49 -	#initramfs
    2.50  
    2.51  	info "Creating rootfs.gz"
    2.52  	pack_rootfs $INITRAMFS $ISODIR/boot/rootfs.gz
    2.53  
    2.54 +	if [ -d $PROFILE/rootcd ]; then
    2.55 +		cp -af $PROFILE/rootcd/* $ISODIR/
    2.56 +	fi
    2.57 +
    2.58 +	info "Copying isolinux files..."
    2.59 +	if [ -d $INITRAMFS/boot/isolinux ]; then
    2.60 +		cp -a $INITRAMFS/boot/isolinux $ISODIR/boot
    2.61 +	fi
    2.62 +
    2.63  	if [ -d ${PROFILE}/overlay ]; then
    2.64  		_overlay
    2.65  	fi