Update pinning via /etc/grml/fai/apt/preferences

diff --git a/debian/changelog b/debian/changelog
index 484a0cf..e96bfe1 100644 (file)
--- 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
     - 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).
   * 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 (file)
--- a/etc/grml/fai/apt/preferences
+++ b/etc/grml/fai/apt/preferences
@@ -5,10 +5,19 @@ Pin-Priority: 997
 
 // main grml-repository:
 Package: *
 
 // 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
 
 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
 // debian unstable pool (default):
 Package: *
 Pin: release a=unstable,o=Debian
 Pin-Priority: 991

+