X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=chroot-script;h=bc933531be275fa5f8f0a9fc2107be50c2f55d1f;hp=48073036e66c3ba5538c2c1041c3f490a91c2120;hb=4fdbdbc3bccf62350c5fee4683ab9e701ca001f1;hpb=97a700acaf84ad7b0bf98c13c2da997908549972 diff --git a/chroot-script b/chroot-script index 4807303..bc93353 100644 --- a/chroot-script +++ b/chroot-script @@ -4,7 +4,7 @@ # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2. -# Latest change: Mon Apr 23 11:51:59 CEST 2007 [mika] +# Latest change: Mon Apr 23 12:02:03 CEST 2007 [mika] ################################################################################ set -e # exit on any error @@ -70,8 +70,10 @@ EOF gpg --export F61E2E7CECDEA787 | apt-key add - || /bin/true # not yet sure # why it's necessary, sometimes we get an error even though it works [mika] - if grep -q grml /etc/apt/preferences 2>/dev/null ; then - cat >> /etc/apt/preferences >> EOF + # make sure we install packages from grml's pool only if not available + # from Debian! + if ! grep -q grml /etc/apt/preferences 2>/dev/null ; then + cat >> /etc/apt/preferences << EOF // debian pool (default): Package: * Pin: release o=Debian @@ -82,6 +84,7 @@ Package: * Pin: origin deb.grml.org Pin-Priority: 991 EOF + fi fi } # }}}