From fb451cc09f741ec60d3a5ef756ea44c95e0cb213 Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Sun, 21 Aug 2005 19:56:30 +0000 Subject: [PATCH] use the dhcp wrapper, add a directory needed for DHCP svn path=/nixu/trunk/; revision=3656 --- boot/builder.sh | 2 +- boot/default.nix | 4 ++-- boot/env.sh | 2 +- fill-disk.sh | 2 ++ init/default.nix | 4 ++-- make-disk.sh | 2 +- pkgs.nix | 6 +++--- 7 files changed, 12 insertions(+), 10 deletions(-) diff --git a/boot/builder.sh b/boot/builder.sh index 679b18b514a8..dce3250f0903 100755 --- a/boot/builder.sh +++ b/boot/builder.sh @@ -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 diff --git a/boot/default.nix b/boot/default.nix index 28661278cb3e..0827f59d7bdb 100644 --- a/boot/default.nix +++ b/boot/default.nix @@ -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; } diff --git a/boot/env.sh b/boot/env.sh index 7564e350d366..84b8e7c7b3a5 100644 --- a/boot/env.sh +++ b/boot/env.sh @@ -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 diff --git a/fill-disk.sh b/fill-disk.sh index ab8eda71fb1b..eab6d7ecaf2a 100755 --- a/fill-disk.sh +++ b/fill-disk.sh @@ -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 diff --git a/init/default.nix b/init/default.nix index 92c347942877..c81e75513cda 100644 --- a/init/default.nix +++ b/init/default.nix @@ -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; } diff --git a/make-disk.sh b/make-disk.sh index eb46887a91f3..ac626727b90c 100755 --- a/make-disk.sh +++ b/make-disk.sh @@ -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} diff --git a/pkgs.nix b/pkgs.nix index a127d31b29a2..874548e01f25 100644 --- a/pkgs.nix +++ b/pkgs.nix @@ -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]; }