nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-04-13 16:37:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

use the dhcp wrapper, add a directory needed for DHCP

Browse Source 
svn path=/nixu/trunk/; revision=3656
This commit is contained in:
Armijn Hemel 2005-08-21 19:56:30 +00:00
parent 4c6230b0a6
commit fb451cc09f
7 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot/builder.sh
View File

@ -38,7 +38,7 @@ for i in $boot $halt $login $env; do
-e "s^@module_init_tools\@^$module_init_tools^g" \
-e "s^@grub\@^$grub^g" \
-e "s^@udev\@^$udev^g" \
-e "s^@dhcp\@^$dhcp^g" \
-e "s^@dhcpWrapper\@^$dhcpWrapper^g" \
-e "s^@out\@^$out^g" \
< $i > $dst
chmod +x $dst

4
boot/default.nix
View File

@ -2,7 +2,7 @@
, nettools, nix, subversion, gcc, wget, which, vim, less, screen, openssh
, binutils, strace, shadowutils, iputils, gnumake, curl, gnused, gnugrep
, gnutar, gzip, mingetty, grubWrapper, parted, module_init_tools, hotplug
, udev, dhcp}:
, udev, dhcpWrapper}:
derivation {
name = "boot";
@ -16,5 +16,5 @@ derivation {
e2fsprogs nettools nix subversion gcc wget which vim less screen
openssh binutils strace shadowutils iputils gnumake curl gnused
gnutar gnugrep gzip mingetty grubWrapper parted module_init_tools
udev dhcp;
udev dhcpWrapper;
}

2
boot/env.sh
View File

@ -1 +1 @@
export PATH=@nix@/bin:@bash@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@sysvinit@/bin:@sysvinit@/sbin:@e2fsprogs@/bin:@e2fsprogs@/sbin:@nettools@/bin:@nettools@/sbin:@gcc@/bin:@subversion@/bin:@which@/bin:@wget@/bin:@vim@/bin:@less@/bin:@screen@/bin:@openssh@/bin:@binutils@/bin:@strace@/bin:@shadowutils@/bin:@shadowutils@/sbin:@iputils@/bin:@gnumake@/bin:@curl@/bin:@gnused@/bin:@gnutar@/bin:@gnugrep@/bin:@gzip@/bin:@mingetty@/sbin:@grub@/bin:@grub@/sbin:@module_init_tools@/sbin:@dhcp@/sbin
export PATH=@nix@/bin:@bash@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@sysvinit@/bin:@sysvinit@/sbin:@e2fsprogs@/bin:@e2fsprogs@/sbin:@nettools@/bin:@nettools@/sbin:@gcc@/bin:@subversion@/bin:@which@/bin:@wget@/bin:@vim@/bin:@less@/bin:@screen@/bin:@openssh@/bin:@binutils@/bin:@strace@/bin:@shadowutils@/bin:@shadowutils@/sbin:@iputils@/bin:@gnumake@/bin:@curl@/bin:@gnused@/bin:@gnutar@/bin:@gnugrep@/bin:@gzip@/bin:@mingetty@/sbin:@grub@/bin:@grub@/sbin:@module_init_tools@/sbin:@dhcpWrapper@/sbin

2
fill-disk.sh
View File

@ -154,6 +154,7 @@ make_dir 00755 /var/log
make_dir 00755 /var/run
make_dir 00755 /var/spool
make_dir 00755 /var/state
make_dir 00755 /var/state/dhcp
make_dir 00755 /var/tmp
##
@ -274,6 +275,7 @@ cp -fa /nix/store/* $root/nix/store
echo setting init symlink...
rm -f $root/init
ln -s $sysvinitPath/sbin/init $root/init
ln -s $bash/bin/sh $root/bin/sh
echo setting up inittab...
rm -f $root/etc/inittab

4
init/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, bash, coreutils, utillinux, e2fsprogs, nix, shadowutils, mingetty, grubWrapper, parted, module_init_tools, hotplug, dhcp}:
{ stdenv, bash, coreutils, utillinux, e2fsprogs, nix, shadowutils, mingetty, grubWrapper, parted, module_init_tools, hotplug, dhcpWrapper}:
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 grubWrapper parted module_init_tools dhcp;
mingetty grubWrapper parted module_init_tools dhcpWrapper;
}

2
make-disk.sh
View File

@ -64,7 +64,7 @@ modutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).module_init_to
grub=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).grubWrapper' | $NIX_CMD_PATH/nix-instantiate -))
hotplug=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).hotplug' | $NIX_CMD_PATH/nix-instantiate -))
udev=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).udev' | $NIX_CMD_PATH/nix-instantiate -))
dhcp=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).dhcp' | $NIX_CMD_PATH/nix-instantiate -))
dhcp=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).dhcpWrapper' | $NIX_CMD_PATH/nix-instantiate -))
(while read storepath; do
cp -fa --parents ${storepath} ${archivesDir}

6
pkgs.nix
View File

@ -4,17 +4,17 @@ rec {
nettools nix subversion gcc wget which vim less screen openssh binutils
strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip
mingetty grubWrapper syslinux parted module_init_tools hotplug udev
dhcp;
dhcpWrapper;
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 grubWrapper parted module_init_tools
hotplug udev dhcp;};
hotplug udev dhcpWrapper;};
init = (import ./init) {inherit stdenv bash coreutils utillinux e2fsprogs
nix shadowutils mingetty grubWrapper parted module_init_tools hotplug
dhcp;};
dhcpWrapper;};
everything = [boot init sysvinit kernel];
}