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

[Mattia Dongili]

Author: malattia
Date: 2006-05-28 19:12:40 +0000 (Sun, 28 May 2006)
New Revision: 114

Modified:
   trunk/src/rootstrap/debian/changelog
   trunk/src/rootstrap/modules/debian
   trunk/src/rootstrap/rootstrap.conf
   trunk/src/rootstrap/rootstrap.sgml
Log:
implement a "sources" option for the [debian] modules to
let users give their favourite repositories (Closes: #172296)


Modified: trunk/src/rootstrap/debian/changelog
===================================================================
--- trunk/src/rootstrap/debian/changelog	2006-05-28 16:23:23 UTC (rev 113)
+++ trunk/src/rootstrap/debian/changelog	2006-05-28 19:12:40 UTC (rev 114)
@@ -7,6 +7,8 @@
     (Closes: #275410) (Closes: #282914) (Closes: #320410)
   * ensure that the UML kernel is able to find uml_net (Closes: #304461)
   * add reference of the hostfs need on man page (Closes: #300221)
+  * implement a "sources" option for the [debian] modules to
+    let users give their favourite repositories (Closes: #172296)
 
  -- Stefano Melchior <stefano.melchior at openlabs.it>  Sun, 21 May 2006 23:19:38 +0200
 

Modified: trunk/src/rootstrap/modules/debian
===================================================================
--- trunk/src/rootstrap/modules/debian	2006-05-28 16:23:23 UTC (rev 113)
+++ trunk/src/rootstrap/modules/debian	2006-05-28 19:12:40 UTC (rev 114)
@@ -36,7 +36,12 @@
 echo "debootstrapping with the following opt: '$opts' for '$dist' on target '$TARGET' using mirror '$mirror' $script"
 debootstrap $opts $dist $TARGET $mirror $script
 
-echo "deb $mirror $dist main" > $TARGET/etc/apt/sources.list
+# populate sources.list
+if test -n "$sources"; then
+	echo "$sources" >> $TARGET/etc/apt/sources.list
+else
+	echo "deb $mirror $dist main" > $TARGET/etc/apt/sources.list
+fi
 
 rm -f $TARGET/var/lib/apt/lists/debootstrap.*
 

Modified: trunk/src/rootstrap/rootstrap.conf
===================================================================
--- trunk/src/rootstrap/rootstrap.conf	2006-05-28 16:23:23 UTC (rev 113)
+++ trunk/src/rootstrap/rootstrap.conf	2006-05-28 19:12:40 UTC (rev 114)
@@ -95,9 +95,8 @@
 [debian]
 dist=sarge
 
-# A local mirror is best, a caching proxy (such as squid) is almost as
-# good
-
+# A local mirror is best, a caching proxy (such as squid) 
+# is almost as good
 mirror=http://http.us.debian.org/debian
 
 # Packages which should not be installed in the first place (be sure
@@ -113,6 +112,14 @@
 # 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
+# is to use the main section of $mirror
+# NOTE: you can provide multiple lines if each new line is indented
+# with blank spaces
+#sources=
+# deb http://security.debian.org/ stable/updates main contrib non-free
+# deb http://http.us.debian.org/debian sarge main contrib non-free
+
 [base-config]
 root_password=rootstrap
 

Modified: trunk/src/rootstrap/rootstrap.sgml
===================================================================
--- trunk/src/rootstrap/rootstrap.sgml	2006-05-28 16:23:23 UTC (rev 113)
+++ trunk/src/rootstrap/rootstrap.sgml	2006-05-28 19:12:40 UTC (rev 114)
@@ -384,6 +384,31 @@
           </listitem>
         </varlistentry>
 
+        <varlistentry>
+          <term>install</term>
+          <listitem>
+            <para>
+	      Extra packages to install via apt after initial debootstrap
+	      install.
+            </para>
+
+            <para>
+              See also the sources option.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>sources</term>
+          <listitem>
+            <para>
+	      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
+            </para>
+          </listitem>
+        </varlistentry>
       </variablelist>
 
     </refsect2>