From: Martyn Smith <martyn@catalyst.net.nz>
Date: Tue, 3 Apr 2007 10:53:47 +0000 (+1200)
Subject: Merge commit 'nigel'
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=49dcc7c1c1b8100c8343f43192bfc99f5a8578a2;p=vserverctl.git

Merge commit 'nigel'

Conflicts:

	vserverctl
---

49dcc7c1c1b8100c8343f43192bfc99f5a8578a2
diff --cc vserverctl
index 7386c12,8c5ddb4..2cab228
--- a/vserverctl
+++ b/vserverctl
@@@ -127,12 -111,9 +130,13 @@@ if ( $action eq 'add' ) 
          my $data = slurp($key);
          $data =~ s/__VSNAME__/$vsname/g;
          $data =~ s/__VSIPADDR__/$ipaddr/g;
+         $data =~ s/__HOST__/$hostname/g;
 +        foreach my $key ( keys %{$profileOptions} ) {
 +            my $value = $profileOptions->{$key};
 +            $data =~ s/__PROFILEOPTION_${key}__/$value/g;
 +        }
          write_file($vsroot . '.template', $data);
 -        system('mv', $vsroot . '.template', $vsroot . $templates{$key} . $file);
 +        system('mv', $vsroot . '.template', $vsroot . $templates{$key});
      }
  
      open $scriptFH, '|-', 'vserver', $vsname, 'exec', '/bin/bash';