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

add modutils, start with code that will find the right CD player our install CD is in.

Browse Source 
svn path=/nixu/trunk/; revision=3540
This commit is contained in:
Armijn Hemel 2005-08-09 16:51:26 +00:00
parent 2ed7eb698b
commit 592b736d33
5 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
boot/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, kernel, bash, coreutils, findutils, utillinux, sysvinit, e2fsprogs
, nettools, nix, subversion, gcc, wget, which, vim, less, screen, openssh
, binutils, strace, shadowutils, iputils, gnumake, curl, gnused, gnugrep
, gnutar, gzip, mingetty, grub, parted}:
, gnutar, gzip, mingetty, grub, parted, modutils}:
derivation {
name = "boot";
@ -14,5 +14,5 @@ derivation {
inherit stdenv kernel bash coreutils findutils utillinux sysvinit
e2fsprogs nettools nix subversion gcc wget which vim less screen
openssh binutils strace shadowutils iputils gnumake curl gnused
gnutar gnugrep gzip mingetty grub parted;
gnutar gnugrep gzip mingetty grub parted modutils;
}

4
fill-disk.sh
View File

@ -4,6 +4,7 @@ export PATH=@bash@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinu
sysvinitPath=@sysvinitPath@
bootPath=@bootPath@
modutils=@modutils@
mount -t proc proc /proc
mount -t sysfs sys /sys
@ -150,6 +151,8 @@ cat /proc/mounts
## /nixpkgs from it inside the ramdisk. Anaconda uses kudzu for this.
## Find out how Knoppix and SUSE do this...
cat /proc/ide/hd*/driver
export NIX_DATA_DIR=$root/nix/share
export NIX_LOG_DIR=$root/nix/log/nix
export NIX_STATE_DIR=$root/nix/var/nix
@ -236,3 +239,4 @@ echo "192.168.150.1 uml" >> $root/etc/hosts
###
### Do funky stuff with grub here.
###

4
init/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, bash, coreutils, utillinux, e2fsprogs, nix, shadowutils, mingetty, grub, parted}:
{ stdenv, bash, coreutils, utillinux, e2fsprogs, nix, shadowutils, mingetty, grub, parted, modutils}:
derivation {
name = "init";
@ -7,5 +7,5 @@ derivation {
stage1 = ./prepare-disk.sh;
stage2 = ./install-disk.sh;
inherit stdenv bash coreutils utillinux e2fsprogs nix shadowutils
mingetty grub parted;
mingetty grub parted modutils;
}

7
make-disk.sh
View File

@ -46,12 +46,14 @@ echo $($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).ni
utilLinux=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).utillinux' | $NIX_CMD_PATH/nix-instantiate -)))
coreUtils=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).coreutils' | $NIX_CMD_PATH/nix-instantiate -)))
e2fsProgs=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).e2fsprogs' | $NIX_CMD_PATH/nix-instantiate -)))
modUtils=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).modutils' | $NIX_CMD_PATH/nix-instantiate -)))
bash=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).bash' | $NIX_CMD_PATH/nix-instantiate -))
coreutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).coreutils' | $NIX_CMD_PATH/nix-instantiate -))
findutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).findutils' | $NIX_CMD_PATH/nix-instantiate -))
utillinux=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).utillinux' | $NIX_CMD_PATH/nix-instantiate -))
e2fsprogs=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).e2fsprogs' | $NIX_CMD_PATH/nix-instantiate -))
modutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).modutils' | $NIX_CMD_PATH/nix-instantiate -))
(while read storepath; do
cp -fa --parents ${storepath} ${archivesDir}
@ -76,6 +78,7 @@ mkdir ${initdir}/bin
mkdir ${initdir}/dev
mkdir ${initdir}/etc
mkdir ${initdir}/installimage
mkdir ${initdir}/modules
mkdir ${initdir}/proc
mkdir ${initdir}/sbin
mkdir ${initdir}/sys
@ -108,6 +111,7 @@ sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
-e "s^@coreutils\@^$coreutils^g" \
-e "s^@utillinux\@^$utillinux^g" \
-e "s^@e2fsprogs\@^$e2fsprogs^g" \
-e "s^@modutils\@^$modutils^g" \
< $fill_disk > $fill_disk.tmp
mv $fill_disk.tmp $fill_disk
@ -140,6 +144,7 @@ cp -fau --parents ${bashdeps} ${initdir}
cp -fau --parents ${utilLinux} ${initdir}
cp -fau --parents ${coreUtils} ${initdir}
cp -fau --parents ${e2fsProgs} ${initdir}
cp -fau --parents ${modUtils} ${initdir}
(cd ${initdir}; find . |cpio -c -o) | gzip -9 > ${initrd}
#(cd ${archivesDir}/initdir; find . |cpio -c -o) | gzip -9 > ${initrd}
@ -151,3 +156,5 @@ echo creating ISO image
mkisofs -rJ -o ${bootiso} -b isolinux/isolinux.bin -c isolinux/boot.cat \
-no-emul-boot -boot-load-size 4 -boot-info-table \
${archivesDir}
echo ${kernel}

6
pkgs.nix
View File

@ -3,15 +3,15 @@ rec {
stdenv kernel bash coreutils findutils utillinux sysvinit e2fsprogs
nettools nix subversion gcc wget which vim less screen openssh binutils
strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip
mingetty grub syslinux parted;
mingetty grub syslinux parted modutils;
boot = (import ./boot) {inherit stdenv kernel bash coreutils findutils
utillinux sysvinit e2fsprogs nettools nix subversion gcc wget which vim
less screen openssh binutils strace shadowutils iputils gnumake curl
gnused gnutar gnugrep gzip mingetty grub parted;};
gnused gnutar gnugrep gzip mingetty grub parted modutils;};
init = (import ./init) {inherit stdenv bash coreutils
utillinux e2fsprogs nix shadowutils mingetty grub parted;};
utillinux e2fsprogs nix shadowutils mingetty grub parted modutils;};
everything = [boot init sysvinit kernel];
}