SliTaz Repositories

     1.1 --- a/pizza	Thu Sep 12 21:48:29 2013 +0300
     1.2 +++ b/pizza	Mon Dec 16 15:34:06 2013 +0100
     1.3 @@ -19,6 +19,7 @@
     1.4  public="$VHOST/public"
     1.5  bindpub="${chroot}$SLITAZ/public"
     1.6  hgflavors="$cache/flavors"
     1.7 +crontabs="$chroot/var/spool/cron/crontabs"
     1.8  
     1.9  #
    1.10  # Functions
    1.11 @@ -102,13 +103,13 @@
    1.12  case "$1" in
    1.13  	setup)
    1.14  		# Setup build host.
    1.15 -		crontabs="$chroot/var/spool/cron/crontabs"
    1.16 +		
    1.17  		if [ -d "$chroot/proc" ]; then
    1.18  			echo "Chroot already exists: $chroot" && exit 0
    1.19  		fi
    1.20  		echo ""
    1.21  		echo "Setting up Pizza environment..."
    1.22 -		mkdir -p $crontabs $cache $pkgs $tmp $queue $bindpub $feeds
    1.23 +		mkdir -p $crontabs $cache $pkgs $tmp $queue $bindpub $feeds $crontabs
    1.24  		touch $activity $builds
    1.25  		chmod 0777 $tmp $queue $cache
    1.26  		chmod 0666 $activity
    1.27 @@ -174,32 +175,38 @@
    1.28  		# Chroot in Pizza environment.
    1.29  		echo -e "\nChrooting to: $chroot\n"
    1.30  		chroot $chroot /bin/sh --login
    1.31 -		echo -e "\nExiting Pizza chroot...\n" ;;
    1.32 +		echo -e "\nExiting Pizza chroot...\n"
    1.33 +		;;
    1.34  	start)
    1.35  		# Mount and start Pizza
    1.36  		if ! mount | fgrep -q "pizza/chroot"; then
    1.37  			gettext -e "Mounting packages and public...\n"
    1.38  			mount -o bind $SLITAZ/$SLITAZ_VERSION/packages $pkgs
    1.39  			mount -o bind $public $bindpub
    1.40 +			mount -t proc proc $chroot/proc
    1.41  		fi
    1.42 -		chroot $chroot /etc/init.d/crond start
    1.43 -		[ "$MAIL_DOMAIN" ] && chroot $chroot /etc/init.d/postfix start ;;
    1.44 +		#~ chroot $chroot /etc/init.d/crond start
    1.45 +		#~ [ "$MAIL_DOMAIN" ] && chroot $chroot /etc/init.d/postfix start
    1.46 +		;;
    1.47  	stop)
    1.48  		# Unmount and stop Pizza
    1.49  		if mount | fgrep -q "pizza/chroot"; then
    1.50  			gettext -e "Unmounting packages and public...\n"
    1.51  			umount $pkgs
    1.52  			umount $bindpub
    1.53 +			umount $chroot/proc 
    1.54  		fi
    1.55 -		chroot $chroot /etc/init.d/crond stop
    1.56 -		[ "$MAIL_DOMAIN" ] && chroot $chroot /etc/init.d/postfix stop ;;
    1.57 +		#~ chroot $chroot /etc/init.d/crond stop
    1.58 +		#~ [ "$MAIL_DOMAIN" ] && chroot $chroot /etc/init.d/postfix stop
    1.59 +		;;
    1.60  	get-lists)
    1.61  		get_pkgs_lists ;;
    1.62  	sync-pkgs)
    1.63  		echo "Syncing all $SLITAZ_VERSION packages..."
    1.64  		echo "Syncing all $SLITAZ_VERSION packages" | log
    1.65  		rsync -azHv --delete $RSYNC_PKGS $LOCAL_PKGS
    1.66 -		du -sh $LOCAL_PKGS ;;
    1.67 +		du -sh $LOCAL_PKGS
    1.68 +		;;
    1.69  	backup)
    1.70  		echo "Creating Pizza backup..."
    1.71  		bak="pizza-$(date "+%Y%m%d")"
    1.72 @@ -218,7 +225,8 @@
    1.73  		done
    1.74  		tar cf $bak.tar $bak && rm -rf $bak
    1.75  		lzma e $bak.tar $bak.tar.lzma
    1.76 -		du -sh $bak.tar.lzma ;;
    1.77 +		du -sh $bak.tar.lzma
    1.78 +		;;
    1.79  	purge)
    1.80  		# Remove tmp file older than 24 hours and ISO older than 15 days.
    1.81  		# TODO: Improve and use configs from pizza.conf
    1.82 @@ -226,7 +234,8 @@
    1.83  		echo "Purging tmp files..."
    1.84  		find $tmp -mtime +1 | xargs rm -rf
    1.85  		echo "Purging ISO's..."
    1.86 -		find $public -mtime +15 | xargs rm -rf ;;
    1.87 +		find $public -mtime +15 | xargs rm -rf
    1.88 +		;;
    1.89  	clean)
    1.90  		# Clean all chroot.
    1.91  		echo -e "\nCleaning: $chroot"
    1.92 @@ -234,7 +243,8 @@
    1.93  		for i in *
    1.94  		do
    1.95  			[ "$i" == "home" ] || rm -rf $i
    1.96 -		done && echo "" ;;
    1.97 +		done && echo ""
    1.98 +		;;
    1.99  	*)
   1.100  		usage ;;
   1.101  esac