Index: trunk/packages/invirt-xen-config/debian/changelog =================================================================== --- trunk/packages/invirt-xen-config/debian/changelog (revision 2038) +++ trunk/packages/invirt-xen-config/debian/changelog (revision 2039) @@ -1,2 +1,8 @@ +invirt-xen-config (0.0.21) unstable; urgency=low + + * Move sysvms/* into xvm-prodconfig from invirt-xen-config + + -- Greg Price Fri, 30 Jan 2009 21:15:25 -0500 + invirt-xen-config (0.0.20) unstable; urgency=low Index: trunk/packages/invirt-xen-config/debian/invirt-xen-config.install =================================================================== --- trunk/packages/invirt-xen-config/debian/invirt-xen-config.install (revision 2038) +++ trunk/packages/invirt-xen-config/debian/invirt-xen-config.install (revision 2039) @@ -3,5 +3,4 @@ invirt-database etc/xen vif-invirtroute etc/xen/scripts -sysvms etc/xen preferences.invirt etc/apt Index: trunk/packages/invirt-xen-config/sysvms/s_console.mako =================================================================== --- trunk/packages/invirt-xen-config/sysvms/s_console.mako (revision 2038) +++ (revision ) @@ -1,22 +1,0 @@ -<% -from invirt.config import structs as cfg -%> -import os - -release = os.uname()[2] -kernel = '/boot/vmlinuz-%s' % release -ramdisk = '/boot/initrd.img-%s' % release -memory = '256' - -disk = ['phy:xenvg/s_console_hda,hda,w'] - -name = 's_console' - -vif = [ 'ip=${cfg.console.ip},mac=00:16:3E:7E:E4:DE' ] - -on_poweroff = 'destroy' -on_reboot = 'restart' -on_crash = 'restart' - -root = '/dev/hda1 ro' -extra = '2 console=xvc0' Index: trunk/packages/invirt-xen-config/sysvms/s_master.mako =================================================================== --- trunk/packages/invirt-xen-config/sysvms/s_master.mako (revision 2038) +++ (revision ) @@ -1,23 +1,0 @@ -<% -from invirt.config import structs as cfg -%> -import os - -release = os.uname()[2] -kernel = '/boot/vmlinuz-%s' % release -ramdisk = '/boot/initrd.img-%s' % release -memory = '1024' - -disk = ['phy:xenvg/s_master_hda,hda,w', - 'phy:xenvg/s_master_hdb,hdb,w'] - -name = 's_master' - -vif = [ 'ip=${cfg.db.ip},mac=00:16:3E:5F:C1:D4' ] - -on_poweroff = 'destroy' -on_reboot = 'restart' -on_crash = 'restart' - -root = '/dev/hda1 ro' -extra = '2 console=xvc0' Index: trunk/packages/invirt-xen-config/sysvms/s_remote.mako =================================================================== --- trunk/packages/invirt-xen-config/sysvms/s_remote.mako (revision 2038) +++ (revision ) @@ -1,22 +1,0 @@ -<% -from invirt.config import structs as cfg -%> -import os - -release = os.uname()[2] -kernel = '/boot/vmlinuz-%s' % release -ramdisk = '/boot/initrd.img-%s' % release -memory = '512' - -disk = ['phy:xenvg/s_remote_hda,hda,w'] - -name = 's_remote' - -vif = [ 'ip=${cfg.remote.ip},mac=00:16:3E:7F:C2:55' ] - -on_poweroff = 'destroy' -on_reboot = 'restart' -on_crash = 'restart' - -root = "/dev/hda1 ro" -extra = '2 console=xvc0' Index: trunk/packages/xvm-prodconfig/debian/changelog =================================================================== --- trunk/packages/xvm-prodconfig/debian/changelog (revision 2038) +++ trunk/packages/xvm-prodconfig/debian/changelog (revision 2039) @@ -1,2 +1,8 @@ +xvm-prodconfig (1.1.8) unstable; urgency=low + + * Move sysvms/* into xvm-prodconfig from invirt-xen-config + + -- Greg Price Fri, 30 Jan 2009 21:14:43 -0500 + xvm-prodconfig (1.1.7) unstable; urgency=low Index: trunk/packages/xvm-prodconfig/debian/xvm-prodconfig.install =================================================================== --- trunk/packages/xvm-prodconfig/debian/xvm-prodconfig.install (revision 2038) +++ trunk/packages/xvm-prodconfig/debian/xvm-prodconfig.install (revision 2039) @@ -1,2 +1,3 @@ master.yaml etc/invirt zone etc/invirt +sysvms etc/xen Index: trunk/packages/xvm-prodconfig/sysvms/s_console.mako =================================================================== --- trunk/packages/xvm-prodconfig/sysvms/s_console.mako (revision 2039) +++ trunk/packages/xvm-prodconfig/sysvms/s_console.mako (revision 2039) @@ -0,0 +1,22 @@ +<% +from invirt.config import structs as cfg +%> +import os + +release = os.uname()[2] +kernel = '/boot/vmlinuz-%s' % release +ramdisk = '/boot/initrd.img-%s' % release +memory = '256' + +disk = ['phy:xenvg/s_console_hda,hda,w'] + +name = 's_console' + +vif = [ 'ip=${cfg.console.ip},mac=00:16:3E:7E:E4:DE' ] + +on_poweroff = 'destroy' +on_reboot = 'restart' +on_crash = 'restart' + +root = '/dev/hda1 ro' +extra = '2 console=xvc0' Index: trunk/packages/xvm-prodconfig/sysvms/s_master.mako =================================================================== --- trunk/packages/xvm-prodconfig/sysvms/s_master.mako (revision 2039) +++ trunk/packages/xvm-prodconfig/sysvms/s_master.mako (revision 2039) @@ -0,0 +1,23 @@ +<% +from invirt.config import structs as cfg +%> +import os + +release = os.uname()[2] +kernel = '/boot/vmlinuz-%s' % release +ramdisk = '/boot/initrd.img-%s' % release +memory = '1024' + +disk = ['phy:xenvg/s_master_hda,hda,w', + 'phy:xenvg/s_master_hdb,hdb,w'] + +name = 's_master' + +vif = [ 'ip=${cfg.db.ip},mac=00:16:3E:5F:C1:D4' ] + +on_poweroff = 'destroy' +on_reboot = 'restart' +on_crash = 'restart' + +root = '/dev/hda1 ro' +extra = '2 console=xvc0' Index: trunk/packages/xvm-prodconfig/sysvms/s_remote.mako =================================================================== --- trunk/packages/xvm-prodconfig/sysvms/s_remote.mako (revision 2039) +++ trunk/packages/xvm-prodconfig/sysvms/s_remote.mako (revision 2039) @@ -0,0 +1,22 @@ +<% +from invirt.config import structs as cfg +%> +import os + +release = os.uname()[2] +kernel = '/boot/vmlinuz-%s' % release +ramdisk = '/boot/initrd.img-%s' % release +memory = '512' + +disk = ['phy:xenvg/s_remote_hda,hda,w'] + +name = 's_remote' + +vif = [ 'ip=${cfg.remote.ip},mac=00:16:3E:7F:C2:55' ] + +on_poweroff = 'destroy' +on_reboot = 'restart' +on_crash = 'restart' + +root = "/dev/hda1 ro" +extra = '2 console=xvc0'