# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1205067633 0
# Node ID 80bb089358eaa1712da57624e0ad60d1d696c1da
# Parent  5b4e22afe7993b5cf069dd7b5913954fe1af9ac4
Slitaz-loram-cdrom: decrease memory footprint a bit

diff -r 5b4e22afe799 -r 80bb089358ea slitaz-loram-cdrom/receipt
--- a/slitaz-loram-cdrom/receipt	Sun Mar 09 12:58:23 2008 +0000
+++ b/slitaz-loram-cdrom/receipt	Sun Mar 09 13:00:33 2008 +0000
@@ -26,7 +26,7 @@
     	line="-$(($i-24)),26 +$(($i-24)),2"
 	i="-"
     else
-        grep -q 'if [ -d /cdrom ]; then' $1/etc/init.d/rcS && return
+        grep -q 'from slitaz-loram-cdrom package' $1/etc/init.d/rcS && return
     	line="-$i,2 +$i,26"
 	i="+"
     fi
@@ -35,7 +35,7 @@
 +++ $1/etc/init.d/rcS
 @@ $line @@
  
-$i# Mount /usr
+$i# Mount /usr (from slitaz-loram-cdrom package)
 $i if [ -d /cdrom ]; then
 $i	mount -o ro -t iso9660 /dev/cdrom /cdrom
 $i	if [ -d /.usr.rw -a -x /bin/funionfs ]; then
@@ -68,9 +68,11 @@
 pre_install()
 {
     local i
+    . /etc/tazlito/tazlito.conf
     for i in $(cd /var/lib/tazpkg/installed ; ls -d slitaz-loram* 2> /dev/null); do
         [ "$i" = "$PACKAGE" ] && continue
         yes y | tazpkg remove $i
+	rm -f $PACKAGES_REPOSITORY/slitaz-boot-scripts-*.tazpkg 2> /dev/null
     done
 }
 
@@ -79,9 +81,12 @@
     set_patch "$1"
     if [ ! -x /bin/funionfs ]; then
         cat <<EOF
+----
 You will build a live CD with /usr mounted read-only.
-You can install funionfs to have read-write access to /usr with:
+You can install funionfs to have read-write access into /usr with:
+
 # tazpkg get-install funionfs
+
 EOF
     fi
 }
diff -r 5b4e22afe799 -r 80bb089358ea slitaz-loram-cdrom/stuff/loram.rootfs
--- a/slitaz-loram-cdrom/stuff/loram.rootfs	Sun Mar 09 12:58:23 2008 +0000
+++ b/slitaz-loram-cdrom/stuff/loram.rootfs	Sun Mar 09 13:00:33 2008 +0000
@@ -1,7 +1,8 @@
 echo "$(du -hs /usr | cut -f1) were used by /usr"
 for ii in /sbin /lib /bin; do
   mkdir -p ./usr/.moved$ii
-  for j in e2fsprogs pcmciautils cpio syslinux-extra isapnptools ncurses; do
+  for j in e2fsprogs pcmciautils cpio syslinux-extra isapnptools ncurses \
+	   libcap; do
     for k in $(grep ^$ii /var/lib/tazpkg/installed/$j/files.list) ; do
       [ -f .$k ] || continue
       mv .$k ./usr/.moved$k
@@ -9,13 +10,18 @@
     done
   done
 done
-for ii in /var/lib/tazpkg/installed ; do
+k="$(ls /lib/lib[rp]*.so)"
+[ -x /bin/funionfs ] && k="$(ls /lib/libresolv*.so)"
+for ii in /var/lib/tazpkg/installed /lib/modules/*/kernel/drivers/net \
+	  /lib/modules/*/kernel/sound /sbin/depmod /sbin/modinfo /bin/lsmod \
+	  /lib/libns*.so $k; do
+  [ -L .$ii ] && continue
   j=$(dirname /usr/.moved$ii)
   mkdir -p .$j
   mv .$ii .$j
   ln -s /usr/.moved$ii .$ii
 done
-echo "$(du -hs /usr/.moved | cut -f1) have been moved into /usr"
+echo "$(du -hs ./usr/.moved | cut -f1) have been moved into /usr"
 usr=usr
 if [ -x bin/funionfs ]; then
   usr=.usr.ro
@@ -36,7 +42,7 @@
   mkdir usr
 else
   mv usr ../rootcd
-  [ "$usr" = "usr" ] || rmdir $usr
+  [ "$usr" = "usr" ] || mv $usr usr
   ln -s /cdrom/usr $usr
   ln -s /bin ../rootcd/bin
 fi
@@ -44,4 +50,5 @@
   ln -s busybox $ii
 done
 mkdir cdrom
+#rm -rf var/cache/fontconfig/* home/*/.ash* 
 COMPRESSION="gzip"