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

[Mattia Dongili]

Author: malattia
Date: 2006-08-24 19:05:22 +0000 (Thu, 24 Aug 2006)
New Revision: 158

Modified:
   trunk/src/rootstrap/debian/changelog
   trunk/src/rootstrap/modules/debian
   trunk/src/rootstrap/rootstrap.conf
   trunk/src/rootstrap/rootstrap.sgml
Log:
Implement and document the apt_conf option to configure
apt in the target FS.
Clarify apt_force_yes usage.


Modified: trunk/src/rootstrap/debian/changelog
===================================================================
--- trunk/src/rootstrap/debian/changelog	2006-08-22 15:51:34 UTC (rev 157)
+++ trunk/src/rootstrap/debian/changelog	2006-08-24 19:05:22 UTC (rev 158)
@@ -10,8 +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)
+  * allow configuring /etc/apt/preferences and /etc/apt/apt.conf 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-22 15:51:34 UTC (rev 157)
+++ trunk/src/rootstrap/modules/debian	2006-08-24 19:05:22 UTC (rev 158)
@@ -33,7 +33,7 @@
     opts="$opts --unpack-tarball $basedebs"
 fi
 
-echo "debootstrapping with the following opt: '$opts' for '$dist' on target '$TARGET' using mirror '$mirror' $script"
+echo "debootstrap-ing with the following opt: '$opts' for '$dist' on target '$TARGET' using mirror '$mirror' $script"
 debootstrap $opts $dist $TARGET $mirror $script
 
 # populate sources.list
@@ -48,6 +48,11 @@
 	echo "$preferences" >> $TARGET/etc/apt/preferences
 fi
 
+# populate /etc/apt/apt.conf
+if test -n "$apt_conf"; then
+	echo "$apt_conf" >> $TARGET/etc/apt/apt.conf
+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-22 15:51:34 UTC (rev 157)
+++ trunk/src/rootstrap/rootstrap.conf	2006-08-24 19:05:22 UTC (rev 158)
@@ -133,6 +133,13 @@
 # Pin: release unstable
 # Pin-Priority: 300
 
+# Entries for target's /etc/apt/apt.conf
+# NOTE: you can provide multiple lines if each new line is indented
+# with blank spaces
+#apt_conf=
+# Acquire::http::Proxy {"http://[[user][:pass]@]host[:port]/"};
+# Acquire::ftp::Proxy {"ftp://[[user][:pass]@]host[:port]/"};
+
 [base-config]
 root_password=rootstrap
 

Modified: trunk/src/rootstrap/rootstrap.sgml
===================================================================
--- trunk/src/rootstrap/rootstrap.sgml	2006-08-22 15:51:34 UTC (rev 157)
+++ trunk/src/rootstrap/rootstrap.sgml	2006-08-24 19:05:22 UTC (rev 158)
@@ -547,7 +547,7 @@
           <listitem>
             <para>
 	      Sources for target's sources.list. If no value is given the
-	      default is the main section of $mirror.
+	      default is the main section of <parameter>mirror</parameter>.
 	      NOTE: you can provide multiple lines if each new line is indented
 	      with blank spaces.
             </para>
@@ -566,6 +566,19 @@
         </varlistentry>
 
         <varlistentry>
+          <term>apt_conf</term>
+          <listitem>
+            <para>
+	      Apt configuration for target's apt.conf file (see apt.conf(5)). The file
+	      will be created before installing additional packages so it will be already
+	      effective then.
+	      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>
@@ -575,6 +588,14 @@
 	      apt key authentication. It can be either <parameter>true</parameter>
 	      or <parameter>false</parameter> and defaults to the former.
             </para>
+	    <para>
+	      Be careful anyway as using this option "will cause apt to
+	      continue without prompting if it is doing something potentially
+	      harmful" (from apt-get(8)). This option is provided standalone instead
+	      of forcing its inclusion in <parameter>apt_conf</parameter> to
+	      avoid causing destructive actions later when using apt-get from the
+	      UML instance.
+	    </para>
           </listitem>
         </varlistentry>
       </variablelist>
@@ -674,6 +695,9 @@
 	<refentrytitle>apt_preferences</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
+	<refentrytitle>apt.conf</refentrytitle><manvolnum>5</manvolnum>
+      </citerefentry>,
+      <citerefentry>
 	<refentrytitle>linux</refentrytitle><manvolnum>1</manvolnum>
       </citerefentry>;
       locally installed User-Mode Linux documentation or