[Pkg-uml-commit] r157 - in trunk/src/rootstrap: . debian modules

[Mattia Dongili]

Author: malattia
Date: 2006-08-22 15:51:34 +0000 (Tue, 22 Aug 2006)
New Revision: 157

Modified:
   trunk/src/rootstrap/debian/changelog
   trunk/src/rootstrap/modules/debian
   trunk/src/rootstrap/rootstrap.conf
   trunk/src/rootstrap/rootstrap.sgml
Log:
allow configuring /etc/apt/preferences in the target FS, thanks to
Andreas Beckmann. (Closes: #372901)


Modified: trunk/src/rootstrap/debian/changelog
===================================================================
--- trunk/src/rootstrap/debian/changelog	2006-08-20 18:54:23 UTC (rev 156)
+++ trunk/src/rootstrap/debian/changelog	2006-08-22 15:51:34 UTC (rev 157)
@@ -10,6 +10,8 @@
     (Closes: #311037)
   * allow using the --force-yes apt switch to install from untrusted
     sources. (Closes: #372937)
+  * allow configuring /etc/apt/preferences in the target FS, thanks to
+    Andreas Beckmann. (Closes: #372901)
 
  -- Mattia Dongili <malattia at debian.org>  Sat, 24 Jun 2006 18:49:11 +0200
 

Modified: trunk/src/rootstrap/modules/debian
===================================================================
--- trunk/src/rootstrap/modules/debian	2006-08-20 18:54:23 UTC (rev 156)
+++ trunk/src/rootstrap/modules/debian	2006-08-22 15:51:34 UTC (rev 157)
@@ -43,6 +43,11 @@
 	echo "deb $mirror $dist main" > $TARGET/etc/apt/sources.list
 fi
 
+# populate /etc/apt/preferences
+if test -n "$preferences"; then
+	echo "$preferences" >> $TARGET/etc/apt/preferences
+fi
+
 rm -f $TARGET/var/lib/apt/lists/debootstrap.*
 
 if test -z "$keepdebs"; then

Modified: trunk/src/rootstrap/rootstrap.conf
===================================================================
--- trunk/src/rootstrap/rootstrap.conf	2006-08-20 18:54:23 UTC (rev 156)
+++ trunk/src/rootstrap/rootstrap.conf	2006-08-22 15:51:34 UTC (rev 157)
@@ -112,7 +112,7 @@
 # Extra packages to install via apt after initial debootstrap install
 #install=myfavoritepackage someotherpackage
 
-# Sources for target's sources list. If no value is give the default
+# Sources for target's sources list. If no value is given the default
 # is to use the main section of $mirror
 # NOTE: you can provide multiple lines if each new line is indented
 # with blank spaces
@@ -124,6 +124,15 @@
 # packages from untrusted sources (in the apt-key sense)
 #apt_force_yes=true
 
+# Entries for target's /etc/apt/preferences
+# NOTE: you can provide multiple lines if each new line is indented
+# with blank spaces
+#preferences=
+# Explanation: unstable gets less preference
+# Package: *
+# Pin: release unstable
+# Pin-Priority: 300
+
 [base-config]
 root_password=rootstrap
 

Modified: trunk/src/rootstrap/rootstrap.sgml
===================================================================
--- trunk/src/rootstrap/rootstrap.sgml	2006-08-20 18:54:23 UTC (rev 156)
+++ trunk/src/rootstrap/rootstrap.sgml	2006-08-22 15:51:34 UTC (rev 157)
@@ -523,7 +523,7 @@
             </para>
 
             <para>
-              Corresponds to debootstrap's --include option
+              Corresponds to debootstrap's --include option.
             </para>
           </listitem>
         </varlistentry>
@@ -549,12 +549,23 @@
 	      Sources for target's sources.list. If no value is given the
 	      default is the main section of $mirror.
 	      NOTE: you can provide multiple lines if each new line is indented
-	      with blank spaces
+	      with blank spaces.
             </para>
           </listitem>
         </varlistentry>
 
         <varlistentry>
+          <term>preferences</term>
+          <listitem>
+            <para>
+	      Preferences for target's apt preferences file (see apt_preferences(5)).
+	      NOTE: you can provide multiple lines if each new line is indented
+	      with blank spaces.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
           <term>apt_force_yes</term>
           <listitem>
             <para>
@@ -660,6 +671,9 @@
 	<refentrytitle>debootstrap</refentrytitle><manvolnum>8</manvolnum>
       </citerefentry>,
       <citerefentry>
+	<refentrytitle>apt_preferences</refentrytitle><manvolnum>5</manvolnum>
+      </citerefentry>,
+      <citerefentry>
 	<refentrytitle>linux</refentrytitle><manvolnum>1</manvolnum>
       </citerefentry>;
       locally installed User-Mode Linux documentation or