work on chroot bootstrap issues

manifests/chroot.pp

@@ -57,8 +57,12 @@ define su_debuild::chroot(
       }
     }
 
+    file { '/etc/pbuilder':
+      ensure => directory,
+    }
+
     # There is a chicken-and-egg problem in getting the stanford
-    # repository's public key installed.  We do this as follows:
+    # repository's public key installed.  We work around this as follows:
     #
     #  0. Install the chroot WITHOUT the stanford-keyring.
     #  1. Copy the correct distribution's sources.list file to /etc/apt.
@@ -85,10 +89,17 @@ define su_debuild::chroot(
         require => Exec["cowbuilder --create ${name}"];
     }
 
-    # 2. Copy the correct sources.list.
-    file { "$path/etc/apt/sources.list":
+    # 2. Install the correct sources.list to /etc/pbuild so we can use
+    # it later. We only need it once.
+    file { "/etc/pbuilder/sources.list.${name}":
       source  => "puppet:///modules/su_debuild/etc/apt/sources.list.${name}",
-      require => File["${path}/etc/apt/trusted.gpg.d/stanford-keyring.gpg"],
+      require => File['/etc/pbuilder'],
+      notify  => Exec['copy-correct-sources-list'],
+    }
+    exec { 'copy-correct-sources-list':
+      path        => '/usr/sbin:/usr/bin:/bin:/sbin',
+      refreshonly => true,
+      command     => "cp /etc/pbuilder/sources.list.${name} $path/etc/apt/sources.list",
     }
 
     # 3. Install stanford-keyring. Be sure to run "apt-get update" first.
@@ -99,7 +110,7 @@ define su_debuild::chroot(
       command => "chroot $path apt-get update; chroot $path apt-get install stanford-keyring",
       creates => "$path/usr/share/keyrings/stanford-keyring.gpg",
       require => [
-        File["$path/etc/apt/sources.list"],
+        Exec['copy-correct-sources-list'],
         File["${path}/etc/apt/trusted.gpg.d/stanford-keyring.gpg"],
       ]
     }

templates/etc/pbuilder/debian.erb

 # /etc/pbuilder/<%= @distribution %> -- Debian override configuration file for pbuilder.
 
 MIRRORSITE=http://debian.stanford.edu/debian
+
+# We always want the "stanford" and "local" Stanford-specific Debian repository.
+OTHERMIRROR="deb http://debian.stanford.edu/debian-stanford <%= @distribution %> main contrib non-free"
+OTHERMIRROR="$OTHERMIRROR |deb http://debian.stanford.edu/debian-local <%= @distribution %> main contrib non-free"
+
 <%-
   if (@include_backports) then
+    backports_comment_character = ""
+    backports_message = "We want backports."
+  else
+    backports_comment = "# "
+    backports_message = "Backports distribution either no longer available or not yet\n"
+                      + "available so omitting"
+  end
 -%>
-OTHERMIRROR="deb http://debian.stanford.edu/debian <%= @distribution %>-backports main contrib non-free"
-<%- else -%>
-# Backports distribution either no longer available or not yet
-# available so omitting
-# OTHERMIRROR="deb http://debian.stanford.edu/debian <%= @distribution %>-backports main contrib non-free"
-<%- end -%>
+<%= backports_message %>
+<%= backports_comment %>OTHERMIRROR="$OTHERMIRROR |deb http://debian.stanford.edu/debian <%= @distribution %>-backports main contrib non-free"
+<%= backports_comment %>OTHERMIRROR="$OTHERMIRROR |deb http://debian.stanford.edu/debian-stanford <%= @distribution %>-backports main contrib non-free"
+
 <%- if (@include_stanford_keyring) then -%>
 EXTRAPACKAGES="aptitude debconf-utils debhelper gnupg stanford-keyring"
 <%- else -%>