From fc3eecad91b7fd0c92bb9055830cbf0f390d0da9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 22 Jun 2009 10:01:14 +0000
Subject: [PATCH] * Remove some references to the services tree.

svn path=/nixos/branches/modular-nixos/; revision=16015
---
 modules/installer/tools/nixos-checkout.nix | 8 +-------
 modules/installer/tools/nixos-install.sh   | 8 --------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/modules/installer/tools/nixos-checkout.nix b/modules/installer/tools/nixos-checkout.nix
index 290a4d6b2eb8..2d59f6718844 100644
--- a/modules/installer/tools/nixos-checkout.nix
+++ b/modules/installer/tools/nixos-checkout.nix
@@ -41,8 +41,7 @@ let
         from working directory dirname
         <replaceable>target</replaceable> and should create the
         directory
-        <filename><replaceable>dir</replaceable></filename>. (<command>git
-        clone url nixos/nixpkgs/services</command> should do) For
+        <filename><replaceable>dir</replaceable></filename>.  For
         the executables used see <option>repoTypes</option>.
       '';
     };
@@ -52,11 +51,6 @@ let
       description = "same as <option>repos.nixos</option>";
     };
 
-    installer.repos.services = mkOption {
-      default = [ { type  = "svn"; } ];
-      description = "same as <option>repos.nixos</option>";
-    };
-
     installer.repoTypes = mkOption {
       default = {
         svn = { valid = "[ -d .svn ]"; env = [ pkgs.coreutils pkgs.subversion ]; };
diff --git a/modules/installer/tools/nixos-install.sh b/modules/installer/tools/nixos-install.sh
index f9baa0e891a0..bc935f7c8e3b 100644
--- a/modules/installer/tools/nixos-install.sh
+++ b/modules/installer/tools/nixos-install.sh
@@ -169,20 +169,12 @@ if test -e $targetNixpkgs; then
     mv $targetNixpkgs $targetNixpkgs.backup-$backupTimestamp
 fi
 
-targetServices=$mountPoint/etc/nixos/services
-if test -e $targetServices; then
-    mv $targetServices $targetServices.backup-$backupTimestamp
-fi
-
 
 # Copy the NixOS/Nixpkgs sources to the target.
 cp -prd $NIXOS $targetNixos
 if test -e /etc/nixos/nixpkgs; then
     cp -prd /etc/nixos/nixpkgs $targetNixpkgs
 fi
-if test -e /etc/nixos/services; then
-    cp -prd /etc/nixos/services $targetServices
-fi
 
 
 # Grub needs an mtab.