X-Git-Url: http://popeye.lapinbilly.eu/git/?p=fbsd-stable-mgmt.git;a=blobdiff_plain;f=portupgrade.sh;h=b178cfd239025c6267b729580122add746879adc;hp=bc766e40ebf2a316d916f9279113f25f920a945d;hb=HEAD;hpb=76c37ca965d721fc358b4b911e97bd2bb82f6f52

diff --git a/portupgrade.sh b/portupgrade.sh
index bc766e4..1e29340 100755
--- a/portupgrade.sh
+++ b/portupgrade.sh
@@ -1,9 +1,15 @@
 #!/bin/sh
 
 all_jails=`jls jid`
+
 DO_CLEAN=""
 DO_DIST=""
 
+do_snap()
+{
+	zfs snap -r zroot/JAILS/master@up || exit 0
+}
+
 do_all_jails(){
 
 	echo '---------------------------------------'
@@ -14,9 +20,11 @@ do_all_jails(){
 	echo Cleaning host 
 	echo
 	[ -n "${DO_CLEAN}" ] && pkg ${DO_CLEAN}
-	[ -n "${DO_CLEAN}" ] && pkg ${DO_DIST}
+	[ -n "${DO_DIST}" ] && pkg ${DO_DIST}
+	echo '---------------------------------------'
 	for j in ${all_jails}
 	do
+		echo
 		echo '---------------------------------------'
 		echo ":: jail `jls -j ${j} name` [ ${j} ] ::"
 		echo ''
@@ -29,7 +37,8 @@ do_all_jails(){
 		echo
 		echo Cleanup distfiles
 		echo
-		[ -n "${DO_CLEAN}" ] && pkg -j ${j} ${DO_DIST}
+		[ -n "${DO_DIST}" ] && pkg -j ${j} ${DO_DIST}
+		echo '---------------------------------------'
 	done
 }
 
@@ -52,10 +61,12 @@ echo
 
 case "${yn}" in
 	[Yy][eE][sS]|[yY])
-		DO_DIST="clean -a"
+		DO_DIST="clean -a -y"
 		;;
 	*) 
 		;;
 esac
-echo removing distfiles
+
+zfs list -H -t snap -r zroot/JAILS/master@up || do_snap
+
 do_all_jails