Warning!

Notice: the grml team is migrating from Mercurial to Git.
Please visit git.grml.org instead!

Replaced /etc/grml/fai/files/etc/apt/preferences with /etc/grml/fai/apt/preferences so grml-live
authorMichael Prokop
Sat Oct 27 14:09:50 2007 +0200 (13 months ago)
changeset 22188bfdc7a0717
manifest88bfdc7a0717
parent 2206680943272b5
child 2222631e3fcfbfe
Replaced /etc/grml/fai/files/etc/apt/preferences with /etc/grml/fai/apt/preferences so grml-live
debian/changelog
etc/grml/fai/apt/preferences
etc/grml/fai/config/hooks/instsoft.GRMLBASE
etc/grml/fai/files/etc/apt/preferences
--- a/debian/changelog Sat Oct 27 00:27:56 2007 +0200
+++ b/debian/changelog Sat Oct 27 14:09:50 2007 +0200
@@ -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. :)
+ * 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.
--- a/etc/grml/fai/config/hooks/instsoft.GRMLBASE Sat Oct 27 00:27:56 2007 +0200
+++ b/etc/grml/fai/config/hooks/instsoft.GRMLBASE Sat Oct 27 14:09:50 2007 +0200
@@ -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.
-# Latest change: Mit Okt 24 14:30:53 CEST 2007 [mika]
+# Latest change: Sat Oct 27 02:15:35 CEST 2007 [mika]
################################################################################
set -u
@@ -22,7 +22,7 @@ gpg --export F61E2E7CECDEA787 > $target/
# 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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/etc/grml/fai/apt/preferences Sat Oct 27 14:09:50 2007 +0200
@@ -0,0 +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
+
+// debian unstable pool (default):
+Package: *
+Pin: release a=unstable,o=Debian
+Pin-Priority: 991
--- a/etc/grml/fai/files/etc/apt/preferences Sat Oct 27 00:27:56 2007 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-// 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
-