256Mb for dom0, removed rendundant serial boot options, and C3 boot option

diff --git a/target/generic/target_xenclient_skeleton/etc/grub.cfg b/target/generic/target_xenclient_skeleton/etc/grub.cfg
index 7c104404817079893ee4b50f92a22fa14abf5b14..8275bb52ad68b343038aabf8a49d387e30066d91 100644 (file)
--- a/target/generic/target_xenclient_skeleton/etc/grub.cfg
+++ b/target/generic/target_xenclient_skeleton/etc/grub.cfg
@@ -11,49 +11,21 @@ menuentry "===========" {
 
 menuentry "XenClient - No autostart" {
        set root=(xenclient-root)
-       multiboot /boot/xen.gz console=/dev/null dom0_mem=128M iommu=1 max_dom0_vcpus=1 ioapic_ack=old
-       module /boot/vmlinuz console=/dev/null root=/dev/mapper/xenclient-root
+       multiboot /boot/xen.gz console=com1 dom0_mem=256M iommu=1 max_dom0_vcpus=1 ioapic_ack=old com1=115200/921600,8n1,magic
+       module /boot/vmlinuz console=xencons root=/dev/mapper/xenclient-root
        module /boot/initramfs.gz
 }
 
 menuentry "XenClient - Cancel last upgrade" {
        set root=(xenclient-root-old)
-       multiboot /boot/xen.gz console=vga dom0_mem=128M iommu=1 max_dom0_vcpus=1 ioapic_ack=old
-       module /boot/vmlinuz console=tty root=/dev/mapper/xenclient-root cancel_upgrade=1
+       multiboot /boot/xen.gz console=com1 dom0_mem=256M iommu=1 max_dom0_vcpus=1 ioapic_ack=old com1=115200/921600,8n1,magic
+       module /boot/vmlinuz console=xencons root=/dev/mapper/xenclient-root cancel_upgrade=1
        module /boot/initramfs.gz
 }
 
 menuentry "XenClient - Full console output" {
        set root=(xenclient-root)
-       multiboot /boot/xen.gz console=vga dom0_mem=128M iommu=1 max_dom0_vcpus=1 ioapic_ack=old
+       multiboot /boot/xen.gz console=vga dom0_mem=256M iommu=1 max_dom0_vcpus=1 ioapic_ack=old 
        module /boot/vmlinuz console=tty root=/dev/mapper/xenclient-root nopcihide
        module /boot/initramfs.gz
 }
-
-menuentry "XenClient - Default serial output" {
-       set root=(xenclient-root)
-       multiboot /boot/xen.gz console=com1 com1=115200 dom0_mem=128M iommu=1 max_dom0_vcpus=1 ioapic_ack=old
-       module /boot/vmlinuz console=xencons root=/dev/mapper/xenclient-root
-       module /boot/initramfs.gz
-}
-
-menuentry "XenClient - Dell E4300 serial output" {
-       set root=(xenclient-root)
-       multiboot /boot/xen.gz console=com1 com1=115200/921600,8n1,0xdfe8,0 dom0_mem=128M iommu=1 max_dom0_vcpus=1 ioapic_ack=old
-       module /boot/vmlinuz console=xencons root=/dev/mapper/xenclient-root
-       module /boot/initramfs.gz
-}
-
-menuentry "XenClient - Lenovo T400 serial output" {
-       set root=(xenclient-root)
-       multiboot /boot/xen.gz console=com1 com1=115200/921600,8n1,0x3010,0 dom0_mem=128M iommu=1 iommu_inclusive_mapping=1 max_cstate=0 max_dom0_vcpus=1
-       module /boot/vmlinuz console=xencons root=/dev/mapper/xenclient-root
-       module /boot/initramfs.gz
-}
-
-menuentry "XenClient - HP 6930p serial output" {
-       set root=(xenclient-root)
-       multiboot /boot/xen.gz console=com1 com1=115200/921600,8n1,0x5010,0 dom0_mem=128M iommu=1 max_dom0_vcpus=1 ioapic_ack=old
-       module /boot/vmlinuz console=xencons root=/dev/mapper/xenclient-root
-       module /boot/initramfs.gz
-}

diff --git a/target/generic/target_xenclient_skeleton/root/grub/grub.cfg b/target/generic/target_xenclient_skeleton/root/grub/grub.cfg
index a9ecd3f4fde87ea8621de87d9cf0aa846a34f28f..0417622faf89db9897879cc9e012aaf3d8275eda 100644 (file)
--- a/target/generic/target_xenclient_skeleton/root/grub/grub.cfg
+++ b/target/generic/target_xenclient_skeleton/root/grub/grub.cfg
@@ -21,25 +21,18 @@ background_image /boot/grub/background.png
 menuentry "XenClient" {
        set root=(xenclient-root)
 #      multiboot /boot/tboot.gz loglvl=none
-       multiboot /boot/xen.gz console=com1 dom0_mem=128M iommu=1 max_dom0_vcpus=1 ioapic_ack=old com1=115200/921600,8n1,magic
+       multiboot /boot/xen.gz console=com1 dom0_mem=256M iommu=1 max_dom0_vcpus=1 ioapic_ack=old com1=115200/921600,8n1,magic
        module /boot/vmlinuz console=xencons root=/dev/mapper/xenclient-root autostart
        module /boot/initramfs.gz
 #      module /boot/lcp_data.bin
 #      module /boot/sinit_acm.bin
 }
 
-menuentry "XenClient - No C3" {
-        set root=(xenclient-root)
-        multiboot /boot/xen.gz console=com1 dom0_mem=128M iommu=1 iommu_inclusive_mapping=1 max_cstate=0 max_dom0_vcpus=1 ioapic_ack=old  com1=115200/921600,8n1,magic
-        module /boot/vmlinuz console=xencons root=/dev/mapper/xenclient-root autostart
-        module /boot/initramfs.gz
-}
-
 menuentry "XenClient - archived system" {
        set root=(xenclient-root.old)
 #      multiboot /boot/tboot.gz loglvl=none
-       multiboot /boot/xen.gz console=/dev/null dom0_mem=128M iommu=1 max_dom0_vcpus=1 ioapic_ack=old
-       module /boot/vmlinuz console=/dev/null root=/dev/mapper/xenclient-root.old autostart
+       multiboot /boot/xen.gz console=com1 dom0_mem=256M iommu=1 max_dom0_vcpus=1 ioapic_ack=old com1=115200/921600,8n1,magic
+       module /boot/vmlinuz console=xencons root=/dev/mapper/xenclient-root.old autostart
        module /boot/initramfs.gz
 #      module /boot/lcp_data.bin
 #      module /boot/sinit_acm.bin