From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [OSSTEST PATCH v2 12/12] ts-debian-hvm-install: add in seclabel if XSM is enabled Date: Wed, 24 Sep 2014 22:04:37 +0100 Message-ID: <1411592677-2632-13-git-send-email-wei.liu2@citrix.com> References: <1411592677-2632-1-git-send-email-wei.liu2@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1411592677-2632-1-git-send-email-wei.liu2@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: Wei Liu , dgdegra@tycho.nsa.gov, ian.jackson@eu.citrix.com, ian.campbell@citrix.com List-Id: xen-devel@lists.xenproject.org Signed-off-by: Wei Liu --- ts-debian-hvm-install | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/ts-debian-hvm-install b/ts-debian-hvm-install index 37eade2..3c557ef 100755 --- a/ts-debian-hvm-install +++ b/ts-debian-hvm-install @@ -152,10 +152,10 @@ sub prep () { target_putfilecontents_root_stash($ho, 10, preseed(), $preseed_file_path); - more_prepareguest_hvm($ho,$gho, $ram_mb, $disk_mb, - OnReboot => 'preserve', - Bios => $r{bios}, - PostImageHook => sub { + my $cfg = more_prepareguest_hvm($ho,$gho, $ram_mb, $disk_mb, + OnReboot => 'preserve', + Bios => $r{bios}, + PostImageHook => sub { my $cmds = iso_copy_content_from_image($gho, $newiso); $cmds .= prepare_initrd($initrddir,$newiso,$preseed_file_path); target_cmd_root($ho, $cmds, $isotimeout); @@ -167,6 +167,12 @@ sub prep () { iso_create_genisoimage($ho, $gho->{Rimage}, $newiso, $isotimeout, @isogen_opts); }); + + if ($r{enable_xsm} =~ m/y/) { + target_cmd_root($ho, <<"END"); +echo "seclabel='system_u:system_r:domU_t'" >> $cfg +END + } } # If host has >8G free memory, create a guest with 4G memory to catch -- 1.7.10.4