slitaz-arm diff rpi/tazbian @ rev 199

tazbian, piboot: misc fixes
author Pascal Bellard <pascal.bellard@slitaz.org>
date Tue Nov 18 10:50:30 2014 +0100 (2014-11-18)
parents c0c88b71a4b4
children f52ce3fe729d
line diff
     1.1 --- a/rpi/tazbian	Sun Nov 16 23:04:39 2014 +0100
     1.2 +++ b/rpi/tazbian	Tue Nov 18 10:50:30 2014 +0100
     1.3 @@ -47,6 +47,7 @@
     1.4  wget http://hg.slitaz.org/slitaz-boot-scripts/raw-file/tip/init
     1.5  chmod +x piboot init
     1.6  mv piboot $BASE/sbin
     1.7 +sed -i 's|mnt /mnt|mnt "/mnt -o noatime"|' init
     1.8  mv init $BASE/sbin/pisubroot
     1.9  wget http://cook.slitaz.org/cross/arm/packages/packages.list
    1.10  while read file pkg extra ; do
    1.11 @@ -142,7 +143,7 @@
    1.12  if ! grep -qs raspbian etc/fstab ; then
    1.13  	sed -i 's/.*mmcblk0p[2-9].*/#&/' etc/fstab
    1.14  	cat >> etc/fstab <<EOM
    1.15 -\$RDEV	/mnt/raspbian	\$FSTYPE	defaults	0	0
    1.16 +\$RDEV	/mnt/raspbian	\$FSTYPE	noatime	0	0
    1.17  tmpfs	/mnt/raspbian/$DESTDIR	tmpfs	size=0	0	0
    1.18  EOM
    1.19  fi
    1.20 @@ -153,8 +154,8 @@
    1.21  for i in keyboard locale ; do
    1.22  	[ -s /etc/default/\$i ] && . /etc/default/\$i
    1.23  done
    1.24 -KMAP=
    1.25 -find /$DESTDIR/usr/share/kbd/keymaps | grep /\$XKBLAYOUT.map.gz\$ && KMAP=kmap=\$XKBLAYOUT
    1.26 +KMAP=\$(find /$DESTDIR/usr/share/kbd/keymaps | grep /\$XKBLAYOUT[.-] | head -n1)
    1.27 +[ "\$KMAP" ] && KMAP="kmap=\$(basename \$KMAP .map.gz)"
    1.28  cat > /boot/menu.txt <<EOM
    1.29  title=Raspberry PI boot menu
    1.30  subtitle=Select the OS with ARROW keys and hit RETURN
    1.31 @@ -170,15 +171,14 @@
    1.32  KERNEL=\$(sed '/^kernel/!d;s/.*=//' /boot/config.txt)
    1.33  cp /boot/config.txt /boot/cmdline.txt /boot/raspbian/
    1.34  mv /boot/\${KERNEL:-kernel.img} /boot/raspbian/
    1.35 -[ "\$KERNEL" ] || echo "kernel=kernel.img" >> /boot/raspbian/config.txt
    1.36  echo "entry=Raspbian \$(cat /etc/debian_version)" > /boot/raspbian/menu.txt
    1.37  sed -i '/^kernel/d;/^initramfs/d' /boot/config.txt
    1.38  echo "kernel=slitaz/kernel.img" >> /boot/config.txt
    1.39  echo "initramfs slitaz/rootfs-base.gz" >> /boot/config.txt
    1.40  echo "root=/dev/null rdinit=/sbin/piboot quiet" > /boot/cmdline.txt
    1.41 -echo "root=/dev/null rdinit=/sbin/pisubroot mount=\$RDEV subroot=$DESTDIR rootwait quiet" > /boot/slitaz/cmdline.txt
    1.42  L=
    1.43  [ -s /$DESTDIR/usr/share/i18n/locales/\${LANG%.*} ] && L=lang=\${LANG%.*} 
    1.44 +echo "root=/dev/null \$L \$KMAP rdinit=/sbin/pisubroot mount=\$RDEV subroot=$DESTDIR rootwait quiet" > /boot/slitaz/cmdline.txt
    1.45  echo "root=/dev/null \$L \$KMAP quiet" > /boot/slitaz-base/cmdline.txt
    1.46  cp /boot/slitaz-base/cmdline.txt /boot/slitaz-live/cmdline.txt
    1.47