# HG changeset patch
# User Eric Joseph-Alexandre <erjo@slitaz.org>
# Date 1387204446 -3600
# Node ID e9cbc1c2a3750b4832c6896fa1de1290e372bc5e
# Parent  b1ad5461389f681e18633c8439fda108c2a16d96
pizza: Improve start/stop command

diff -r b1ad5461389f -r e9cbc1c2a375 pizza
--- a/pizza	Thu Sep 12 21:48:29 2013 +0300
+++ b/pizza	Mon Dec 16 15:34:06 2013 +0100
@@ -19,6 +19,7 @@
 public="$VHOST/public"
 bindpub="${chroot}$SLITAZ/public"
 hgflavors="$cache/flavors"
+crontabs="$chroot/var/spool/cron/crontabs"
 
 #
 # Functions
@@ -102,13 +103,13 @@
 case "$1" in
 	setup)
 		# Setup build host.
-		crontabs="$chroot/var/spool/cron/crontabs"
+		
 		if [ -d "$chroot/proc" ]; then
 			echo "Chroot already exists: $chroot" && exit 0
 		fi
 		echo ""
 		echo "Setting up Pizza environment..."
-		mkdir -p $crontabs $cache $pkgs $tmp $queue $bindpub $feeds
+		mkdir -p $crontabs $cache $pkgs $tmp $queue $bindpub $feeds $crontabs
 		touch $activity $builds
 		chmod 0777 $tmp $queue $cache
 		chmod 0666 $activity
@@ -174,32 +175,38 @@
 		# Chroot in Pizza environment.
 		echo -e "\nChrooting to: $chroot\n"
 		chroot $chroot /bin/sh --login
-		echo -e "\nExiting Pizza chroot...\n" ;;
+		echo -e "\nExiting Pizza chroot...\n"
+		;;
 	start)
 		# Mount and start Pizza
 		if ! mount | fgrep -q "pizza/chroot"; then
 			gettext -e "Mounting packages and public...\n"
 			mount -o bind $SLITAZ/$SLITAZ_VERSION/packages $pkgs
 			mount -o bind $public $bindpub
+			mount -t proc proc $chroot/proc
 		fi
-		chroot $chroot /etc/init.d/crond start
-		[ "$MAIL_DOMAIN" ] && chroot $chroot /etc/init.d/postfix start ;;
+		#~ chroot $chroot /etc/init.d/crond start
+		#~ [ "$MAIL_DOMAIN" ] && chroot $chroot /etc/init.d/postfix start
+		;;
 	stop)
 		# Unmount and stop Pizza
 		if mount | fgrep -q "pizza/chroot"; then
 			gettext -e "Unmounting packages and public...\n"
 			umount $pkgs
 			umount $bindpub
+			umount $chroot/proc 
 		fi
-		chroot $chroot /etc/init.d/crond stop
-		[ "$MAIL_DOMAIN" ] && chroot $chroot /etc/init.d/postfix stop ;;
+		#~ chroot $chroot /etc/init.d/crond stop
+		#~ [ "$MAIL_DOMAIN" ] && chroot $chroot /etc/init.d/postfix stop
+		;;
 	get-lists)
 		get_pkgs_lists ;;
 	sync-pkgs)
 		echo "Syncing all $SLITAZ_VERSION packages..."
 		echo "Syncing all $SLITAZ_VERSION packages" | log
 		rsync -azHv --delete $RSYNC_PKGS $LOCAL_PKGS
-		du -sh $LOCAL_PKGS ;;
+		du -sh $LOCAL_PKGS
+		;;
 	backup)
 		echo "Creating Pizza backup..."
 		bak="pizza-$(date "+%Y%m%d")"
@@ -218,7 +225,8 @@
 		done
 		tar cf $bak.tar $bak && rm -rf $bak
 		lzma e $bak.tar $bak.tar.lzma
-		du -sh $bak.tar.lzma ;;
+		du -sh $bak.tar.lzma
+		;;
 	purge)
 		# Remove tmp file older than 24 hours and ISO older than 15 days.
 		# TODO: Improve and use configs from pizza.conf
@@ -226,7 +234,8 @@
 		echo "Purging tmp files..."
 		find $tmp -mtime +1 | xargs rm -rf
 		echo "Purging ISO's..."
-		find $public -mtime +15 | xargs rm -rf ;;
+		find $public -mtime +15 | xargs rm -rf
+		;;
 	clean)
 		# Clean all chroot.
 		echo -e "\nCleaning: $chroot"
@@ -234,7 +243,8 @@
 		for i in *
 		do
 			[ "$i" == "home" ] || rm -rf $i
-		done && echo "" ;;
+		done && echo ""
+		;;
 	*)
 		usage ;;
 esac