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

[Mattia Dongili]

Author: malattia
Date: 2006-10-08 09:31:51 +0000 (Sun, 08 Oct 2006)
New Revision: 235

Modified:
   trunk/src/rootstrap/modules/debian
   trunk/src/rootstrap/rootstrap.conf
   trunk/src/rootstrap/rootstrap.sgml
Log:
fix apt_preferences line separator and cite umlargs

Modified: trunk/src/rootstrap/modules/debian
===================================================================
--- trunk/src/rootstrap/modules/debian	2006-10-08 09:30:51 UTC (rev 234)
+++ trunk/src/rootstrap/modules/debian	2006-10-08 09:31:51 UTC (rev 235)
@@ -59,7 +59,7 @@
 
 # populate /etc/apt/preferences
 if test -n "$preferences"; then
-	echo "$preferences" >> $TARGET/etc/apt/preferences
+	echo "$preferences" | sed -e 's/^\.$//' >> $TARGET/etc/apt/preferences
 fi
 
 # populate /etc/apt/apt.conf

Modified: trunk/src/rootstrap/rootstrap.conf
===================================================================
--- trunk/src/rootstrap/rootstrap.conf	2006-10-08 09:30:51 UTC (rev 234)
+++ trunk/src/rootstrap/rootstrap.conf	2006-10-08 09:31:51 UTC (rev 235)
@@ -25,6 +25,11 @@
 # unnecessarily.  I use squid.
 #http_proxy=http://192.168.10.1:3128
 
+# UML supplemental arguments
+# uncomment the following if you're running heavy processes in the
+# image creation, such as creating locales
+#umlargs=mem=128M
+
 # Debugging stuff, if a rootstrap module fails spawn a shell to allow
 # investigating. Set the following variable to "true" if you want 
 # such behaviour.
@@ -129,12 +134,16 @@
 
 # Entries for target's /etc/apt/preferences
 # NOTE: you can provide multiple lines if each new line is indented
-# with blank spaces
+# with blank spaces. apt_preferences atanzas mut be separated by
+# a line containing only a dot (".")
 #preferences=
-# Explanation: unstable gets less preference
 # Package: *
 # Pin: release unstable
 # Pin-Priority: 300
+# .
+# Package: *
+# Pin: release testing
+# Pin-Priority: 400
 
 # Entries for target's /etc/apt/apt.conf
 # NOTE: you can provide multiple lines if each new line is indented

Modified: trunk/src/rootstrap/rootstrap.sgml
===================================================================
--- trunk/src/rootstrap/rootstrap.sgml	2006-10-08 09:30:51 UTC (rev 234)
+++ trunk/src/rootstrap/rootstrap.sgml	2006-10-08 09:31:51 UTC (rev 235)
@@ -581,7 +581,9 @@
             <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.
+	      with blank spaces. Multiple apt_preferences stanzas are allowed provided
+	      that they are separated by a line containing only a dot (".") and
+	      obviously indented as specified above.
             </para>
           </listitem>
         </varlistentry>