put tboot into grub configs

diff --git a/target/generic/target_xenclient_skeleton/etc/grub.cfg b/target/generic/target_xenclient_skeleton/etc/grub.cfg
index 7d8380b1fa25bab33eaab976470dc7f74c394db5..75944c6f6a277c20e5718d635e24843e68f47f21 100644 (file)
--- a/target/generic/target_xenclient_skeleton/etc/grub.cfg
+++ b/target/generic/target_xenclient_skeleton/etc/grub.cfg
@@ -11,33 +11,42 @@ menuentry "===========" {
 
 menuentry "XenClient - No autostart" {
        set root=(xenclient-root)
-       multiboot /boot/xen-debug.gz console=com1 dom0_mem=256M iommu=1 max_dom0_vcpus=1 ioapic_ack=old com1=115200/921600,8n1,magic
+       multiboot /boot/tboot.gz loglvl=none
+       module /boot/xen-debug.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
+       module /boot/lcp_data.bin
+       module /boot/sinit_acm.bin
 }
 
 menuentry "XenClient - Cancel last upgrade" {
        set root=(xenclient-root-old)
-       multiboot /boot/xen-debug.gz console=com1 dom0_mem=256M iommu=1 max_dom0_vcpus=1 ioapic_ack=old com1=115200/921600,8n1,magic
+       multiboot /boot/tboot.gz loglvl=none
+       module /boot/xen-debug.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
+       module /boot/lcp_data.bin
+       module /boot/sinit_acm.bin
 }
 
 menuentry "XenClient - Full console output" {
        set root=(xenclient-root)
-       multiboot /boot/xen-debug.gz console=vga dom0_mem=256M iommu=1 max_dom0_vcpus=1 ioapic_ack=old 
+       multiboot /boot/tboot.gz loglvl=none
+       module /boot/xen-debug.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
+       module /boot/lcp_data.bin
+       module /boot/sinit_acm.bin
 }
 
 menuentry "XenClient - AMT serial output" {
        set root=(xenclient-root)
-#      multiboot /boot/tboot.gz loglvl=none
-       multiboot /boot/xen-debug.gz console=com1 dom0_mem=256M iommu=1 max_dom0_vcpus=1 ioapic_ack=old com1=115200/921600,8n1,amt
+       multiboot /boot/tboot.gz loglvl=none
+       module /boot/xen-debug.gz console=com1 dom0_mem=256M iommu=1 max_dom0_vcpus=1 ioapic_ack=old com1=115200/921600,8n1,amt
        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
+       module /boot/lcp_data.bin
+       module /boot/sinit_acm.bin
 }
 
 

diff --git a/target/generic/target_xenclient_skeleton/root/grub/grub.cfg b/target/generic/target_xenclient_skeleton/root/grub/grub.cfg
index 241993228cc8ac5e16c4db709e14b3bf4d15073f..ad1f6fe2757310fa9df856e89eb2328caaf8ce0d 100644 (file)
--- a/target/generic/target_xenclient_skeleton/root/grub/grub.cfg
+++ b/target/generic/target_xenclient_skeleton/root/grub/grub.cfg
@@ -20,32 +20,32 @@ 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=256M iommu=1 max_dom0_vcpus=1 ioapic_ack=old com1=115200/921600,8n1,magic
+       multiboot /boot/tboot.gz loglvl=none
+       module /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
+       module /boot/lcp_data.bin
+       module /boot/sinit_acm.bin
 }
 
 menuentry "XenClient - debug" {
        set root=(xenclient-root)
-#      multiboot /boot/tboot.gz loglvl=none
-       multiboot /boot/xen-debug.gz console=com1 dom0_mem=256M iommu=1 max_dom0_vcpus=1 ioapic_ack=old com1=115200/921600,8n1,magic
+       multiboot /boot/tboot.gz loglvl=none
+       module /boot/xen-debug.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
+       module /boot/lcp_data.bin
+       module /boot/sinit_acm.bin
 }
 
 menuentry "XenClient - archived system" {
        set root=(xenclient-root.old)
-#      multiboot /boot/tboot.gz loglvl=none
+       multiboot /boot/tboot.gz loglvl=none
        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
+       module /boot/lcp_data.bin
+       module /boot/sinit_acm.bin
 }
 
 # TAG PVM