public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Some fixes. 

svn path=/nixu/trunk/; revision=6923
This commit is contained in:
Eelco Dolstra 2006-11-01 12:07:22 +00:00
parent 2b995a1150
commit f546cad4b7
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
fill-disk.sh
View File

@ -1,4 +1,6 @@
#! @bash@/bin/sh -e #! @bash@/bin/sh
set -e
export PATH=/bin:/sbin:@bash@/bin:@findutils@/bin:@e2fsprogs@/sbin:@grub@/sbin:@sysvinitPath@/sbin:@eject@/bin:@dhcp@/sbin:@modutils@/sbin:@busybox@/bin:@busybox@/sbin export PATH=/bin:/sbin:@bash@/bin:@findutils@/bin:@e2fsprogs@/sbin:@grub@/sbin:@sysvinitPath@/sbin:@eject@/bin:@dhcp@/sbin:@modutils@/sbin:@busybox@/bin:@busybox@/sbin
@ -12,7 +14,7 @@ bootPath=@bootPath@
modutils=@modutils@ modutils=@modutils@
mingetty=@mingetty@ mingetty=@mingetty@
nixpkgs=/nixpkgs/trunk nixpkgs=/nixpkgs
echo formatting target device echo formatting target device
@ -188,10 +190,10 @@ echo bringing up networking...
#labmachine has 3c59x #labmachine has 3c59x
#modprobe 3c59x #modprobe 3c59x
#vmware has pcnet32 #vmware has pcnet32
modprobe pcnet32 #modprobe pcnet32
dhclient eth0 #dhclient eth0
cp /etc/resolv.conf $root/etc/resolv.conf #cp /etc/resolv.conf $root/etc/resolv.conf
#nic=`kudzu -p | grep eth | sort | uniq | cut -d ' ' -f 2` #nic=`kudzu -p | grep eth | sort | uniq | cut -d ' ' -f 2`
@ -204,7 +206,8 @@ echo verifying Nix DB...
$NIX/nix-store --verify $NIX/nix-store --verify
echo copying nixpkgs... echo copying nixpkgs...
tar --directory=$root -zxf /cdrom/nixpkgs.tgz mkdir -p $root/nixpkgs/pkgs
tar --directory=$root/nixpkgs/pkgs -zxf /cdrom/nixpkgs.tgz
make_dir 0755 /tmp/scripts make_dir 0755 /tmp/scripts
cp -fa /cdrom/scripts $root/tmp cp -fa /cdrom/scripts $root/tmp
@ -344,13 +347,13 @@ echo clearing substitutes
$NIX/nix-store --clear-substitutes $NIX/nix-store --clear-substitutes
echo clearing network information #echo clearing network information
rm $root/etc/resolv.conf #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
# bizar. busybox umount doesn't like things with --bind it seems. # bizar. busybox umount doesn't like things with --bind it seems.
echo umounting filesystem echo umounting filesystem

2
make-disk.sh
View File

@ -156,7 +156,7 @@ $coreutils/bin/mkdir -p ${initdir}/var/state/dhcp
echo copying nixpkgs echo copying nixpkgs
#svn export ${nixpkgs} ${archivesDir}/pkgs #svn export ${nixpkgs} ${archivesDir}/pkgs
tar -zcf ${archivesDir}/nixpkgs.tgz ${nixpkgs} (cd $nixpkgs && tar -zcf ${archivesDir}/nixpkgs.tgz .)
#echo copying packages from store #echo copying packages from store