# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1267807963 -3600
# Node ID fa0257184d3cc3f6e8ec93102940c6a3bce6c022
# Parent  b792559721d174602ae0bbb07535b9c8e31bddc0
slitaz-loram*: be FAST_BOOT_X aware

diff -r b792559721d1 -r fa0257184d3c slitaz-loram-cdrom/receipt
--- a/slitaz-loram-cdrom/receipt	Fri Mar 05 09:08:38 2010 +0000
+++ b/slitaz-loram-cdrom/receipt	Fri Mar 05 17:52:43 2010 +0100
@@ -171,12 +171,16 @@
 post_install()
 {
     set_patch "$1"
+    
+    # Don't support FAST_BOOT_X yet
+    sed -i 's/FAST_BOOT_X=.*/FAST_BOOT_X="no"/' $1/etc/rcS.conf
+    
     cat <<EOF
 ----
 'tazlito gen-distro' will create a loram-cdrom flavor
 while this package is installed.
 EOF
-    if [ ! -x $1/bin/funionfs -a ! -d $1/var/lib/tazpkg/installed/aufs ]; then
+    if [ ! -x $1/bin/funionfs -a ! -d $1/var/lib/tazpkg/installed/aufs-utils ]; then
         cat <<EOF
 ----
 You will build a live CD with /usr mounted read-only.
diff -r b792559721d1 -r fa0257184d3c slitaz-loram-cdrom/stuff/loram.rootfs
--- a/slitaz-loram-cdrom/stuff/loram.rootfs	Fri Mar 05 09:08:38 2010 +0000
+++ b/slitaz-loram-cdrom/stuff/loram.rootfs	Fri Mar 05 17:52:43 2010 +0100
@@ -33,7 +33,7 @@
 done
 echo "$(du -hs ./usr/.moved | cut -f1) have been moved into /usr"
 usr=usr
-if [ -x bin/funionfs -o -d /var/lib/tazpkg/installed/aufs ]; then
+if [ -x bin/funionfs -o -d /var/lib/tazpkg/installed/aufs-utils ]; then
   usr=.usr.ro
   mkdir .usr.ro .usr.rw
 fi
diff -r b792559721d1 -r fa0257184d3c slitaz-loram-http/receipt
--- a/slitaz-loram-http/receipt	Fri Mar 05 09:08:38 2010 +0000
+++ b/slitaz-loram-http/receipt	Fri Mar 05 17:52:43 2010 +0100
@@ -129,6 +129,10 @@
 post_install()
 {
     set_patch "$1"
+    
+    # Don't support FAST_BOOT_X yet
+    sed -i 's/FAST_BOOT_X=.*/FAST_BOOT_X="no"/' $1/etc/rcS.conf
+    
     cat <<EOF
 ----
 'tazlito gen-distro' will create a loram-http flavor 
diff -r b792559721d1 -r fa0257184d3c slitaz-loram/receipt
--- a/slitaz-loram/receipt	Fri Mar 05 09:08:38 2010 +0000
+++ b/slitaz-loram/receipt	Fri Mar 05 17:52:43 2010 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="slitaz-loram"
-VERSION="1.5"
+VERSION="1.6"
 CATEGORY="misc"
 SHORT_DESC="Rules to build low ram rootfs.gz."
 MAINTAINER="pascal.bellard@slitaz.org"
@@ -21,7 +21,7 @@
     local line
     local len
     local i
-    tag="/dev/cdrom if need"
+    tag="Fast boot into X"
     i=$(grep -n "$tag" $1/etc/init.d/rcS | cut -d: -f1)
     i=$(($i-1))
     len=38
@@ -99,7 +99,7 @@
 ----
 'tazlito gen-distro' will create a loram flavor while this package is installed.
 EOF
-    if [ ! -x $1/bin/funionfs -a ! -d $1/var/lib/tazpkg/installed/aufs ]; then
+    if [ ! -x $1/bin/funionfs -a ! -d $1/var/lib/tazpkg/installed/aufs-utils ]; then
         cat <<EOF
 ----
 You will build a live CD with /usr mounted read-only.
diff -r b792559721d1 -r fa0257184d3c slitaz-loram/stuff/loram.iso
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/slitaz-loram/stuff/loram.iso	Fri Mar 05 17:52:43 2010 +0100
@@ -0,0 +1,8 @@
+if [ -s $1/rootfs.gz2 ]; then
+	local rem
+	rem=$(( $(stat -c "%s" $1/boot/rootfs.gz) % 4 ))
+	[ $rem -ne 0 ] && 
+	dd if=/dev/zero bs=1 count=$(( 4 - $rem )) >> $1/boot/rootfs.gz
+	cat $1/rootfs.gz2 >> $1/boot/rootfs.gz
+	rm -f $1/rootfs.gz2
+fi
diff -r b792559721d1 -r fa0257184d3c slitaz-loram/stuff/loram.rootfs
--- a/slitaz-loram/stuff/loram.rootfs	Fri Mar 05 09:08:38 2010 +0000
+++ b/slitaz-loram/stuff/loram.rootfs	Fri Mar 05 17:52:43 2010 +0100
@@ -30,7 +30,7 @@
 else
   usr/sbin/mksquashfs usr .usr.sqfs -comp lzma
 fi
-if [ -x bin/funionfs -o -d /var/lib/tazpkg/installed/aufs ]; then
+if [ -x bin/funionfs -o -d /var/lib/tazpkg/installed/aufs-utils ]; then
   mkdir .usr.rw .usr.ro
   usr=.usr.ro
 fi
@@ -39,9 +39,10 @@
 fi
 rm -rf usr
 mkdir usr
-COMPRESSION="gzip"
 echo "$(du -hs ./.usr.*fs | cut -f1) are used by /usr after compression"
 for ii in bin/vcsa2txt bin/awk bin/script bin/cut bin/readlink bin/du bin/free \
 	  bin/killall5 bin/seq bin/find bin/xargs bin/patch; do
   [ -e $ii ] || ln -s busybox $ii
 done
+echo .usr.*fs | cpio -o -H newc > $1/rootfs.gz2
+rm -f .usr.*fs