Fixed conflicts

diff --cc vserverctl
index 28ad89dc4650f7d3ad6ff53fcfbc662b1d2b2910,e7371b333647cbfb9eafdfc449de13ebf9e40e47..60fd563c2307ae486b337b80223e8bdaea7c6f33
--- 1/vserverctl
--- 2/vserverctl
+++ b/vserverctl
@@@ -88,9 -101,10 +104,11 @@@ 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");
+ 
      system('vserver', $vsname, 'start');
-     write_file('/etc/vservers/' . $vsname . '/profile', $profile . "\n");
+ 
      write_file($vsroot . 'etc/apt/sources.list', $config->{files}{aptsources});
      # TODO: get the apt-key stuff working
      system('vserver', $vsname, 'apt-get', 'update');
@@@ -113,9 -126,12 +130,13 @@@
          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';