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

remove the root(hd0,0) line, because it wasn't needed. At least, not in our

Browse Source 
situation. I don't know how it will it work with something like dual booting
and chain loading, so that is unsupported right now :P

svn path=/nixu/trunk/; revision=6282
This commit is contained in:
Armijn Hemel 2006-08-27 22:18:39 +00:00
parent f7c69397b7
commit 1323e55ad3
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fill-disk.sh
View File

@ -332,7 +332,6 @@ cat > $root/boot/grub/menu.lst << GRUBEND
default=0 default=0
timeout=5 timeout=5
title NixOS title NixOS
root (hd0,0)
kernel @kernel@/vmlinuz root=$device kernel @kernel@/vmlinuz root=$device
GRUBEND GRUBEND
@ -348,6 +347,7 @@ 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.
echo umounting filesystem echo umounting filesystem
umount $root/cdrom umount $root/cdrom

6
make-disk.sh
View File

@ -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 -)) 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 ### 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 ### 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 #$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? # 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 $utillinux $gnugrep $grub $gzip $findutils)
combideps=$($NIX/nix-store -qR $nix $busybox $grub $findutils $modutils $dhcp) combideps=$($NIX/nix-store -qR $nix $busybox $grub $findutils $modutils $dhcp)
for i in $storeExpr for i in $storeExpr $mkinitrd
do do
echo $i >> $narStorePaths echo $i >> $narStorePaths
done done

4
pkgs.nix
View File

@ -6,7 +6,7 @@ rec {
openssh binutils nixStatic strace shadowutils iputils gnumake curl gnused openssh binutils nixStatic strace shadowutils iputils gnumake curl gnused
gnutar gnugrep gzip mingettyWrapper grubWrapper syslinux parted gnutar gnugrep gzip mingettyWrapper grubWrapper syslinux parted
module_init_tools module_init_toolsStatic dhcpWrapper man nano eject module_init_tools module_init_toolsStatic dhcpWrapper man nano eject
sysklogd mktemp cdrtools cpio busybox; sysklogd mktemp cdrtools cpio busybox mkinitrd;
boot = (import ./boot) { boot = (import ./boot) {
inherit stdenv bash coreutils findutilsWrapper utillinux sysvinit inherit stdenv bash coreutils findutilsWrapper utillinux sysvinit
@ -23,5 +23,5 @@ rec {
# nix = nixUnstable; # nix = nixUnstable;
#}; #};
everything = [boot sysvinit sysklogd kernelscripts kernel]; everything = [boot sysvinit sysklogd kernelscripts kernel mkinitrd];
} }