Merge branch 'master' into robur

makepackage

@@ -175,6 +175,7 @@ do
     mv \$i \$i.real
     cp /bin/true \$i
 done
+export DEBIAN_FRONTEND=noninteractive
 apt-get --force-yes -y dist-upgrade
 umount /proc
 EOF
@@ -188,7 +189,7 @@ fi
 }
 
 tmpumount(){
-  grep jails/$UPSTREAM-$ARCH/tmp /proc/mounts -q || return
+  grep jails/$UPSTREAM-$ARCH/tmp /proc/mounts -q || return 0
   umount jails/$UPSTREAM-$ARCH/tmp && return
   echo ERROR: could not umount tmpfs at jails/$UPSTREAM-$ARCH/tmp
   exit 1

makepending

@@ -108,6 +108,7 @@ then
  #   echo Upstream version in $UPSTREAM: $upstream 1>&2
 [ $package = "grub2" -a $UPSTREAM = natty ] && continue
 [ $package = "grub2" -a $UPSTREAM = oneiric ] && continue
+[ $package = "grub2" -a $UPSTREAM = precise ] && continue
 [ $package = "yelp" -a $UPSTREAM = natty ] && continue
 
     echo Current version in $DISTRO: $current