From: Evan Broder <broder@mit.edu>
Date: Thu, 9 Oct 2008 06:12:37 +0000 (-0400)
Subject: Update the sipb-database script to match the remctl interface
X-Git-Tag: sipb-xen-database/10.30^0
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-database.git/commitdiff_plain/a964d744e6f3594a58e7c0b8c121a429a2770227

Update the sipb-database script to match the remctl interface

svn path=/trunk/packages/sipb-xen-database/; revision=1091
---

diff --git a/client/etc/xen/sipb-database b/client/etc/xen/sipb-database
index 0d4d466..fbc8079 100644
--- a/client/etc/xen/sipb-database
+++ b/client/etc/xen/sipb-database
@@ -49,7 +49,7 @@ if machine_type.hvm:
 else:
     codepath = 'paravm'
 
-if 'mirror' in locals(): #Installer
+if 'installer_options' in locals(): #Installer
     disk.append('phy:/dev/xenvg/s_install_hda,hdb,r')
 
     kernel = '/boot/vmlinuz-2.6.24-19-xen' #From hardy
@@ -61,10 +61,7 @@ if 'mirror' in locals(): #Installer
     extra = 'ro noresume'
     extra += (' ip=%s::%s:%s:%s:eth0:off'
          % (n.ip, config.dhcp.gateway, config.dhcp.netmask, machine.name))
-    extra += ' mirror=%s dist=%s' % (mirror, dist)
-    extra += ' imagesize=%s' % imagesize
-    if 'noinstall' in locals():
-        extra += ' noinstall'
+    extra += ' %s' % installer_options[1:-1]
     root = '/dev/hdb1'
     codepath = None
 elif cdrom is not None:
diff --git a/debian/changelog b/debian/changelog
index 3c1b8ff..c44c207 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ sipb-xen-database (10.30) unstable; urgency=low
 
   * Look for CD images in /dev/xenvg/image_* and validate image name from
     the database
+  * Pass the installer arguments unaltered to the kernel, matching the
+    remctl interface
 
- -- Evan Broder <broder@mit.edu>  Thu, 09 Oct 2008 02:08:49 -0400
+ -- Evan Broder <broder@mit.edu>  Thu, 09 Oct 2008 02:09:42 -0400
 
 sipb-xen-database (10.29) unstable; urgency=low