wok-6.x diff busybox-boot/receipt @ rev 17399
vlc: update bdeps
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Thu Nov 27 20:47:48 2014 +0100 (2014-11-27) |
parents | d303e26dcea3 |
children | 4a9f656c414b |
line diff
1.1 --- a/busybox-boot/receipt Wed Aug 20 18:20:49 2014 +0200 1.2 +++ b/busybox-boot/receipt Thu Nov 27 20:47:48 2014 +0100 1.3 @@ -60,7 +60,7 @@ 1.4 arg() 1.5 { 1.6 root="\$(sed "s/^/ /;s/\$/ /;/ \$1=/!d;s/.* \$1=\\([^ ]*\\).*/\\1/" </proc/cmdline)" 1.7 -busybox [ -n "\$root" ] 1.8 +[ -n "\$root" ] 1.9 } 1.10 1.11 arg init 1.12 @@ -68,12 +68,12 @@ 1.13 [ -n "\$(sed 's/\$/ /;s/^/ /;/ ro /!d' /proc/cmdline)" ] && ro="-o ro" 1.14 [ -n "\$(sed 's/\$/ /;s/^/ /;/ rw /!d' /proc/cmdline)" ] && ro="-o rw" 1.15 arg root && root="\$(echo \$root | sed 's|/|\\\\/|g')" && 1.16 - root="\$(busybox blkid | sed "s/\"//g;/\$root/!d;s/:.*//;q")" && 1.17 + root="\$(blkid | sed "s/\"//g;/\$root/!d;s/:.*//;q")" && 1.18 [ -n "\$root" ] && mount \$ro \$root /mnt 1.19 -arg loopfs && busybox losetup /dev/loop0 /mnt/\$root && mount /dev/loop0 /mnt 1.20 +arg loopfs && losetup /dev/loop0 /mnt/\$root && mount /dev/loop0 /mnt 1.21 arg subroot && cp /bin/busybox /mnt/\$root/dev/shm && 1.22 chroot="\$root/dev/shm/busybox chroot \$root" 1.23 -busybox [ -x /mnt/\$root/\$init ] && umount /dev && umount /proc && exec busybox switch_root mnt \$chroot \$init 1.24 +[ -x /mnt/\$root/\$init ] && umount /dev && umount /proc && exec switch_root mnt \$chroot \$init 1.25 1.26 [ -d /proc/bus/usb ] && mount -t usbfs usbfs /proc/bus/usb 1.27 while read type dir ; do