]> xenbits.xensource.com Git - people/iwj/osstest.git/commitdiff
TestSupport: Do not clobber existing symlinks when unttarring
authorIan Campbell <ian.campbell@citrix.com>
Fri, 6 Sep 2013 13:51:08 +0000 (14:51 +0100)
committerIan Campbell <ian.campbell@citrix.com>
Fri, 6 Sep 2013 13:51:08 +0000 (14:51 +0100)
Otherwise Wheezy's /var/run -> /run symlink gets nuked, breaking sshd:
fatal: Missing privilege separation directory: /var/run/sshd
because the directory is actually in /run/sshd

Osstest/TestSupport.pm

index 6ad703a057b04dbcb0b5f0f17cac37c989377f9b..6a491e1f9e076e169a745f4cf4965c6eb80df6db 100644 (file)
@@ -1543,7 +1543,7 @@ sub target_extract_jobdistpath ($$$$$) {
     my $local= $path;  $local =~ s/path_//;
     my $distcopy= "/root/extract_$local.tar.gz";
     target_putfile_root($ho, 300, $distpath->{$part}, $distcopy);
-    target_cmd_root($ho, "cd / && tar zxf $distcopy", 300);
+    target_cmd_root($ho, "cd / && tar -hzxf $distcopy", 300);
 }
 
 sub guest_find_domid ($$) {