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

use "kernelscripts" package to install the kernel and extra modules. This is 

actually bad, because in theory a different kernel could be chosen to be
installed and then we could not load any modules...but even communism
works...in theory!

svn path=/nixu/trunk/; revision=6068
This commit is contained in:
Armijn Hemel 2006-08-07 19:48:18 +00:00
parent 7e6a7d6418
commit ddc27b2313
3 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fill-disk.sh
View File

@ -304,11 +304,12 @@ unset NIX_CONF_DIR
## Fix this. Probably nix-instantiate, then nix-store -r.
## Also make sure everything gets installed into an actual profile!
$NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix nix
$NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix coreutils
$NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix gnugrep
$NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix linux
$NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix grub
$NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix -A nixUnstable
$NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix -A coreutils
$NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix -A gnugrep
#$NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix -A kernel
$NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix -A kernelscripts
$NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix -A grub
cat $narStorePaths | xargs -n 1 -i% $NIX/nix-env -i %
@ -370,12 +371,7 @@ fi
version=$strippedName-$kernelhash
make_dir 0755 /lib/modules/$version
ln -s @kernel@/lib/modules/$version/build $root/lib/modules/$version/build
ln -s @kernel@/lib/modules/$version/kernel $root/lib/modules/$version/kernel
cp $root/@kernel@/lib/modules/$version/modules.* $root/lib/modules/$version
chmod 644 $root/lib/modules/$version/modules.*
ln -s @kernelscripts@/lib/modules/$version $root/lib/modules/$version
##
## init

7
make-disk.sh
View File

@ -43,9 +43,11 @@ nixDeps=$($NIX/nix-store -qR $nix)
storeExpr=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).boot' | $NIX/nix-instantiate -))
#storeExpr=$($NIX/nix-store -r $($NIX/nix-store -qR $(echo '(import ./pkgs.nix).everything' | $NIX/nix-instantiate -)))
kernelscripts=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernelscripts' | $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 /cdrom $storeExpr $($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX/nix-instantiate -))
$NIX/nix-push --copy $archivesDir $manifest --target /cdrom $storeExpr $($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX/nix-instantiate -)) $kernelscripts
# Location of sysvinit?
sysvinitPath=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).sysvinit' | $NIX/nix-instantiate -))
@ -56,6 +58,7 @@ bootPath=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).boot' | $NIX/nix-instan
syslinux=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).syslinux' | $NIX/nix-instantiate -))
kernel=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX/nix-instantiate -))
kernelscripts=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernelscripts' | $NIX/nix-instantiate -))
#nixDeps=$($NIX/nix-store -qR $(echo '(import ./pkgs.nix).nix' | $NIX/nix-instantiate -))
@ -173,6 +176,7 @@ $gnused/bin/sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
-e "s^@modutils\@^$modutils^g" \
-e "s^@grub\@^$grub^g" \
-e "s^@kernel\@^$kernel^g" \
-e "s^@kernelscripts\@^$kernelscripts^g" \
-e "s^@gnugrep\@^$gnugrep^g" \
-e "s^@which\@^$which^g" \
-e "s^@kudzu\@^$kudzu^g" \
@ -195,6 +199,7 @@ $gnused/bin/sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
-e "s^@modutils\@^$modutils^g" \
-e "s^@grub\@^$grub^g" \
-e "s^@kernel\@^$kernel^g" \
-e "s^@kernelscripts\@^$kernelscripts^g" \
-e "s^@gnugrep\@^$gnugrep^g" \
-e "s^@which\@^$which^g" \
-e "s^@gnutar\@^$gnutar^g" \

16
pkgs.nix
View File

@ -1,12 +1,12 @@
rec {
inherit (import /nixpkgs/trunk/pkgs/top-level/all-packages.nix {})
stdenv kernel bash bashStatic coreutils coreutilsDiet findutilsWrapper
utillinux utillinuxStatic sysvinit e2fsprogsDiet e2fsprogs nettools
nixUnstable subversion gcc wget which vim less screen 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;
stdenv kernelscripts kernel bash bashStatic coreutils coreutilsDiet
findutilsWrapper utillinux utillinuxStatic sysvinit e2fsprogsDiet
e2fsprogs nettools nixUnstable subversion gcc wget which vim less screen
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;
boot = (import ./boot) {
inherit stdenv bash coreutils findutilsWrapper utillinux sysvinit
@ -23,5 +23,5 @@ rec {
# nix = nixUnstable;
#};
everything = [boot sysvinit sysklogd kernel];
everything = [boot sysvinit sysklogd kernelscripts kernel];
}