mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-30 09:31:01 +00:00
disable NIX_ROOT, use things like NIX_STATE_DIR instead
svn path=/nixu/trunk/; revision=3338
This commit is contained in:
parent
5432cd148b
commit
c05605e316
16
fill-disk.sh
16
fill-disk.sh
|
@ -3,6 +3,14 @@
|
|||
sysvinitPath=@sysvinitPath@
|
||||
bootPath=@bootPath@
|
||||
|
||||
if ! test -n "$1"
|
||||
then
|
||||
echo "need URL for manifest!"
|
||||
exit
|
||||
else
|
||||
manifest=$1
|
||||
fi
|
||||
|
||||
make_dir() {
|
||||
mode=$1
|
||||
name=$2
|
||||
|
@ -31,6 +39,7 @@ make_dir 00755 /nix/store
|
|||
make_dir 00755 /nix/var
|
||||
make_dir 00755 /nix/var/nix
|
||||
make_dir 00755 /nix/var/nix/db
|
||||
make_dir 00755 /nix/var/nix/manifests
|
||||
make_dir 00755 /nix/var/log
|
||||
make_dir 00755 /nix/var/log/nix
|
||||
make_dir 00755 /nixpkgs
|
||||
|
@ -44,9 +53,10 @@ touch_file /etc/shadow
|
|||
touch_file /etc/group
|
||||
|
||||
rm -f $root/etc/mtab
|
||||
ln -s /proc/mounts $root/etc/mtab
|
||||
#ln -s /proc/mounts $root/etc/mtab
|
||||
|
||||
export NIX_ROOT=$root
|
||||
#export NIX_ROOT=$root
|
||||
export NIX_STATE_DIR=$root/nix/var/nix
|
||||
NIX_CMD_PATH=@NIX_CMD_PATH@/bin
|
||||
|
||||
echo initialising Nix DB...
|
||||
|
@ -60,7 +70,7 @@ echo copying nixpkgs...
|
|||
cp -fa ../pkgs $root/nixpkgs
|
||||
|
||||
echo adding packages...
|
||||
$NIX_CMD_PATH/nix-pull file:///$(manifest)
|
||||
$NIX_CMD_PATH/nix-pull $manifest
|
||||
|
||||
#echo registering valid paths...
|
||||
#(while read storepath; do
|
||||
|
|
Loading…
Reference in a new issue