# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1315298519 -7200
# Node ID b728f44da66f9ae272024efdf84be169db63896d
# Parent  1504413dd21f8ed67d0c8bae2e7d646716571569
rolling.sh: build preinit too

diff -r 1504413dd21f -r b728f44da66f mirror-tools/rootfs/usr/bin/mkpkgiso
--- a/mirror-tools/rootfs/usr/bin/mkpkgiso	Sun Sep 04 16:44:28 2011 +0200
+++ b/mirror-tools/rootfs/usr/bin/mkpkgiso	Tue Sep 06 10:41:59 2011 +0200
@@ -292,10 +292,10 @@
 f=$(ls $REPOS/$1-[0-9]*.tazpkg 2> /dev/null)
 [ -f "$f" ] || return 1
 [ -d $TEMP_DIR/boot ] || mkdir $TEMP_DIR/boot
-( cd $TEMP_DIR/boot ; cpio -i fs.cpio.gz < $f 2> /dev/null ) 
-( cd $TEMP_DIR/boot ; zcat fs.cpio.gz | cpio -id 2> /dev/null )
+( cd $TEMP_DIR/boot ; cpio -i fs.cpio.gz fs.cpio.lzma < $f 2> /dev/null ) 
+( cd $TEMP_DIR/boot ; { zcat fs.cpio.gz || unlzma -c fs.cpio.lzma ; } | cpio -id 2> /dev/null )
 mv $TEMP_DIR/boot/fs/boot/* $TEMP_DIR/boot
-rm -rf $TEMP_DIR/boot/fs.cpio.gz $TEMP_DIR/boot/fs
+rm -rf $TEMP_DIR/boot/fs.cpio.* $TEMP_DIR/boot/fs
 return 0
 }
 
@@ -422,7 +422,9 @@
 
 cd ${ROOT}
 echo -n "Creating hybrid DVD/CDROM"
-which isohybrid > /dev/null && isohybrid $IMAGE 2> /dev/null
+ISOHYBRID=isohybrid.sh
+which isohybrid > /dev/null && ISOHYBRID=isohybrid
+which $ISOHYBRID > /dev/null && $ISOHYBRID $IMAGE 2> /dev/null
 status
 
 echo -n "Calculating md5sum"
diff -r 1504413dd21f -r b728f44da66f mirror-tools/rootfs/usr/bin/rolling.sh
--- a/mirror-tools/rootfs/usr/bin/rolling.sh	Sun Sep 04 16:44:28 2011 +0200
+++ b/mirror-tools/rootfs/usr/bin/rolling.sh	Tue Sep 06 10:41:59 2011 +0200
@@ -3,7 +3,7 @@
 # Location of slitaz rolling release
 rolling=/home/bellard/rolling
 
-flavors="core-4in1 core"
+flavors="core-4in1 core preinit"
 packages=/home/slitaz/cooking/chroot/home/slitaz/packages
 
 # We use the last build as build environment
@@ -11,7 +11,8 @@
 
 # Build the rolling release if something is new on mirror
 for flavor in $flavors ; do
-    if [ $packages/$flavor.flavor -nt $rolling/slitaz-$flavor.iso -o \
+    if [ ! -s $rolling/slitaz-$flavor.iso \
+	 $packages/$flavor.flavor -nt $rolling/slitaz-$flavor.iso -o \
          $packages/packages.list -nt $rolling/slitaz-$flavor.iso ]; then
 	[ -d $rolling ] || mkdir -p $rolling
 	TMP=$rolling/tmp$$