change to new packages, with new nix, new bash, new everything! It's shiny and new!

svn path=/nixu/trunk/; revision=1730
This commit is contained in:
Armijn Hemel 2004-11-09 10:28:21 +00:00
parent 511b3fd83f
commit f763a7c40a
4 changed files with 9 additions and 7 deletions

View File

@ -49,7 +49,9 @@ 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
NIX_CMD_PATH=/usr/home/nix/.nix-profile/bin #NIX_CMD_PATH=/usr/home/nix/.nix-profile/bin
#NIX_CMD_PATH=/home/armijn/.nix-profile/bin
NIX_CMD_PATH=/nix/bin
echo initialising Nix DB... echo initialising Nix DB...
#/nix/bin/nix-store --init #/nix/bin/nix-store --init
@ -65,13 +67,13 @@ echo registering valid paths...
(unset NIX_ROOT; $NIX_CMD_PATH/nix-store --dump $storepath) | $NIX_CMD_PATH/nix-store --restore $storepath (unset NIX_ROOT; $NIX_CMD_PATH/nix-store --dump $storepath) | $NIX_CMD_PATH/nix-store --restore $storepath
$NIX_CMD_PATH/nix-store --validpath $storepath $NIX_CMD_PATH/nix-store --validpath $storepath
fi fi
done) < /tmp/storepaths done) < /tmp/mystorepaths
echo registering successors... echo registering successors...
(while read line; do (while read line; do
echo SUCC $line echo SUCC $line
$NIX_CMD_PATH/nix-store --successor $line $NIX_CMD_PATH/nix-store --successor $line
done) < /tmp/successors done) < /tmp/mysuccessors
echo setting init symlink... echo setting init symlink...
rm -f $root/init rm -f $root/init

View File

@ -2,8 +2,8 @@
image=/tmp/disk.img image=/tmp/disk.img
size=$(expr 2048 \* 1024 \* 1024) size=$(expr 2048 \* 1024 \* 1024)
storePaths=/tmp/storepaths storePaths=/tmp/mystorepaths
successors=/tmp/successors successors=/tmp/mysuccessors
if ! test -f $image; then if ! test -f $image; then

View File

@ -1,5 +1,5 @@
rec { rec {
inherit (import /usr/home/nix/nixpkgs-0.6pre1121/pkgs/system/i686-linux.nix) inherit (import /home/armijn/pkgs/system/i686-linux.nix)
stdenv bash coreutils findutils utillinux sysvinit e2fsprogs stdenv bash coreutils findutils utillinux sysvinit e2fsprogs
nettools nix subversion gcc wget which vim less screen openssh binutils nettools nix subversion gcc wget which vim less screen openssh binutils
strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip; strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip;

2
run.sh
View File

@ -3,5 +3,5 @@
image=/tmp/disk.img image=/tmp/disk.img
linux ubd0="$image" mem=256M \ linux ubd0="$image" mem=256M \
eth0=tuntap,tap1,,192.168.150.3 \ eth0=tuntap,tap1 \
init="/init" init="/init"