# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1307982646 -7200
# Node ID 69407654106114a6e90027944e2ab640d76bb2f3
# Parent  aa620b69c929ac8920b8860bfcb62344acda69d2
Add some doc and few small fixes

diff -r aa620b69c929 -r 694076541061 Makefile
--- a/Makefile	Mon Jun 13 17:34:45 2011 +0200
+++ b/Makefile	Mon Jun 13 18:30:46 2011 +0200
@@ -18,15 +18,16 @@
 		$(DESTDIR)/var/lib/$(PACKAGE) \
 		$(DESTDIR)$(PREFIX)/share/applications \
 		$(DESTDIR)$(PREFIX)/share/pixmaps \
-		$(DESTDIR)$(PREFIX)/share/$(PACKAGE)
+		$(DESTDIR)$(PREFIX)/share/$(PACKAGE)/rootfs/bin
 	install -m 0755 $(PACKAGE)-sh $(DESTDIR)/bin
 	install -m 0755 $(PACKAGE) $(DESTDIR)$(PREFIX)/bin
 	install -m 0755 $(PACKAGE)-box $(DESTDIR)$(PREFIX)/bin
 	install -m 0755 $(PACKAGE)-server $(DESTDIR)$(PREFIX)/sbin
-	install -m 0755 $(PACKAGE)-env $(DESTDIR)$(PREFIX)/share/$(PACKAGE)
 	install -m 0644 README $(DESTDIR)$(DOCDIR)/$(PACKAGE)
 	install -m 0644 data/$(PACKAGE)-server.conf $(DESTDIR)/etc/$(PACKAGE)
 	install -m 0644 data/$(PACKAGE).png $(DESTDIR)$(PREFIX)/share/pixmaps
 	install -m 0644 data/$(PACKAGE).desktop \
 		$(DESTDIR)$(PREFIX)/share/applications
+	install -m 0755 $(PACKAGE)-env \
+		$(DESTDIR)$(PREFIX)/share/$(PACKAGE)/rootfs/bin
 	touch $(DESTDIR)/var/lib/$(PACKAGE)/vdisk.files
diff -r aa620b69c929 -r 694076541061 README
--- a/README	Mon Jun 13 17:34:45 2011 +0200
+++ b/README	Mon Jun 13 18:30:46 2011 +0200
@@ -78,6 +78,13 @@
 
 $ ssfs setup --login=user --host=server
 
+Once the client is setup you can synchronize from the server and start live
+sync. You can also get quick access to your files and ssfs info with a nice
+startup icon in the desktop panel. To sync and start Ssfs notify:
+
+$ ssfs sync
+$ ssfs-box notify &
+
 
 GUI & Web interface
 -------------------
@@ -88,6 +95,9 @@
 the files. We may implement a HTTP Public dir which could handle xHTML pages, a
 wiki, etc.
 
+The GTK gui provide a notification mode as explained previewsly and the mian
+window can be started from the standard menu and under the Metwork category.
+
 
 Ssfs chroot SHell
 -----------------
@@ -137,6 +147,23 @@
 
 # ssfs-server help
 
+Vdisk chroot system can be extended if you want to provide more commands to
+users. The minimal SliTaz chroot is easily maintainable and builded using
+standard SliTaz packages. The package ssfs-busybox provide the minimal base
+commands such as ls, cp, mc, cat, grep and have no dependencies since we just
+need a few shared libs in /lib. Ssfs original chroot files are stored in the
+directory /usr/share/ssfs/rootfs. The virtual disk contain a Linux jounalized
+ext3 filesystem that you can check and verify with:
+
+# ssfs-server check-vdisk
+
+In a production environment dont forget to mount Ssfs vdisk on boot via fstab.
+For maitainance purpose you can manually mount or unmount the disk and also
+update it in a command, example:
+
+# ssfs-server mount-vdisk
+# ssfs-server up-vdisk
+
 
 Ssfs virtual disk
 -----------------
diff -r aa620b69c929 -r 694076541061 ssfs
--- a/ssfs	Mon Jun 13 17:34:45 2011 +0200
+++ b/ssfs	Mon Jun 13 18:30:46 2011 +0200
@@ -127,7 +127,7 @@
 				sed -e "/^$/"d -e "/^.\/$/"d
 		
 		# Monitor local folder if not yet running.
-		if [ ! -f "$pid" ]; then
+		if [ ! -s "$pid" ]; then
 			gettext "Starting lsyncd daemon..."
 			lsyncd -pidfile $pid -log all -logfile $logdir/lsyncd.log $config
 		else
diff -r aa620b69c929 -r 694076541061 ssfs-server
--- a/ssfs-server	Mon Jun 13 17:34:45 2011 +0200
+++ b/ssfs-server	Mon Jun 13 18:30:46 2011 +0200
@@ -115,7 +115,7 @@
 
 vdisk_config() {
 	cat > $root/etc/vdisk.conf << EOT
-# /etc/vdisk.conf: Ssfs virtual auto-generated config file.
+# /etc/vdisk.conf: Ssfs virtual disk auto-generated config file.
 
 VDATE="$date"
 VSIZE="$size"
@@ -271,17 +271,12 @@
 		cp -f /etc/slitaz-release $root/etc
 		if [ ! -f "$root/etc/passwd" ]; then
 			echo "root:x:0:0:root:/root:/bin/sh" > $root/etc/passwd
-			#echo "root::13525:0:99999:7:::" > $root/etc/shadow
 			echo "root:x:0:" > $root/etc/group
-			#echo "root:*::" > $root/etc/gshadow
 		fi
-
-		# /dev nodes.
-		#mknod -m 666 $root/dev/null c 1 3
-
-		# Ssfs Busybox package install files in $cache and allow easy vdisk
+		
+		# Ssfs Busybox package install files in $share and allow easy vdisk
 		# upgrade following SliTaz repo.
-		gettext "Installing Ssfs Busybox..."
+		gettext "Installing Ssfs root filesystem..."
 		cp -a $rootfs/* $root
 		status
 
@@ -300,9 +295,8 @@
 		done && status
 		
 		# Ssfs chroot SHell and declare vdisk config.
-		gettext "Installing Ssfs SHell and utility..."
+		gettext "Installing Ssfs SHell..."
 		install -m 0755 /bin/ssfs-sh $root/bin
-		install -m 0755 $share/ssfs-env $root/bin
 		touch $root/etc/vdisk.conf
 		status
 
diff -r aa620b69c929 -r 694076541061 web/ssfs.cgi
--- a/web/ssfs.cgi	Mon Jun 13 17:34:45 2011 +0200
+++ b/web/ssfs.cgi	Mon Jun 13 18:30:46 2011 +0200
@@ -4,6 +4,7 @@
 echo ""
 
 . /etc/ssfs/ssfs-server.conf
+export TZ=$(cat /etc/TZ)
 
 notes=/var/lib/ssfs/notes
 root=$SSFS_CHROOT
@@ -14,8 +15,6 @@
 pct=$(df $root | fgrep $root | awk '{print $5}')
 date=$(date "+%Y-%m-%d %H:%M")
 
-export TZ=$(cat /etc/TZ)
-
 # XHTML footer function.
 xhtml_footer() {
 	cat << EOT