# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1416325592 -3600
# Node ID aef2253222535372f120848b81a36862b292a55c
# Parent  f52ce3fe729d0a3a3217799f6ae24fc3e2438f9e
tazdebian: postinst -> postrm

diff -r f52ce3fe729d -r aef225322253 rpi/tazbian
--- a/rpi/tazbian	Tue Nov 18 13:40:01 2014 +0100
+++ b/rpi/tazbian	Tue Nov 18 16:46:32 2014 +0100
@@ -42,6 +42,9 @@
 
 # update base package
 BASE=$(ls -d slitaz-rpi-base-*/rootfs)
+LIVE=$(ls -d slitaz-rpi-desktop-*/rootfs)
+[ ! -d "$LIVE" ] && echo "Abort ($LIVE) !" && exit 1
+LIVESZ=$(du -ks $LIVE | cut -f1)
 [ ! -d "$BASE" ] && echo "Abort ($BASE) !" && exit 1
 wget http://hg.slitaz.org/slitaz-arm/raw-file/tip/rpi/piboot
 wget http://hg.slitaz.org/slitaz-boot-scripts/raw-file/tip/init
@@ -52,7 +55,7 @@
 mknod -m 660 $BASE/dev/mmcblk0 b 179 0
 mknod -m 660 $BASE/dev/mmcblk0p1 b 179 1
 mknod -m 660 $BASE/dev/mmcblk0p2 b 179 2
-sed -i 's/.*mmcblk0p[2-9].*/# &/;s/noatime/noauto,/' $BASE/etc/fstab
+sed -i 's/.*mmcblk0p[2-9].*/# &/;s/noatime/noauto,&/' $BASE/etc/fstab $LIVE/etc/fstab
 wget http://cook.slitaz.org/cross/arm/packages/packages.list
 while read file pkg extra ; do
 	[ -s boot$file ] && continue
@@ -79,9 +82,6 @@
 EOT
 
 # deduplicate base & live
-LIVE=$(ls -d slitaz-rpi-desktop-*/rootfs)
-[ ! -d "$LIVE" ] && echo "Abort ($LIVE) !" && exit 1
-LIVESZ=$(du -ks $LIVE | cut -f1)
 ( cd $BASE/ ; find ! -type d ) | while read file; do
 	if [ -L $BASE/$file ]; then
 		[ -L $LIVE/$file ] &&
@@ -153,7 +153,7 @@
 tmpfs	/mnt/raspbian/$DESTDIR	tmpfs	size=0	0	0
 EOM
 fi
-cd -
+cd - > /dev/null
 
 if [ ! -f /boot/menu.txt ]; then
 
@@ -191,27 +191,27 @@
 
 fi
 
-echo "The SliTaz boot menu is available for next (re)boot."
+echo "The SliTaz boot menu is available for the next (re)boot."
 
 exit 0
 EOT
-cat > postrm <<EOT
+cat > prerm <<EOT
 #!/bin/sh
 
 purge()
 {
-	echo "Remove /$DESTDIR /boot/slitaz* trees..."
+	echo "Remove /$DESTDIR & /boot/slitaz* trees..."
 	rm -rf /$DESTDIR /boot/slitaz*
 }
 
 disable()
 {
-	if [ -d /boot/rasbian ]; then
-		echo "Restore rasbian boot files..."
-		mv -f /boot/rasbian/* /boot
-		rm -rf /boot/rasbian
+	if [ -d /boot/raspbian ]; then
+		echo "Restore raspbian boot files..."
+		rm -f /boot/raspbian/menu.txt
+		mv -f /boot/raspbian/* /boot
 	fi
-	rm -f /boot/menu.txt
+	rm -f /boot/menu.txt /boot/slitaz*/cmdline.txt
 }
 
 case "\$1" in
@@ -223,12 +223,12 @@
 	disable
 	;;
 *)
-	echo "postrm called with unknown argument \\\`\$1'" >&2
+	echo "prerm called with unknown argument \\\`\$1'" >&2
 	exit 0
 esac
 EOT
-chmod +x postinst postrm
-tar czf control.tar.gz md5sums control postinst postrm
+chmod +x postinst prerm
+tar czf control.tar.gz md5sums control postinst prerm
 rm -rf fs/$DESTDIR/*
 cd fs ; tar czf ../data.tar.gz . ; cd ..
 [ -x /usr/bin/ar ] || tazpkg get-install binutils