make sure /etc/resolv.conf is available in our chroot

svn path=/nixu/trunk/; revision=6077
This commit is contained in:
Armijn Hemel 2006-08-08 21:31:34 +00:00
parent 9626049ec5
commit 297d159c8d
2 changed files with 10 additions and 5 deletions

View File

@ -248,12 +248,13 @@ NIX=@nix@/bin
echo bringing up networking... echo bringing up networking...
modprobe 3c59x #labmachine has 3c59x
#modprobe 3c59x
#vmware has pcnet32
modprobe pcnet32
dhclient eth0 dhclient eth0
while true; do cp /etc/resolv.conf $root/etc/resolv.conf
sleep 60;
done
#nic=`kudzu -p | grep eth | sort | uniq | cut -d ' ' -f 2` #nic=`kudzu -p | grep eth | sort | uniq | cut -d ' ' -f 2`
@ -407,6 +408,10 @@ echo clearing substitutes
$NIX/nix-store --clear-substitutes $NIX/nix-store --clear-substitutes
echo clearing network information
rm $root/etc/resolv.conf
echo copying install log echo copying install log
cp /tmp/install-log $root/root cp /tmp/install-log $root/root

View File

@ -49,7 +49,7 @@ kernelscripts=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernelscripts' | $
### make NAR files for everything we want to install and some more. Make sure ### make NAR files for everything we want to install and some more. Make sure
### the right URL is in there, so specify /cdrom and not cdrom ### the right URL is in there, so specify /cdrom and not cdrom
#$NIX/nix-push --copy $archivesDir $manifest --target file:///cdrom $storeExpr $($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX/nix-instantiate -)) $kernelscripts #$NIX/nix-push --copy $archivesDir $manifest --target file:///cdrom $storeExpr $($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX/nix-instantiate -)) $kernelscripts
$NIX/nix-push --copy $archivesDir2 $manifest --target http://losser.labs.cs.uu.nl/~armijn/.nix/ $storeExpr $($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX/nix-instantiate -)) $kernelscripts $NIX/nix-push --copy $archivesDir2 $manifest --target http://losser.labs.cs.uu.nl/~armijn/.nix $storeExpr $($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX/nix-instantiate -)) $kernelscripts
# Location of sysvinit? # Location of sysvinit?
sysvinitPath=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).sysvinit' | $NIX/nix-instantiate -)) sysvinitPath=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).sysvinit' | $NIX/nix-instantiate -))