SliTaz Repositories

     1.1 --- a/rpi/tazbian	Sun Nov 16 14:53:52 2014 +0100
     1.2 +++ b/rpi/tazbian	Sun Nov 16 23:04:39 2014 +0100
     1.3 @@ -31,13 +31,13 @@
     1.4  mv $BASE/kernel.img fs/boot/slitaz
     1.5  cp $BASE/config.txt fs/boot/slitaz
     1.6  cp $BASE/config.txt fs/boot/slitaz-base
     1.7 -echo "initrd rootfs-base.gz" >> fs/boot/slitaz/config.txt
     1.8 +echo "initramfs rootfs-base.gz" >> fs/boot/slitaz/config.txt
     1.9  echo "entry=SliTaz $VERSION on SD-card" > fs/boot/slitaz/menu.txt
    1.10  sed -i 's|kernel.img|../slitaz/&|' fs/boot/slitaz-base/config.txt
    1.11  cp -a fs/boot/slitaz-base fs/boot/slitaz-live
    1.12 -echo "initrd ../slitaz/rootfs-base.gz" >> fs/boot/slitaz-base/config.txt
    1.13 +echo "initramfs ../slitaz/rootfs-base.gz" >> fs/boot/slitaz-base/config.txt
    1.14  echo "entry=SliTaz base $VERSION in RAM" > fs/boot/slitaz-base/menu.txt
    1.15 -echo "initrd ../slitaz/rootfs-base.gz ../slitaz/rootfs-live.gz" >> fs/boot/slitaz-live/config.txt
    1.16 +echo "initramfs ../slitaz/rootfs-base.gz ../slitaz/rootfs-live.gz" >> fs/boot/slitaz-live/config.txt
    1.17  echo "entry=SliTaz desktop $VERSION in RAM" > fs/boot/slitaz-live/menu.txt
    1.18  
    1.19  # update base package
    1.20 @@ -132,27 +132,29 @@
    1.21  
    1.22  set -e
    1.23  
    1.24 -set -- \$(awk '/ \/ / { if (\$1 != "rootfs") print \$1 " " \$3 }' < /proc/mounts)
    1.25 -RDEV=\$1
    1.26 -FSTYPE=\$2
    1.27 +RDEV=\$(sed 's/.*root=\([^ ]*\).*/\1/' /boot/cmdline.txt)
    1.28 +FSTYPE=\$(awk '/ \/ / { if (\$1 != "rootfs") print \$3 }' < /proc/mounts)
    1.29  
    1.30  cd /$DESTDIR
    1.31  zcat /boot/slitaz/rootfs-base.gz | cpio -idmu
    1.32 -zcat /boot/slitaz/rootfs-core.gz | cpio -idmu
    1.33 -mkdir mnt/raspbian 2> /dev/null
    1.34 -cat >> etc/inittab <<EOM
    1.35 +zcat /boot/slitaz/rootfs-live.gz | cpio -idmu
    1.36 +[ -d mnt/raspbian ] || mkdir -p mnt/raspbian
    1.37 +if ! grep -qs raspbian etc/fstab ; then
    1.38 +	sed -i 's/.*mmcblk0p[2-9].*/#&/' etc/fstab
    1.39 +	cat >> etc/fstab <<EOM
    1.40  \$RDEV	/mnt/raspbian	\$FSTYPE	defaults	0	0
    1.41  tmpfs	/mnt/raspbian/$DESTDIR	tmpfs	size=0	0	0
    1.42  EOM
    1.43 +fi
    1.44  cd -
    1.45  
    1.46  if [ ! -f /boot/menu.txt ]; then
    1.47  
    1.48 -for i in i18n keyboard ; do
    1.49 -	[ -s /etc/sysconfig/\$i ] && . /etc/sysconfig/\$i
    1.50 +for i in keyboard locale ; do
    1.51 +	[ -s /etc/default/\$i ] && . /etc/default/\$i
    1.52  done
    1.53  KMAP=
    1.54 -find /$DESTDIR/usr/share/kbd/keymaps | grep /\$KEYTABLE.map.gz\$ && KMAP=kmap=\$KEYTABLE
    1.55 +find /$DESTDIR/usr/share/kbd/keymaps | grep /\$XKBLAYOUT.map.gz\$ && KMAP=kmap=\$XKBLAYOUT
    1.56  cat > /boot/menu.txt <<EOM
    1.57  title=Raspberry PI boot menu
    1.58  subtitle=Select the OS with ARROW keys and hit RETURN
    1.59 @@ -165,12 +167,14 @@
    1.60  #nowebboot
    1.61  #webpath=http://my.home.web.site/pxe/rpi/index.php http://or.this.one/rpi.txt
    1.62  EOM
    1.63 -cp /boot/config.txt /boot/raspbian/
    1.64 -mv /boot/\$(sed '/^kernel/!d;s/.*=//' /boot/config.txt) /boot/raspbian/
    1.65 +KERNEL=\$(sed '/^kernel/!d;s/.*=//' /boot/config.txt)
    1.66 +cp /boot/config.txt /boot/cmdline.txt /boot/raspbian/
    1.67 +mv /boot/\${KERNEL:-kernel.img} /boot/raspbian/
    1.68 +[ "\$KERNEL" ] || echo "kernel=kernel.img" >> /boot/raspbian/config.txt
    1.69  echo "entry=Raspbian \$(cat /etc/debian_version)" > /boot/raspbian/menu.txt
    1.70 -sed -i '/^kernel/d;/^initrd/d' /boot/config.txt
    1.71 +sed -i '/^kernel/d;/^initramfs/d' /boot/config.txt
    1.72  echo "kernel=slitaz/kernel.img" >> /boot/config.txt
    1.73 -echo "initrd=slitaz/rootfs-base.gz" >> /boot/config.txt
    1.74 +echo "initramfs slitaz/rootfs-base.gz" >> /boot/config.txt
    1.75  echo "root=/dev/null rdinit=/sbin/piboot quiet" > /boot/cmdline.txt
    1.76  echo "root=/dev/null rdinit=/sbin/pisubroot mount=\$RDEV subroot=$DESTDIR rootwait quiet" > /boot/slitaz/cmdline.txt
    1.77  L=