diff --git a/fill-disk.sh b/fill-disk.sh index 2895f957e8b..a09b3bc5444 100755 --- a/fill-disk.sh +++ b/fill-disk.sh @@ -332,7 +332,6 @@ cat > $root/boot/grub/menu.lst << GRUBEND default=0 timeout=5 title NixOS - root (hd0,0) kernel @kernel@/vmlinuz root=$device GRUBEND @@ -348,6 +347,7 @@ echo copying install log cp /tmp/install-log $root/root +# bizar. busybox umount doesn't like things with --bind it seems. echo umounting filesystem umount $root/cdrom diff --git a/make-disk.sh b/make-disk.sh index 0710bf4aee2..3b392115c6a 100755 --- a/make-disk.sh +++ b/make-disk.sh @@ -47,9 +47,11 @@ storeExpr=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).boot' | $NIX/nix-insta kernelscripts=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernelscripts' | $NIX/nix-instantiate -)) +mkinitrd=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).mkinitrd' | $NIX/nix-instantiate -)) + ### 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 $archivesDir $manifest --target file:///cdrom $storeExpr $($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX/nix-instantiate -)) $kernelscripts $mkinitrd #$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? @@ -80,7 +82,7 @@ dhcp=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).dhcpWrapper' | $NIX/nix-ins #combideps=$($NIX/nix-store -qR $nix $utillinux $gnugrep $grub $gzip $findutils) combideps=$($NIX/nix-store -qR $nix $busybox $grub $findutils $modutils $dhcp) -for i in $storeExpr +for i in $storeExpr $mkinitrd do echo $i >> $narStorePaths done diff --git a/pkgs.nix b/pkgs.nix index 5f70904f92b..41efb92c99e 100644 --- a/pkgs.nix +++ b/pkgs.nix @@ -6,7 +6,7 @@ rec { openssh binutils nixStatic strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip mingettyWrapper grubWrapper syslinux parted module_init_tools module_init_toolsStatic dhcpWrapper man nano eject - sysklogd mktemp cdrtools cpio busybox; + sysklogd mktemp cdrtools cpio busybox mkinitrd; boot = (import ./boot) { inherit stdenv bash coreutils findutilsWrapper utillinux sysvinit @@ -23,5 +23,5 @@ rec { # nix = nixUnstable; #}; - everything = [boot sysvinit sysklogd kernelscripts kernel]; + everything = [boot sysvinit sysklogd kernelscripts kernel mkinitrd]; }