From 856c087ec1e9e280ea3ad921d91dc2bd6e77a633 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Mon, 26 Nov 2007 00:45:24 +0100 Subject: [PATCH] Update pinning via /etc/grml/fai/apt/preferences --- debian/changelog | 3 +++ etc/grml/fai/apt/preferences | 11 ++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 484a0cf..e96bfe1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,6 +27,9 @@ grml-live (0.0.10) unstable; urgency=low - squashfs-modules-2.6.23-grml (we build the module external now) * Support loading of squashfs module via /etc/grml/fai/live-initramfs/grml-script.init-top + * Make sure we have pinning for grml-stable and grml-testing + repositories via /etc/grml/fai/apt/preferences, not matter where + the packages come from (web vs. local mirror/cache for example). * Do not create /etc/sysconfig/network-scripts and /etc/sysconfig/provider any longer in cleanup script. * Fix typo in bootsplash f3 (thanks, jimmy). diff --git a/etc/grml/fai/apt/preferences b/etc/grml/fai/apt/preferences index c7b2098..2004ece 100644 --- a/etc/grml/fai/apt/preferences +++ b/etc/grml/fai/apt/preferences @@ -5,10 +5,19 @@ Pin-Priority: 997 // main grml-repository: Package: * -Pin: origin deb.grml.org +Pin: release o=The grml project,a=grml-testing,l=grml,c=main Pin-Priority: 996 +Package: * +Pin: release o=The grml project,a=grml-stable,l=grml,c=main +Pin-Priority: 995 + +Package: * +Pin: origin deb.grml.org +Pin-Priority: 994 + // debian unstable pool (default): Package: * Pin: release a=unstable,o=Debian Pin-Priority: 991 + -- 2.1.4