[debian-edu-commits] r83060 - in branches/wheezy/debian-edu-install: . debian

[pere at alioth.debian.org]

Author: pere
Date: 2014-03-07 07:44:41 +0000 (Fri, 07 Mar 2014)
New Revision: 83060

Modified:
   branches/wheezy/debian-edu-install/debian/changelog
   branches/wheezy/debian-edu-install/pre-pkgsel
Log:
Make sure to call 'apt-get update' after installing debian-edu-
archive-keyring and before trying to install packages from our APT
repository, to make apt aware of the signatures in our repository.
Fixes fatal installation error in PXE and ISO installs.

Modified: branches/wheezy/debian-edu-install/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-install/debian/changelog	2014-03-06 22:25:35 UTC (rev 83059)
+++ branches/wheezy/debian-edu-install/debian/changelog	2014-03-07 07:44:41 UTC (rev 83060)
@@ -2,6 +2,10 @@
 
   * Drop Patrick Winnertz as uploader.  Thank you for your good work!
   * Drop Vagrant Cascadian as uploader, on his request.
+  * Make sure to call 'apt-get update' after installing debian-edu-
+    archive-keyring and before trying to install packages from our APT
+    repository, to make apt aware of the signatures in our repository.
+    Fixes fatal installation error in PXE and ISO installs.
 
  -- Petter Reinholdtsen <pere at debian.org>  Sun, 02 Mar 2014 19:19:30 +0100
 

Modified: branches/wheezy/debian-edu-install/pre-pkgsel
===================================================================
--- branches/wheezy/debian-edu-install/pre-pkgsel	2014-03-06 22:25:35 UTC (rev 83059)
+++ branches/wheezy/debian-edu-install/pre-pkgsel	2014-03-07 07:44:41 UTC (rev 83060)
@@ -14,6 +14,24 @@
     logger -t edu-pre-pkgsel "error: $*"
 }
 
+# Install required packages, report fatal error and reboot if it fail.
+install_required_pkg() {
+    p="$1"
+    if apt-install $p ; then
+	:
+    else
+	template=debian-edu-install/errors-pkg-installation
+	db_subst $template PACKAGES "$p"
+	db_fset $template seen false
+	db_capb "" # Disable "Go Back" button
+	db_settitle $template-title
+	db_input critical $template || [ $? -eq 30 ]
+	db_go
+	db_capb backup
+	reboot
+    fi
+}
+
 load_proxy_conf
 
 # Initialize etckeeper early
@@ -57,27 +75,18 @@
 edu-etcvcs commit
 
 log "asking for a few extra packages to be installed"
-# debian-edu-archive-keyring - our local archive keyring
-# education-tasks            - education tasksel tasks
-# debian-edu-install         - the debian-edu preseeding files
-failed=""
-for p in debian-edu-archive-keyring education-tasks debian-edu-install
-do
-    if apt-install $p ; then
-	:
-    else
-	template=debian-edu-install/errors-pkg-installation
-	db_subst $template PACKAGES "$p"
-	db_fset $template seen false
-	db_capb "" # Disable "Go Back" button
-	db_settitle $template-title
-	db_input critical $template || [ $? -eq 30 ]
-	db_go
-	db_capb backup
-	reboot
-    fi
-done
 
+# our local archive keyring, update apt database after it is installed
+install_required_pkg debian-edu-archive-keyring
+# Update mirrors using the latest keys
+in-target apt-get update
+
+# education tasksel tasks
+install_required_pkg education-tasks
+
+# the debian-edu preseeding files
+install_required_pkg  debian-edu-install
+
 edu-etcvcs commit
 
 # Clean up file added in base-installer, now that debian-edu-config is