Use aptitude in invirt-update-ai-guest, and guarantee that it'll be

installed.

svn path=/trunk/packages/invirt-autoinstaller/; revision=2123

diff --git a/debian/changelog b/debian/changelog
index 819f33d..809b386 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+invirt-autoinstaller (0.0.11) unstable; urgency=low
+
+  * Require aptitude in the autoinstaller guest - and use it in
+    invirt-update-ai-guest.
+
+ -- Evan Broder <broder@mit.edu>  Sat, 14 Feb 2009 22:32:32 -0500
+

 invirt-autoinstaller (0.0.10) unstable; urgency=low
 
   * Serial consoles are supposed to run at 115200 baud, not 115300.
 invirt-autoinstaller (0.0.10) unstable; urgency=low
 
   * Serial consoles are supposed to run at 115200 baud, not 115300.

diff --git a/debian/control b/debian/control
index d173d71..2b53494 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Description: SIPB Xen automatic guest-image installer system (host)
 Package: invirt-autoinstaller-guest
 Architecture: all
 Provides: ${diverted-files}
 Package: invirt-autoinstaller-guest
 Architecture: all
 Provides: ${diverted-files}

-Conflicts: ${diverted-files}, sysvinit, upstart, xen-hypervisor
+Conflicts: ${diverted-files}, aptitude, sysvinit, upstart, xen-hypervisor

 Depends: ${misc:Depends}, patch, xen-tools, busybox-static, lvm2, kpartx
 Description: SIPB Xen automatic guest-image installer system (guest)
  This is our automatic guest-image installer system.
 Depends: ${misc:Depends}, patch, xen-tools, busybox-static, lvm2, kpartx
 Description: SIPB Xen automatic guest-image installer system (guest)
  This is our automatic guest-image installer system.

diff --git a/host/usr/sbin/invirt-update-ai-guest b/host/usr/sbin/invirt-update-ai-guest
index f06b3ff..915039b 100755 (executable)
--- a/host/usr/sbin/invirt-update-ai-guest
+++ b/host/usr/sbin/invirt-update-ai-guest
@@ -37,7 +37,7 @@ for i in $MOUNTDIRS; do
     mount --bind $i "/mnt/install$i"
 done
 
     mount --bind $i "/mnt/install$i"
 done
 

-chroot /mnt/install apt-get update
-chroot /mnt/install apt-get dist-upgrade
+chroot /mnt/install aptitude update
+chroot /mnt/install aptitude dist-upgrade

 
 clean_up
 
 clean_up