# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1641823886 0
# Node ID 0dfcc5bf7b5a1b9f071b67bebaf085f5aae44331
# Parent  442c9f81919dde7f14dd01e622a5f4c881e704dd
init: mount 'SliTaz persistent /home' partition

diff -r 442c9f81919d -r 0dfcc5bf7b5a etc/init.d/bootopts.sh
--- a/etc/init.d/bootopts.sh	Thu May 27 13:40:38 2021 +0000
+++ b/etc/init.d/bootopts.sh	Mon Jan 10 14:11:26 2022 +0000
@@ -124,7 +124,7 @@
 				[ -d /home/$USER ] && mv /home/$USER /tmp/$USER-files
 				mount /dev/$DEVID /home &&
 				case "$(/sbin/blkid | grep /dev/$DEVID:)" in
-				*\"ntfs\"*|*\"vfat\"*)
+				*\"ntfs\"*|*\"vfat\"*|*\"exfat\"*)
 					mount.posixovl -F /home -- -oallow_other -odefault_permissions -osuid ;;
 				esac
 				mount /home -o remount,uid=1000,gid=100 2>/dev/null
@@ -140,6 +140,9 @@
 					mkswap /home/swap
 					add_swap_in_fstab /home/swap
 				fi
+
+				fs=/home/boot/rootfs.gz
+				[ -s $fs ] && ( zcat $fs || unlzma < $fs || cat $fs ) | ( cd / ; cpio -idmu )
 			else
 				echo "Unable to find $DEVICE... "
 			fi
diff -r 442c9f81919d -r 0dfcc5bf7b5a etc/init.d/network.sh
--- a/etc/init.d/network.sh	Thu May 27 13:40:38 2021 +0000
+++ b/etc/init.d/network.sh	Mon Jan 10 14:11:26 2022 +0000
@@ -81,7 +81,7 @@
 		su -l -c "$0 netapplet" - "$user"
 	done
 	# restart if LXPanel running
-	if [ -n "$DISPLAY" -a -n "$(which lxpanelctl)" ]; then
+	if [ -n "$DISPLAY" ] && [ -n "$(which lxpanelctl)" ]; then
 		lxpanelctl restart
 	fi
 }
@@ -131,7 +131,7 @@
 
 remove_network() {
 	mv -f $WPA_CONF $WPA_CONF.old
-	cat $WPA_CONF.old | tr '\n' '\a' | sed 's|[^#]\(network={\)|\n\1|g' | \
+	tr '\n' '\a' < $WPA_CONF.old | sed 's|[^#]\(network={\)|\n\1|g' | \
 		fgrep -v "ssid=\"$1\"" | tr '\a' '\n' > $WPA_CONF
 }
 
@@ -254,7 +254,7 @@
 					[ -n "$WIFI_ANONYMOUS_IDENTITY" ] && echo -e "\tanonymous_identity=\"$WIFI_ANONYMOUS_IDENTITY\""
 					[ -n "$WIFI_KEY" ] && echo -e "\tpassword=\"$WIFI-KEY\""
 					[ -n "$WIFI_PHASE2" ] && echo -e "\tphase2=\"auth=$WIFI_PHASE2\""
-					echo }
+					echo '}'
 				} >> $WPA_CONF
 				start_wpa_supplicant '802.1x EAP' ;;
 
diff -r 442c9f81919d -r 0dfcc5bf7b5a etc/init.d/system.sh
--- a/etc/init.d/system.sh	Thu May 27 13:40:38 2021 +0000
+++ b/etc/init.d/system.sh	Mon Jan 10 14:11:26 2022 +0000
@@ -62,7 +62,7 @@
 
 # Activate an eventual swap file or partition
 if ! grep -q 'noswap' /proc/cmdline; then
-if [ "$(blkid | grep 'TYPE="swap"')" ]; then
+if blkid | grepi -q 'TYPE="swap"'; then
 	for swd in $(blkid | sed '/TYPE="swap"/!d;s/:.*//'); do
 		if ! grep -q "$swd	" /etc/fstab; then
 			echo "Swap memory detected on: $swd"
diff -r 442c9f81919d -r 0dfcc5bf7b5a init
--- a/init	Thu May 27 13:40:38 2021 +0000
+++ b/init	Mon Jan 10 14:11:26 2022 +0000
@@ -98,7 +98,7 @@
 
 
 bbmnt() {
-	r=$(blkid 2> /dev/null | grep "$root[:\"]" | sed 's|:.*||;q')
+	r=$(busybox 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
@@ -234,6 +234,17 @@
 [ -d /proc/sys/dev/cdrom ] &&
 	ln -s $(sed '/name/!d;s/.*:[^a-z]*//' /proc/sys/dev/cdrom/info) /dev/cdrom
 
+dev=$(busybox fdisk -l|awk '/sectors/{d=$2}/SliTaz persistent \/home/{print d $1;quit}'|sed 's|:||')
+if got root && [ "$dev" -a "$root" == "/dev/null" ]; then
+	busybox blkid $dev | grep -q TYPE= || mkfs.vfat $dev
+	mount $dev /home && case $(busybox blkid $dev) in
+	*vfat*|*exfat*|*ntfs*)
+		mount.posixovl -F /home -- -oallow_other -odefault_permissions -osuid
+	esac
+	fs=/home/boot/rootfs.gz; [ -s $fs ] && (zcat $fs || unlzma < $fs || cat $fs) | cpio -idmu
+	[ -d /init.d ] && for i in /init.d/* ; do [ -x $i ] && . $i ; done
+fi 2>&1 >/dev/null
+
 if use dmraid; then
 	dmraid -s | sed '/^type/!ds/.*: *//' | ldraid
 	[ ${root:0:4} = /dev ] ||