# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1416175479 -3600
# Node ID c0c88b71a4b4de805df22040d14114a980d7149c
# Parent  635fc61b4e63bb524ad177d35338a2ee431a1cd1
tazbian: misc fixes

diff -r 635fc61b4e63 -r c0c88b71a4b4 rpi/tazbian
--- a/rpi/tazbian	Sun Nov 16 14:53:52 2014 +0100
+++ b/rpi/tazbian	Sun Nov 16 23:04:39 2014 +0100
@@ -31,13 +31,13 @@
 mv $BASE/kernel.img fs/boot/slitaz
 cp $BASE/config.txt fs/boot/slitaz
 cp $BASE/config.txt fs/boot/slitaz-base
-echo "initrd rootfs-base.gz" >> fs/boot/slitaz/config.txt
+echo "initramfs rootfs-base.gz" >> fs/boot/slitaz/config.txt
 echo "entry=SliTaz $VERSION on SD-card" > fs/boot/slitaz/menu.txt
 sed -i 's|kernel.img|../slitaz/&|' fs/boot/slitaz-base/config.txt
 cp -a fs/boot/slitaz-base fs/boot/slitaz-live
-echo "initrd ../slitaz/rootfs-base.gz" >> fs/boot/slitaz-base/config.txt
+echo "initramfs ../slitaz/rootfs-base.gz" >> fs/boot/slitaz-base/config.txt
 echo "entry=SliTaz base $VERSION in RAM" > fs/boot/slitaz-base/menu.txt
-echo "initrd ../slitaz/rootfs-base.gz ../slitaz/rootfs-live.gz" >> fs/boot/slitaz-live/config.txt
+echo "initramfs ../slitaz/rootfs-base.gz ../slitaz/rootfs-live.gz" >> fs/boot/slitaz-live/config.txt
 echo "entry=SliTaz desktop $VERSION in RAM" > fs/boot/slitaz-live/menu.txt
 
 # update base package
@@ -132,27 +132,29 @@
 
 set -e
 
-set -- \$(awk '/ \/ / { if (\$1 != "rootfs") print \$1 " " \$3 }' < /proc/mounts)
-RDEV=\$1
-FSTYPE=\$2
+RDEV=\$(sed 's/.*root=\([^ ]*\).*/\1/' /boot/cmdline.txt)
+FSTYPE=\$(awk '/ \/ / { if (\$1 != "rootfs") print \$3 }' < /proc/mounts)
 
 cd /$DESTDIR
 zcat /boot/slitaz/rootfs-base.gz | cpio -idmu
-zcat /boot/slitaz/rootfs-core.gz | cpio -idmu
-mkdir mnt/raspbian 2> /dev/null
-cat >> etc/inittab <<EOM
+zcat /boot/slitaz/rootfs-live.gz | cpio -idmu
+[ -d mnt/raspbian ] || mkdir -p mnt/raspbian
+if ! grep -qs raspbian etc/fstab ; then
+	sed -i 's/.*mmcblk0p[2-9].*/#&/' etc/fstab
+	cat >> etc/fstab <<EOM
 \$RDEV	/mnt/raspbian	\$FSTYPE	defaults	0	0
 tmpfs	/mnt/raspbian/$DESTDIR	tmpfs	size=0	0	0
 EOM
+fi
 cd -
 
 if [ ! -f /boot/menu.txt ]; then
 
-for i in i18n keyboard ; do
-	[ -s /etc/sysconfig/\$i ] && . /etc/sysconfig/\$i
+for i in keyboard locale ; do
+	[ -s /etc/default/\$i ] && . /etc/default/\$i
 done
 KMAP=
-find /$DESTDIR/usr/share/kbd/keymaps | grep /\$KEYTABLE.map.gz\$ && KMAP=kmap=\$KEYTABLE
+find /$DESTDIR/usr/share/kbd/keymaps | grep /\$XKBLAYOUT.map.gz\$ && KMAP=kmap=\$XKBLAYOUT
 cat > /boot/menu.txt <<EOM
 title=Raspberry PI boot menu
 subtitle=Select the OS with ARROW keys and hit RETURN
@@ -165,12 +167,14 @@
 #nowebboot
 #webpath=http://my.home.web.site/pxe/rpi/index.php http://or.this.one/rpi.txt
 EOM
-cp /boot/config.txt /boot/raspbian/
-mv /boot/\$(sed '/^kernel/!d;s/.*=//' /boot/config.txt) /boot/raspbian/
+KERNEL=\$(sed '/^kernel/!d;s/.*=//' /boot/config.txt)
+cp /boot/config.txt /boot/cmdline.txt /boot/raspbian/
+mv /boot/\${KERNEL:-kernel.img} /boot/raspbian/
+[ "\$KERNEL" ] || echo "kernel=kernel.img" >> /boot/raspbian/config.txt
 echo "entry=Raspbian \$(cat /etc/debian_version)" > /boot/raspbian/menu.txt
-sed -i '/^kernel/d;/^initrd/d' /boot/config.txt
+sed -i '/^kernel/d;/^initramfs/d' /boot/config.txt
 echo "kernel=slitaz/kernel.img" >> /boot/config.txt
-echo "initrd=slitaz/rootfs-base.gz" >> /boot/config.txt
+echo "initramfs slitaz/rootfs-base.gz" >> /boot/config.txt
 echo "root=/dev/null rdinit=/sbin/piboot quiet" > /boot/cmdline.txt
 echo "root=/dev/null rdinit=/sbin/pisubroot mount=\$RDEV subroot=$DESTDIR rootwait quiet" > /boot/slitaz/cmdline.txt
 L=