From: Martyn Smith <martyn@catalyst.net.nz>
Date: Tue, 3 Apr 2007 10:54:25 +0000 (+1200)
Subject: Merge branch 'master' of http://scorch.dollyfish.net.nz/~nigel/git/vserverctl
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=a2e98c968e035934d195c8be0dabb1421fcfb2a1;p=vserverctl.git

Merge branch 'master' of http://scorch.dollyfish.net.nz/~nigel/git/vserverctl
---

a2e98c968e035934d195c8be0dabb1421fcfb2a1
diff --cc vserverctl
index 2cab228,60fd563..b9b4133
--- a/vserverctl
+++ b/vserverctl
@@@ -104,8 -104,8 +104,9 @@@ if ( $action eq 'add' ) 
      print {$scriptFH} $config->{files}{'pre-host'};
      close $scriptFH;
  
+     write_file('/etc/vservers/' . $vsname . '/context', getFreeContext() . "\n");
      write_file('/etc/vservers/' . $vsname . "/profile", $profile . "\n");
 +    write_file('/etc/vservers/' . $vsname . '/context', getFreeContext() . "\n");
  
      system('vserver', $vsname, 'start');