BF: nd_adddist to use Ubuntu's keyring for Ubuntu chroots

diff --git a/tools/nd_adddist b/tools/nd_adddist
index 94bd35b146afbe1c82e97634c2adf9adb123779a..f5aa64d6d5ce3f9727f36f2b1b42efb6de2c0783 100755 (executable)
--- a/tools/nd_adddist
+++ b/tools/nd_adddist
@@ -21,6 +21,11 @@ fi
 # common options
 opts="--distribution $dist --debootstrap debootstrap --aptcache $aptcache"
 
+if echo $family | grep -q ubuntu; then
+       # Use ubuntu's keyring since otherwise debootstrap would fail
+       opts+=" --debootstrapopts --keyring=/usr/share/keyrings/ubuntu-archive-keyring.gpg"
+fi
+
 mkdir -p ${cowbuilderroot}/cow
 
 for a in i386 amd64; do
@@ -35,7 +40,7 @@ for a in i386 amd64; do
     cowbuilder --create --basepath ${cow} $opts \
                --components "$components" \
                --mirror "$mirror" \
-               --debootstrapopts --arch --debootstrapopts $a \
+               --debootstrapopts --arch=$a \
                --othermirror "deb http://neuro.debian.net/debian $dist main contrib non-free"
        # deploy our key manually since archive with package is not yet
        # available at this point
@@ -44,6 +49,6 @@ for a in i386 amd64; do
     cowbuilder --create --basepath ${cow} $opts \
                --components "$components" \
                --mirror "$mirror" \
-               --debootstrapopts --arch --debootstrapopts $a
+               --debootstrapopts --arch=$a
   fi
 done