From b39fca2ade8b92e91c1afda775e3ed3fbfd4d58d Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Fri, 19 Aug 2005 15:26:01 +0000
Subject: [PATCH] - add udev (not yet in use) - clean up 100 MB of unused stuff
 on the CD

svn path=/nixu/trunk/; revision=3637
---
 boot/default.nix | 4 ++--
 make-disk.sh     | 7 +++++--
 pkgs.nix         | 4 ++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/boot/default.nix b/boot/default.nix
index 315fab0e18d..78c7c39c924 100644
--- a/boot/default.nix
+++ b/boot/default.nix
@@ -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, grubWrapper, parted, modutils, hotplug}:
+, gnutar, gzip, mingetty, grubWrapper, parted, modutils, hotplug, udev}:
 
 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 grubWrapper parted modutils;
+          gnutar gnugrep gzip mingetty grubWrapper parted modutils udev;
 }
diff --git a/make-disk.sh b/make-disk.sh
index 4767e220acb..3218fc8007d 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -63,8 +63,7 @@ e2fsprogs=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).e2fsprogs' |
 modutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).modutils' | $NIX_CMD_PATH/nix-instantiate -))
 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 -))
-#gnused=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).gnused' | $NIX_CMD_PATH/nix-instantiate -))
-#gnugrep=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).gnugrep' | $NIX_CMD_PATH/nix-instantiate -))
+udev=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).udev' | $NIX_CMD_PATH/nix-instantiate -))
 
 (while read storepath; do
    cp -fa --parents ${storepath} ${archivesDir}
@@ -115,6 +114,7 @@ cp -fau --parents ${Kernel} ${archivesDir}
 cp -fau --parents ${SysVinit} ${archivesDir}
 cp -fau --parents ${BootPath} ${archivesDir}
 cp -fau --parents ${hotplug} ${archivesDir}
+cp -fau --parents ${udev} ${archivesDir}
 
 bashdeps=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).bash' | $NIX_CMD_PATH/nix-instantiate -)))
 
@@ -173,6 +173,9 @@ touch ${initdir}/NIXOS
 
 (cd ${initdir}; find . |cpio -c -o) | gzip -9 > ${initrd}
 
+chmod -f -R +w ${initdir}/*
+rm -rf ${initdir}
+
 cp ${initrd} ${archivesDir}/isolinux
 
 echo creating ISO image
diff --git a/pkgs.nix b/pkgs.nix
index f380bedc125..7d5d568cb93 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -3,12 +3,12 @@ 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 grubWrapper syslinux parted modutils hotplug;
+    mingetty grubWrapper syslinux parted modutils hotplug udev;
 
   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 modutils hotplug;};
+    gnused gnutar gnugrep gzip mingetty grubWrapper parted modutils hotplug udev;};
 
   init = (import ./init) {inherit stdenv bash coreutils 
     utillinux e2fsprogs nix shadowutils mingetty grubWrapper parted modutils hotplug;};