# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1204376133 0
# Node ID 3a5e92c048e05558fe75781608e37e71f5adb7fb
# Parent  e588ccb82a031f8ef84f6ea4e8ae3ea8bda953f6
Slitaz-loram*: update patch according to /etc/init.d/rcS

diff -r e588ccb82a03 -r 3a5e92c048e0 slitaz-loram-cdrom/receipt
--- a/slitaz-loram-cdrom/receipt	Sat Mar 01 11:31:53 2008 +0000
+++ b/slitaz-loram-cdrom/receipt	Sat Mar 01 12:55:33 2008 +0000
@@ -10,37 +10,7 @@
 genpkg_rules()
 {
     mkdir -p $fs/etc/tazlito
-    cat > $fs/etc/tazlito/loram.rootfs << EOF
-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 k in \$(grep ^\$ii /var/lib/tazpkg/installed/\$j/files.list) ; do
-      [ -f .\$k ] || continue
-      mv .\$k ./usr/.moved\$k
-      ln -s /usr/.moved\$k .\$k 
-    done
-  done
-done
-for ii in /var/lib/tazpkg/installed ; do
-  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"
-if [ -x usr/sbin/mksquashfs ]; then
-  usr/sbin/mksquashfs usr ../rootcd/usr.sqfs
-  rm -rf usr
-  mkdir usr
-else
-  mv usr ../rootcd
-  ln -s /cdrom/usr usr
-  ln -s /bin ../rootcd/bin
-fi
-mkdir cdrom
-COMPRESSION="gzip"
-EOF
+    cp stuff/loram.rootfs $fs/etc/tazlito
 }
 
 get_patch()
@@ -48,26 +18,36 @@
     cat <<EOF
 --- /etc/init.d/rcS
 +++ /etc/init.d/rcS
-@@ -54,4 +54,4 @@
+@@ -53,4 +53,4 @@
+ /bin/dmesg > /var/log/dmesg.log
+-/usr/bin/vcsa2txt < /dev/vcsa1 > /var/log/boot.log
+-/usr/bin/script -a -q -c '/etc/init.d/rcS logged' /var/log/boot.log
++busybox vcsa2txt < /dev/vcsa1 > /var/log/boot.log
++busybox script -a -q -c '/etc/init.d/rcS logged' /var/log/boot.log
+ 
+@@ -62,4 +62,4 @@
  #
 -DRIVE_NAME=`cat /proc/sys/dev/cdrom/info | grep "drive name" | cut -f 3`
 -if [ ! "`readlink /dev/cdrom`" ]; then
 +DRIVE_NAME=`cat /proc/sys/dev/cdrom/info | grep "drive name" | busybox cut -f 3`
 +if [ ! "`busybox readlink /dev/cdrom`" ]; then
  	echo -n "Creating symlink : /dev/cdrom..."
-@@ -69,2 +69,12 @@
+@@ -87,2 +87,15 @@
  
 +# Mount /usr
 +if [ -d /cdrom ]; then
 +	echo -n "Mounting /usr read-only from /cdrom... "
-+	/bin/mount -o ro -t iso9660 /dev/cdrom /cdrom
++	mount -o ro -t iso9660 /dev/cdrom /cdrom
 +	if [ -f /cdrom/usr.sqfs ]; then
-+		/bin/mount -o loop,ro -t squashfs /cdrom/usr.sqfs /usr
++		mount -o loop,ro -t squashfs /cdrom/usr.sqfs /usr
++	elif [ ! -L /usr ]; then
++		umount /cdrom
++		false
 +	fi
 +	status 
 +fi
 +
- # Handle kernel cmdline parameter modprobe=<module_list> 
+ # Handle kernel cmdline parameter config=<device>,<path> to source a 
 EOF
 }
 
@@ -87,5 +67,5 @@
 # Pre remove commands for Tazpkg.
 pre_remove()
 {
-    get_patch | patch -R -p0
+    [ -L /usr/bin/patch ] || get_patch | patch -R -p0
 }
diff -r e588ccb82a03 -r 3a5e92c048e0 slitaz-loram-cdrom/stuff/loram.rootfs
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/slitaz-loram-cdrom/stuff/loram.rootfs	Sat Mar 01 12:55:33 2008 +0000
@@ -0,0 +1,29 @@
+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 k in $(grep ^$ii /var/lib/tazpkg/installed/$j/files.list) ; do
+      [ -f .$k ] || continue
+      mv .$k ./usr/.moved$k
+      ln -s /usr/.moved$k .$k 
+    done
+  done
+done
+for ii in /var/lib/tazpkg/installed ; do
+  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"
+if [ -x usr/sbin/mksquashfs ]; then
+  usr/sbin/mksquashfs usr ../rootcd/usr.sqfs
+  rm -rf usr
+  mkdir usr
+else
+  mv usr ../rootcd
+  ln -s /cdrom/usr usr
+  ln -s /bin ../rootcd/bin
+fi
+mkdir cdrom
+COMPRESSION="gzip"
diff -r e588ccb82a03 -r 3a5e92c048e0 slitaz-loram/receipt
--- a/slitaz-loram/receipt	Sat Mar 01 11:31:53 2008 +0000
+++ b/slitaz-loram/receipt	Sat Mar 01 12:55:33 2008 +0000
@@ -11,32 +11,7 @@
 genpkg_rules()
 {
     mkdir -p $fs/etc/tazlito
-    cat > $fs/etc/tazlito/loram.rootfs << EOF
-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 k in \$(grep ^\$ii ./var/lib/tazpkg/installed/\$j/files.list) ; do
-      [ -f .\$k ] || continue
-      mv .\$k ./usr/.moved\$k
-      ln -s /usr/.moved\$k .\$k 
-    done
-  done
-done
-for ii in /var/lib/tazpkg/installed ; do
-  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 | cut -f1) were used by /usr before compression"
-usr/sbin/mksquashfs usr .usr.sqfs
-rm -rf usr
-mkdir usr
-COMPRESSION="none"
-echo "\$(du -hs ./.usr.sqfs | cut -f1) are used by /usr after compression"
-EOF
+    cp stuff/loram.rootfs $fs/etc/tazlito
 }
 
 get_patch()
@@ -44,7 +19,7 @@
     cat <<EOF
 --- /etc/init.d/rcS
 +++ /etc/init.d/rcS
-@@ -68,2 +68,9 @@
+@@ -58,2 +58,9 @@
  
 +# Mount compressed /usr
 +if [ -f /.usr.sqfs ]; then
@@ -73,5 +48,5 @@
 # Pre remove commands for Tazpkg.
 pre_remove()
 {
-    get_patch | patch -R -p0
+    [ -L /usr/bin/patch ] || get_patch | patch -R -p0
 }
diff -r e588ccb82a03 -r 3a5e92c048e0 slitaz-loram/stuff/loram.rootfs
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/slitaz-loram/stuff/loram.rootfs	Sat Mar 01 12:55:33 2008 +0000
@@ -0,0 +1,24 @@
+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 k in $(grep ^$ii ./var/lib/tazpkg/installed/$j/files.list) ; do
+      [ -f .$k ] || continue
+      mv .$k ./usr/.moved$k
+      ln -s /usr/.moved$k .$k 
+    done
+  done
+done
+for ii in /var/lib/tazpkg/installed ; do
+  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 | cut -f1) were used by /usr before compression"
+usr/sbin/mksquashfs usr .usr.sqfs
+rm -rf usr
+mkdir usr
+COMPRESSION="none"
+echo "$(du -hs ./.usr.sqfs | cut -f1) are used by /usr after compression"