diff --git a/fill-disk.sh b/fill-disk.sh index 6d66b7fb638..7e86434a78e 100755 --- a/fill-disk.sh +++ b/fill-disk.sh @@ -1,6 +1,6 @@ #! @bash@/bin/sh -e -export PATH=@bash@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@e2fsprogs@/sbin +export PATH=@bash@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@e2fsprogs@/sbin:@grub@/sbin sysvinitPath=@sysvinitPath@ bootPath=@bootPath@ @@ -252,8 +252,6 @@ done) < /cdrom/mystorepaths # $NIX_CMD_PATH/nix-store --successor $line #done) < /tmp/mysuccessors -exit - echo setting init symlink... rm -f $root/init ln -s $sysvinitPath/sbin/init $root/init @@ -270,7 +268,7 @@ echo setting up networking information... make_dir 00755 /etc/networking echo 192.168.150.1 > $root/etc/networking/local-ip echo 192.168.150.3 > $root/etc/networking/gateway-ip -cp /etc/resolv.conf $root/etc +#cp /etc/resolv.conf $root/etc rm -f $root/etc/hosts echo "127.0.0.1 localhost" >> $root/etc/hosts echo "192.168.150.1 uml" >> $root/etc/hosts diff --git a/make-disk.sh b/make-disk.sh index c02fb7778d3..0b7e31ab89d 100755 --- a/make-disk.sh +++ b/make-disk.sh @@ -54,6 +54,7 @@ findutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).findutils' | utillinux=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).utillinux' | $NIX_CMD_PATH/nix-instantiate -)) e2fsprogs=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).e2fsprogs' | $NIX_CMD_PATH/nix-instantiate -)) modutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).modutils' | $NIX_CMD_PATH/nix-instantiate -)) +grub=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).grub' | $NIX_CMD_PATH/nix-instantiate -)) (while read storepath; do cp -fa --parents ${storepath} ${archivesDir} @@ -113,6 +114,7 @@ sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \ -e "s^@utillinux\@^$utillinux^g" \ -e "s^@e2fsprogs\@^$e2fsprogs^g" \ -e "s^@modutils\@^$modutils^g" \ + -e "s^@grub\@^$grub^g" \ < $fill_disk > $fill_disk.tmp mv $fill_disk.tmp $fill_disk