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

[Mattia Dongili]

Author: malattia
Date: 2006-08-20 18:52:37 +0000 (Sun, 20 Aug 2006)
New Revision: 153

Modified:
   trunk/src/rootstrap/debian/changelog
   trunk/src/rootstrap/modules/debian
   trunk/src/rootstrap/rootstrap.conf
Log:
allow using --force-yes with apt-get to  to install from untrusted sources. (Closes: #372937)

Modified: trunk/src/rootstrap/debian/changelog
===================================================================
--- trunk/src/rootstrap/debian/changelog	2006-08-20 17:17:46 UTC (rev 152)
+++ trunk/src/rootstrap/debian/changelog	2006-08-20 18:52:37 UTC (rev 153)
@@ -8,6 +8,8 @@
   * unmount /proc after using it in modules/uml. (Closes: #372905)
   * disable hwclock on the newly created image, thanks to Matthew Palmer.
     (Closes: #311037)
+  * allow using the --force-yes apt switch to install from untrusted
+    sources. (Closes: #372937)
 
  -- 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 17:17:46 UTC (rev 152)
+++ trunk/src/rootstrap/modules/debian	2006-08-20 18:52:37 UTC (rev 153)
@@ -58,10 +58,15 @@
 fi
 
 if test -n "$install"; then
+    apt_options="-y"
+    if test "$apt_force_yes" = "true"; then
+	apt_options="$apt_options --force-yes"
+    fi
     divert $TARGET/sbin/start-stop-daemon
     chroot $TARGET mount -t proc proc /proc
     chroot $TARGET apt-get update
-    chroot $TARGET apt-get -y install $install
+    chroot $TARGET apt-get $apt_options install $install
+    chroot $TARGET apt-get clean
     echo "Killing any processes running on the target fs:"
     # kill any processes using the target fs
     fuser -k -v -m $TARGET || true

Modified: trunk/src/rootstrap/rootstrap.conf
===================================================================
--- trunk/src/rootstrap/rootstrap.conf	2006-08-20 17:17:46 UTC (rev 152)
+++ trunk/src/rootstrap/rootstrap.conf	2006-08-20 18:52:37 UTC (rev 153)
@@ -120,6 +120,10 @@
 # deb http://security.debian.org/ stable/updates main contrib non-free
 # deb http://http.us.debian.org/debian sarge main contrib non-free
 
+# Use the --force-yes switch for apt-get, useful for e.g. installing
+# packages from untrusted sources (in the apt-key sense)
+#apt_force_yes=true
+
 [base-config]
 root_password=rootstrap