* Remove some references to the services tree.
svn path=/nixos/branches/modular-nixos/; revision=16015
This commit is contained in:
parent
da77a6437f
commit
fc3eecad91
2 changed files with 1 additions and 15 deletions
|
@ -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 ]; };
|
||||
|
|
|
@ -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.
|
||||
|
|
Loading…
Reference in a new issue