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

also use sed and tar from Nixpkgs instead of the host system

Browse Source 
svn path=/nixu/trunk/; revision=5562
This commit is contained in:
Armijn Hemel 2006-07-03 08:39:52 +00:00
parent e76efef0d0
commit a60d5c3bdb
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
make-disk.sh
View File

@ -6,10 +6,13 @@ declare -a deps
# determine where we can find the Nix binaries # determine where we can find the Nix binaries
NIX=$(dirname $(which nix-store)) NIX=$(dirname $(which nix-store))
# make sure we use our own mktemp, because it is more pure # make sure we use many of our own tools, because it is more pure
mktemp=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).mktemp' | $NIX/nix-instantiate -)) mktemp=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).mktemp' | $NIX/nix-instantiate -))
archivesDir=$($mktemp/bin/mktemp -d)
gnused=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnused' | $NIX/nix-instantiate -))
gnutar=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnutar' | $NIX/nix-instantiate -))
archivesDir=$($mktemp/bin/mktemp -d)
manifest=${archivesDir}/MANIFEST manifest=${archivesDir}/MANIFEST
nixpkgs=/nixpkgs/trunk/pkgs nixpkgs=/nixpkgs/trunk/pkgs
fill_disk=$archivesDir/scripts/fill-disk.sh fill_disk=$archivesDir/scripts/fill-disk.sh
@ -55,7 +58,7 @@ do
echo $j >> $storePaths echo $j >> $storePaths
done done
echo copying from store: $i echo copying from store: $i
tar -cf - $i | tar --directory=$archivesDir -xf - $gnutar/bin/tar -cf - $i | $gnutar/bin/tar --directory=$archivesDir -xf -
done done
utilLinux=$(nix-store -r $(echo '(import ./pkgs.nix).utillinuxStatic' | $NIX/nix-instantiate -)) utilLinux=$(nix-store -r $(echo '(import ./pkgs.nix).utillinuxStatic' | $NIX/nix-instantiate -))
@ -88,7 +91,6 @@ dhcp=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).dhcpWrapper' | $NIX/nix-ins
nano=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).nano' | $NIX/nix-instantiate -)) nano=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).nano' | $NIX/nix-instantiate -))
gnugrep=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnugrep' | $NIX/nix-instantiate -)) gnugrep=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnugrep' | $NIX/nix-instantiate -))
which=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).which' | $NIX/nix-instantiate -)) which=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).which' | $NIX/nix-instantiate -))
gnutar=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnutar' | $NIX/nix-instantiate -))
eject=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).eject' | $NIX/nix-instantiate -)) eject=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).eject' | $NIX/nix-instantiate -))
sysklogd=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).sysklogd' | $NIX/nix-instantiate -)) sysklogd=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).sysklogd' | $NIX/nix-instantiate -))
#kudzu=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).kudzu' | $NIX/nix-instantiate -)) #kudzu=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).kudzu' | $NIX/nix-instantiate -))
@ -153,11 +155,11 @@ echo copying scripts
mkdir ${archivesDir}/scripts mkdir ${archivesDir}/scripts
cp -fa * ${archivesDir}/scripts cp -fa * ${archivesDir}/scripts
sed -e "s^@bash\@^$bash^g" \ $gnused/bin/sed -e "s^@bash\@^$bash^g" \
-e "s^@coreutils\@^$coreutilsdiet^g" \ -e "s^@coreutils\@^$coreutilsdiet^g" \
< $initscript > $initscript.tmp < $initscript > $initscript.tmp
mv $initscript.tmp $initscript mv $initscript.tmp $initscript
sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \ $gnused/bin/sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
-e "s^@bootPath\@^$bootPath^g" \ -e "s^@bootPath\@^$bootPath^g" \
-e "s^@nix\@^$nix^g" \ -e "s^@nix\@^$nix^g" \
-e "s^@bash\@^$bash^g" \ -e "s^@bash\@^$bash^g" \
@ -180,7 +182,7 @@ sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
< $fill_disk > $fill_disk.tmp < $fill_disk > $fill_disk.tmp
mv $fill_disk.tmp $fill_disk mv $fill_disk.tmp $fill_disk
sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \ $gnused/bin/sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
-e "s^@bootPath\@^$bootPath^g" \ -e "s^@bootPath\@^$bootPath^g" \
-e "s^@NIX\@^$nix^g" \ -e "s^@NIX\@^$nix^g" \
-e "s^@bash\@^$bash^g" \ -e "s^@bash\@^$bash^g" \