From 297d159c8d00eb266d9c8ba5fec7dcaac391e2a3 Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Tue, 8 Aug 2006 21:31:34 +0000 Subject: [PATCH] make sure /etc/resolv.conf is available in our chroot svn path=/nixu/trunk/; revision=6077 --- fill-disk.sh | 13 +++++++++---- make-disk.sh | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/fill-disk.sh b/fill-disk.sh index 7c077b85d805..4a8088341a2c 100755 --- a/fill-disk.sh +++ b/fill-disk.sh @@ -248,12 +248,13 @@ NIX=@nix@/bin echo bringing up networking... -modprobe 3c59x +#labmachine has 3c59x +#modprobe 3c59x +#vmware has pcnet32 +modprobe pcnet32 dhclient eth0 -while true; do - sleep 60; -done +cp /etc/resolv.conf $root/etc/resolv.conf #nic=`kudzu -p | grep eth | sort | uniq | cut -d ' ' -f 2` @@ -407,6 +408,10 @@ echo clearing substitutes $NIX/nix-store --clear-substitutes +echo clearing network information + +rm $root/etc/resolv.conf + echo copying install log cp /tmp/install-log $root/root diff --git a/make-disk.sh b/make-disk.sh index 87aad70a9689..f10ac09c00db 100755 --- a/make-disk.sh +++ b/make-disk.sh @@ -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 ### 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 $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? sysvinitPath=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).sysvinit' | $NIX/nix-instantiate -))