* Use tar 1.15.1 for now (1.16 is buggy).
* Honour $TMPDIR (my /tmp is full). svn path=/nixu/trunk/; revision=6918
This commit is contained in:
parent
319489bf8b
commit
c55460a027
14
make-disk.sh
14
make-disk.sh
|
@ -1,12 +1,16 @@
|
|||
#! /bin/sh -e
|
||||
|
||||
set -x
|
||||
|
||||
if test -z "$TMPDIR"; then export TMPDIR=/tmp; fi
|
||||
|
||||
# deps is an array
|
||||
declare -a deps
|
||||
|
||||
NIXSTORE=`which nix-store`
|
||||
NIXINSTANTIATE=`which nix-instantiate`
|
||||
|
||||
coreutils=$($NIXSTORE -r $(echo '(import ./pkgs.nix).coreutils' | $NIXINSTANTIATE -))
|
||||
coreutils=$(nix-store -r $(nix-instantiate ./pkgs.nix -A coreutils))
|
||||
|
||||
# determine where we can find the Nix binaries
|
||||
NIX=$($coreutils/bin/dirname $(which nix-store))
|
||||
|
@ -15,7 +19,7 @@ NIX=$($coreutils/bin/dirname $(which nix-store))
|
|||
mktemp=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).mktemp' | $NIX/nix-instantiate -))
|
||||
|
||||
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 -))
|
||||
gnutar=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnutar151' | $NIX/nix-instantiate -))
|
||||
cdrtools=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).cdrtools' | $NIX/nix-instantiate -))
|
||||
gzip=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gzip' | $NIX/nix-instantiate -))
|
||||
cpio=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).cpio' | $NIX/nix-instantiate -))
|
||||
|
@ -23,15 +27,15 @@ cpio=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).cpio' | $NIX/nix-instantiat
|
|||
archivesDir=$($mktemp/bin/mktemp -d)
|
||||
archivesDir2=$($mktemp/bin/mktemp -d)
|
||||
manifest=${archivesDir}/MANIFEST
|
||||
nixpkgs=/nixpkgs/trunk/pkgs
|
||||
nixpkgs=./pkgs
|
||||
fill_disk=$archivesDir/scripts/fill-disk.sh
|
||||
ramdisk_login=$archivesDir/scripts/ramdisk-login.sh
|
||||
login_script=$archivesDir/scripts/login.sh
|
||||
storePaths=$archivesDir/mystorepaths
|
||||
narStorePaths=$archivesDir/narstorepaths
|
||||
validatePaths=$archivesDir/validatepaths
|
||||
bootiso=/tmp/nixos.iso
|
||||
initrd=/tmp/initram.img
|
||||
bootiso=$TMPDIR/nixos.iso
|
||||
initrd=$TMPDIR/initram.img
|
||||
initdir=${archivesDir}/initdir
|
||||
initscript=$archivesDir/scripts/init.sh
|
||||
|
||||
|
|
2
pkgs.nix
2
pkgs.nix
|
@ -4,7 +4,7 @@ rec {
|
|||
findutilsWrapper utillinux utillinuxStatic sysvinit e2fsprogsDiet
|
||||
e2fsprogs nettools nix subversion gcc wget which vim less screen
|
||||
openssh binutils nixStatic strace shadowutils iputils gnumake curl gnused
|
||||
gnutar gnugrep gzip mingettyWrapper grubWrapper syslinux parted
|
||||
gnutar gnutar151 gnugrep gzip mingettyWrapper grubWrapper syslinux parted
|
||||
module_init_tools module_init_toolsStatic dhcpWrapper man nano nanoDiet
|
||||
eject sysklogd mktemp cdrtools cpio busybox mkinitrd ncursesDiet;
|
||||
|
||||
|
|
Loading…
Reference in New Issue