Merge pull request #4 from esc/fix/building-debian-packages-on-ubuntu

Fix/building debian packages on ubuntu

diff --git a/tools/nd_adddist b/tools/nd_adddist
index b4a3f21e85d507dd72d5a1fe4352c8377cd4fd74..6c3136d43f7fe97230dd5143da07972228bcc4be 100755 (executable)
--- a/tools/nd_adddist
+++ b/tools/nd_adddist
@@ -22,8 +22,13 @@ fi
 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"
+    # Use ubuntu's keyring since otherwise debootstrap would fail
+    opts+=" --debootstrapopts --keyring=/usr/share/keyrings/ubuntu-archive-keyring.gpg"
+fi
+
+if echo $family | grep -q debian; then
+    # Use debian keyring since otherwise debootstrap would fail (on Ubuntu)
+    opts+=" --debootstrapopts --keyring=/usr/share/keyrings/debian-archive-keyring.gpg"
 fi
 
 mkdir -p ${cowbuilderroot}/cow