# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1622122838 0
# Node ID 442c9f81919dde7f14dd01e622a5f4c881e704dd
# Parent  3e887b1a369ae87fa3ae49549ef45b49d811bcec
init: 64 bits support for extra=

diff -r 3e887b1a369a -r 442c9f81919d init
--- a/init	Thu May 27 10:04:36 2021 +0000
+++ b/init	Thu May 27 13:40:38 2021 +0000
@@ -98,7 +98,7 @@
 
 
 bbmnt() {
-	r=$(busybox blkid 2> /dev/null | grep "$root[:\"]" | sed 's|:.*||;q')
+	r=$(blkid 2> /dev/null | grep "$root[:\"]" | sed 's|:.*||;q')
 	r=${r:-$(busybox blkid $root 2> /dev/null | sed 's|:.*||;q')}
 	r=${r:-$root}
 	if [ ! -b $r ]; then
@@ -270,7 +270,8 @@
 lvm
 
 got extra && extra=$root && mntiso /mnt && for i in ${extra//,/ }; do
-	 (unlzma < /mnt/$i 2>/dev/null || zcat /mnt/$i) | cpio -idmu
+	grep -q ' lm ' /proc/cpuinfo && [ -s /mnt/${i}64 ] && i=${i}64
+	(unlzma < /mnt/$i 2>/dev/null || zcat /mnt/$i 2>/dev/null || cat /mnt/$i) | cpio -idmu
 done && for i in $umnt; do umount -l $i; done
 arg cryptoroot= && try
 if use subroot; then