Replaced /etc/grml/fai/files/etc/apt/preferences with /etc/grml/fai/apt/preferences...

diff --git a/debian/changelog b/debian/changelog
index cf1cd58..cd880a4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,9 @@ grml-live (0.0.7) unstable; urgency=low
     to fix issues from Debian for grml-live builds. It is automatically
     activated if you are building against unstable/sid and should
     be used manually only if you realy know what you are doing. :)
     to fix issues from Debian for grml-live builds. It is automatically
     activated if you are building against unstable/sid and should
     be used manually only if you realy know what you are doing. :)

+  * Replaced /etc/grml/fai/files/etc/apt/preferences
+    with /etc/grml/fai/apt/preferences so grml-live repository
+    can be used and configured at a single place.

   * Use apt-pinning via /etc/grml/fai/config/hooks/instsoft.GRMLBASE
     already and remove it from /etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
   * Display version number of grml-live.
   * Use apt-pinning via /etc/grml/fai/config/hooks/instsoft.GRMLBASE
     already and remove it from /etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
   * Display version number of grml-live.

diff --git a/etc/grml/fai/files/etc/apt/preferences b/etc/grml/fai/apt/preferences
similarity index 62%
rename from etc/grml/fai/files/etc/apt/preferences
rename to etc/grml/fai/apt/preferences
index 3df8f95..c7b2098 100644 (file)
--- a/etc/grml/fai/files/etc/apt/preferences
+++ b/etc/grml/fai/apt/preferences
@@ -1,15 +1,14 @@
+// allow overwriting via grml-live:
+Package: *
+Pin: release o=The grml project,a=grml-live,l=grml,c=main
+Pin-Priority: 997
+

 // main grml-repository:
 Package: *
 Pin: origin deb.grml.org
 Pin-Priority: 996
 
 // main grml-repository:
 Package: *
 Pin: origin deb.grml.org
 Pin-Priority: 996
 

-// fallback grml-repository:
-Package: *
-Pin: origin grml.org
-Pin-Priority: 995
-

 // 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

-

diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
index cdca8a8..5e543f2 100755 (executable)
--- a/etc/grml/fai/config/hooks/instsoft.GRMLBASE
+++ b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.

-# Latest change: Mit Okt 24 14:30:53 CEST 2007 [mika]
+# Latest change: Sat Oct 27 02:15:35 CEST 2007 [mika]

 ################################################################################
 
 set -u
 ################################################################################
 
 set -u


@@ -22,7 +22,7 @@ $ROOTCMD apt-key add /etc/apt/grml.key
 
 # make sure we prefer grml repository:
 if [ -r /etc/grml/fai/files/etc/apt/preferences ] ; then
 
 # make sure we prefer grml repository:
 if [ -r /etc/grml/fai/files/etc/apt/preferences ] ; then

-   cp /etc/grml/fai/files/etc/apt/preferences $target/etc/apt/preferences
+   cp /etc/grml/fai/apt//preferences $target/etc/apt/preferences

 fi
 
 # make sure we have file-rc available before
 fi
 
 # make sure we have file-rc available before