From fd7767152e91a987bf0ee75b3feec3a346fd849e Mon Sep 17 00:00:00 2001 From: Greg Price Date: Sun, 3 Aug 2008 00:26:32 -0400 Subject: [PATCH 1/1] check in uncommitted changes to /etc/xen/sipb-database on black-mesa svn path=/trunk/packages/sipb-xen-database/; revision=828 --- client/etc/xen/sipb-database | 5 +++-- debian/changelog | 6 ++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/client/etc/xen/sipb-database b/client/etc/xen/sipb-database index 6753254..4153fc0 100644 --- a/client/etc/xen/sipb-database +++ b/client/etc/xen/sipb-database @@ -46,7 +46,7 @@ else: codepath = 'paravm' if 'mirror' in locals(): #Installer - disk.append('phy:/dev/xenvg/d_foobar4_hda,hdb,r') + disk.append('phy:/dev/xenvg/d_foobar3_hda,hdb,r') kernel = '/boot/vmlinuz-2.6.24-19-xen' #From hardy ramdisk = '/boot/initrd.img-2.6.24-19-xen' @@ -58,7 +58,8 @@ if 'mirror' in locals(): #Installer extra += ' ip=%s::18.181.0.1:255.255.0.0:%s:eth0:off' % (n.ip, machine.name) extra += ' mirror=%s dist=%s' % (mirror, dist) extra += ' imagesize=%s' % imagesize - #extra += ' noinstall' + if 'noinstall' in locals(): + extra += ' noinstall' root = '/dev/hdb1' codepath = None elif 'cdrom_image' in locals(): diff --git a/debian/changelog b/debian/changelog index 8f56efb..2485a08 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +sipb-xen-database (10.15) unstable; urgency=low + + * uncommitted changes to /etc/xen/sipb-database on black-mesa + + -- Greg Price Sun, 3 Aug 2008 00:26:13 -0400 + sipb-xen-database (10.14) unstable; urgency=low * Rename sipb_xen_database -> invirt.database, -- 1.7.9.5