wok diff syslinux/stuff/iso2exe/init @ rev 21506
Update some web_site
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Thu May 02 18:27:43 2019 +0200 (2019-05-02) |
parents | ada21ebe1860 |
children | daaaf5face8a |
line diff
1.1 --- a/syslinux/stuff/iso2exe/init Wed May 01 13:05:10 2019 +0200 1.2 +++ b/syslinux/stuff/iso2exe/init Thu May 02 18:27:43 2019 +0200 1.3 @@ -125,7 +125,7 @@ 1.4 1.5 gettazboot() 1.6 { 1.7 - echo "Creating $(basename $1) ..." 1.8 + echo -e "\nCreating $(basename $1) ..." 1.9 X=$(($(get 20 /mnt/$ISO) - 0xC0)) 1.10 [ $X -lt 30000 ] && X=$((0x7FF0)) 1.11 O=$(($(get 64 /mnt/$ISO) - 0xC0)) 1.12 @@ -206,7 +206,6 @@ 1.13 #!/bin/sh 1.14 1.15 mount -t proc /proc /proc 1.16 - grep -q debug /proc/cmdline && debug=true && set -x 1.17 for i in /lib/*.ko* ; do insmod \$i 2> /dev/null ; done; sleep 2 1.18 v=\$(sed '/\\/home=/!d;s|.*/home=\\([^ ]*\\).*|\\1|' /proc/cmdline /cmdline 2> /dev/null) 1.19 mount / -o remount,rw 1.20 @@ -219,7 +218,7 @@ 1.21 mount \$dev /mnt/dos 1.22 mount.posixovl -F \$mnt -- -oallow_other -odefault_permissions -osuid 1.23 mount --bind \$mnt /home 1.24 - [ "\$debug" = "true" ] && sh 1.25 +mount -o size=0,ro -t tmpfs tmpfs \$mnt 1.26 umount /proc 1.27 exec /sbin/init 1.28 EOT 1.29 @@ -235,8 +234,7 @@ 1.30 for i in bin lib dev proc tmp mnt etc ; do 1.31 mkdir -p /tmp/fs/$i 1.32 done 1.33 - for i in /dev/console /dev/null /dev/tty /dev/tty0 /dev/tty1 /dev/tty2 \ 1.34 - /dev/fuse /dev/hd* /dev/sd* ; do 1.35 + for i in /dev/console /dev/null /dev/tty /dev/tty[012] /dev/fuse /dev/[hs]d* ; do 1.36 cp -a $i /tmp/fs$i 1.37 done 1.38 for i in /bin/busybox $(which mount.posixovl) $(which blkid); do 1.39 @@ -264,7 +262,6 @@ 1.40 } 1.41 1.42 mount -t proc /proc /proc 1.43 - arg debug "shell" && debug=true && set -x 1.44 for i in /lib/*.ko* ; do insmod \$i 2> /dev/null ; done; sleep 2 1.45 arg mount "Mount device" 1.46 mount \$( (blkid /dev/[sh]d* || blkid) | grep \$val | sed 's/:.*//;q') /mnt 1.47 @@ -274,7 +271,6 @@ 1.48 mount -o size=0,ro -t tmpfs tmpfs /mnt/\$val/mnt/dos/\$val 1.49 LDSO=\$(ls /mnt/\$val/lib/ld-* | sed q) 1.50 export LD_LIBRARY_PATH=\$val/lib:\$val/usr/lib:/lib 1.51 - [ "$debug" = "true" ] && sh 1.52 umount /proc 1.53 exec /bin/switch_root /mnt \${LDSO#/mnt/} \$val/usr/sbin/chroot \$val /sbin/init 1.54 EOT 1.55 @@ -316,22 +312,18 @@ 1.56 if [ -d /media/cdrom/fs ]; then 1.57 cp -a /media/cdrom/fs/. /mnt/slitaz 1.58 elif is_loram ; then 1.59 - for i in /media/cdrom/boot/rootfs?*.* ; do 1.60 - [ -s $(basename $i) ] && continue 1.61 - cpio -i $i 1.62 - done 1.63 for i in $(ls_r /media/cdrom/boot/rootfs*gz); do 1.64 - mount -o loop,ro $i /sqfs/mnt 1.65 + losetup -o 124 /dev/loop7 $i 1.66 + mount -t squashfs -o ro /dev/loop7 /sqfs/mnt 1.67 cp -a /sqfs/mnt/. /mnt/slitaz 1.68 - umount -d /sqfs/mnt 1.69 + umount /sqfs/mnt 1.70 + losetup -d /dev/loop7 1.71 done 1.72 else 1.73 for i in $(ls_r /media/cdrom/boot/rootfs*gz); do 1.74 uncpio $i /mnt/slitaz 1.75 done 1.76 fi 1.77 - cp -a /etc/locale.conf /mnt/slitaz/etc 2> /dev/null 1.78 - cp -a /etc/keymap.conf /mnt/slitaz/etc 2> /dev/null 1.79 mkinitrd /mnt/slitaz/boot/initrd 1.80 initrd=initrd 1.81 extraargs="mount=$(getuuid) subroot=slitaz" 1.82 @@ -346,6 +338,7 @@ 1.83 [ $(get 0 $i 2> /dev/null || echo 0) -eq 23117 ] && 1.84 mv $i $i.exe 1.85 done 1.86 + cp /etc/keymap.conf /etc/locale.conf /mnt/slitaz/etc 2> /dev/null 1.87 gettazboot /mnt/slitaz/boot/tazboot.exe 1.88 unix2dos > /mnt/slitaz/boot/tazboot.cmd <<EOT 1.89 kernel=/slitaz/boot/bzimage 1.90 @@ -1041,6 +1034,7 @@ 1.91 mkdir /sqfs 1.92 mount -o loop,ro -t squashfs /rootfs*.gz /sqfs 1.93 fi 1.94 + cp -a /sqfs/dev/fuse /sqfs/dev/tty[12] /sqfs/dev/[hs]d* /dev 1.95 ln -s /sqfs/lib/* lib 1.96 ln -fs /sqfs/usr /sqfs/var / 1.97 mkdir /etc && cp /sqfs/etc/dialogrc /etc 2> /dev/null