slitaz-boot-scripts rev 471
init: 64 bits support for extra=
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Thu May 27 13:40:38 2021 +0000 (2021-05-27) |
parents | 3e887b1a369a |
children | 0dfcc5bf7b5a |
files | init |
line diff
1.1 --- a/init Thu May 27 10:04:36 2021 +0000 1.2 +++ b/init Thu May 27 13:40:38 2021 +0000 1.3 @@ -98,7 +98,7 @@ 1.4 1.5 1.6 bbmnt() { 1.7 - r=$(busybox blkid 2> /dev/null | grep "$root[:\"]" | sed 's|:.*||;q') 1.8 + r=$(blkid 2> /dev/null | grep "$root[:\"]" | sed 's|:.*||;q') 1.9 r=${r:-$(busybox blkid $root 2> /dev/null | sed 's|:.*||;q')} 1.10 r=${r:-$root} 1.11 if [ ! -b $r ]; then 1.12 @@ -270,7 +270,8 @@ 1.13 lvm 1.14 1.15 got extra && extra=$root && mntiso /mnt && for i in ${extra//,/ }; do 1.16 - (unlzma < /mnt/$i 2>/dev/null || zcat /mnt/$i) | cpio -idmu 1.17 + grep -q ' lm ' /proc/cpuinfo && [ -s /mnt/${i}64 ] && i=${i}64 1.18 + (unlzma < /mnt/$i 2>/dev/null || zcat /mnt/$i 2>/dev/null || cat /mnt/$i) | cpio -idmu 1.19 done && for i in $umnt; do umount -l $i; done 1.20 arg cryptoroot= && try 1.21 if use subroot; then