# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1556814463 -7200
# Node ID 626c3828c08f5e3322d7c950c6d9c7daaccfc40b
# Parent  3d04aad6c72cb534d6e90415a172ebc93588b030
Update some web_site

diff -r 3d04aad6c72c -r 626c3828c08f bchunk/receipt
--- a/bchunk/receipt	Thu May 02 16:34:14 2019 +0100
+++ b/bchunk/receipt	Thu May 02 18:27:43 2019 +0200
@@ -7,7 +7,7 @@
 SHORT_DESC="Converts a CD image in a '.bin / .cue' format to '.iso'."
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://he.fi/bchunk"
+WEB_SITE="https://github.com/hessu/bchunk"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/$TARBALL"
@@ -16,7 +16,6 @@
 compile_rules()
 {
 	make
-
 	cook_pick_manpages bchunk.1
 }
 
diff -r 3d04aad6c72c -r 626c3828c08f memo/receipt
--- a/memo/receipt	Thu May 02 16:34:14 2019 +0100
+++ b/memo/receipt	Thu May 02 18:27:43 2019 +0200
@@ -7,7 +7,7 @@
 MAINTAINER="paul@slitaz.org"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 LICENSE="GPL3"
-WEB_SITE="http://palovandalo.com/memo/"
+WEB_SITE="https://github.com/mrVanDalo/memo/"
 WGET_URL="http://www.ideabyte.net/memo/$TARBALL"
 
 DEPENDS="ncurses"
@@ -25,4 +25,3 @@
 	mkdir -p $fs/usr/bin
 	cp -a $src/$PACKAGE $fs/usr/bin
 }
-
diff -r 3d04aad6c72c -r 626c3828c08f sozi/receipt
--- a/sozi/receipt	Thu May 02 16:34:14 2019 +0100
+++ b/sozi/receipt	Thu May 02 18:27:43 2019 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="A small program that can play animated presentations."
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL3"
-WEB_SITE="http://sozi.baierouge.fr/"
+WEB_SITE="https://github.com/senshu/Sozi"
 TARBALL="$PACKAGE-release-$VERSION.zip"
 WGET_URL="https://github.com/downloads/senshu/Sozi/$TARBALL"
 
diff -r 3d04aad6c72c -r 626c3828c08f syslinux/stuff/iso2exe/init
--- a/syslinux/stuff/iso2exe/init	Thu May 02 16:34:14 2019 +0100
+++ b/syslinux/stuff/iso2exe/init	Thu May 02 18:27:43 2019 +0200
@@ -125,7 +125,7 @@
 
 gettazboot()
 {
-	echo "Creating $(basename $1) ..."
+	echo -e "\nCreating $(basename $1) ..."
 	X=$(($(get 20 /mnt/$ISO) - 0xC0))
 	[ $X -lt 30000 ] && X=$((0x7FF0))
 	O=$(($(get 64 /mnt/$ISO) - 0xC0))
@@ -206,7 +206,6 @@
 #!/bin/sh
 
 mount -t proc /proc /proc
-  grep -q debug /proc/cmdline && debug=true && set -x
 for i in /lib/*.ko* ; do insmod \$i 2> /dev/null ; done; sleep 2
 v=\$(sed '/\\/home=/!d;s|.*/home=\\([^ ]*\\).*|\\1|' /proc/cmdline /cmdline 2> /dev/null)
 mount / -o remount,rw
@@ -219,7 +218,7 @@
 mount \$dev /mnt/dos
 mount.posixovl -F \$mnt -- -oallow_other -odefault_permissions -osuid
 mount --bind \$mnt /home
-  [ "\$debug" = "true" ] && sh
+mount -o size=0,ro -t tmpfs tmpfs \$mnt
 umount /proc
 exec /sbin/init
 EOT
@@ -235,8 +234,7 @@
 	for i in bin lib dev proc tmp mnt etc ; do
 		mkdir -p /tmp/fs/$i
 	done
-	for i in /dev/console /dev/null /dev/tty /dev/tty0 /dev/tty1 /dev/tty2 \
-		 /dev/fuse /dev/hd* /dev/sd* ; do
+	for i in /dev/console /dev/null /dev/tty /dev/tty[012] /dev/fuse /dev/[hs]d* ; do
 		cp -a $i /tmp/fs$i
 	done
 	for i in /bin/busybox $(which mount.posixovl) $(which blkid); do
@@ -264,7 +262,6 @@
 }
 
 mount -t proc /proc /proc
-  arg debug "shell" && debug=true && set -x
 for i in /lib/*.ko* ; do insmod \$i 2> /dev/null ; done; sleep 2
 arg mount "Mount device"
 mount \$( (blkid /dev/[sh]d* || blkid) | grep \$val | sed 's/:.*//;q') /mnt
@@ -274,7 +271,6 @@
 mount -o size=0,ro -t tmpfs tmpfs /mnt/\$val/mnt/dos/\$val
 LDSO=\$(ls /mnt/\$val/lib/ld-* | sed q)
 export LD_LIBRARY_PATH=\$val/lib:\$val/usr/lib:/lib
-  [ "$debug" = "true" ] && sh
 umount /proc
 exec /bin/switch_root /mnt \${LDSO#/mnt/} \$val/usr/sbin/chroot \$val /sbin/init
 EOT
@@ -316,22 +312,18 @@
 		if [ -d /media/cdrom/fs ]; then
 			cp -a /media/cdrom/fs/. /mnt/slitaz
 		elif is_loram ; then
-			for i in /media/cdrom/boot/rootfs?*.* ; do
-				[ -s $(basename $i) ] && continue
-				cpio -i $i
-			done
 			for i in $(ls_r /media/cdrom/boot/rootfs*gz); do
-				mount -o loop,ro $i /sqfs/mnt
+				losetup -o 124 /dev/loop7 $i
+				mount -t squashfs -o ro /dev/loop7 /sqfs/mnt
 				cp -a /sqfs/mnt/. /mnt/slitaz
-				umount -d /sqfs/mnt
+				umount /sqfs/mnt
+				losetup -d /dev/loop7
 			done
 		else
 			for i in $(ls_r /media/cdrom/boot/rootfs*gz); do
 				uncpio $i /mnt/slitaz
 			done
 		fi
-		cp -a /etc/locale.conf /mnt/slitaz/etc 2> /dev/null
-		cp -a /etc/keymap.conf /mnt/slitaz/etc 2> /dev/null
 		mkinitrd /mnt/slitaz/boot/initrd
 		initrd=initrd
 		extraargs="mount=$(getuuid) subroot=slitaz"
@@ -346,6 +338,7 @@
 		[ $(get 0 $i 2> /dev/null || echo 0) -eq 23117 ] &&
 		mv $i $i.exe
 	done
+	cp /etc/keymap.conf /etc/locale.conf /mnt/slitaz/etc 2> /dev/null
 	gettazboot /mnt/slitaz/boot/tazboot.exe
 	unix2dos > /mnt/slitaz/boot/tazboot.cmd <<EOT
 kernel=/slitaz/boot/bzimage
@@ -1041,6 +1034,7 @@
 		mkdir /sqfs
 		mount -o loop,ro -t squashfs /rootfs*.gz /sqfs
 	fi
+	cp -a /sqfs/dev/fuse /sqfs/dev/tty[12] /sqfs/dev/[hs]d* /dev
 	ln -s /sqfs/lib/* lib
 	ln -fs /sqfs/usr /sqfs/var /
 	mkdir /etc && cp /sqfs/etc/dialogrc /etc 2> /dev/null
diff -r 3d04aad6c72c -r 626c3828c08f vrrpd/receipt
--- a/vrrpd/receipt	Thu May 02 16:34:14 2019 +0100
+++ b/vrrpd/receipt	Thu May 02 18:27:43 2019 +0200
@@ -7,7 +7,7 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://numsys.eu/"
+WEB_SITE="https://github.com/fredbcode/Vrrpd/"
 WGET_URL="https://github.com/fredbcode/Vrrpd/archive/v$VERSION.tar.gz"
 CONFIG_FILES="/etc/vrrpd /etc/vrrp.conf"
 TAGS="High availability HA"