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

remove all reference to the "hotplug" package, since it is obsolete.

Browse Source 
TODO: update udev

svn path=/nixu/trunk/; revision=5222
This commit is contained in:
Armijn Hemel 2006-04-25 23:52:31 +00:00
parent af9eb8537e
commit d8550e9d10
6 changed files with 6 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
boot/boot.sh
View File

@ -31,9 +31,6 @@ echo "cleaning utmp and wtmp..."
echo "" > /var/run/utmp
echo "" > /var/log/wtmp
echo "setting hotplug..."
cat /etc/sysconfig/hotplug > /proc/sys/kernel/hotplug
echo "loading USB controller modules..."
@module_init_tools@/sbin/modprobe uhci-hcd

2
boot/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, bash, bashStatic, coreutils, findutilsWrapper, utillinux, utillinuxStatic, sysvinit, e2fsprogs
, nettools, nix, subversion, gcc, wget, which, vim, less, screen, openssh
, binutils, strace, shadowutils, iputils, gnumake, curl, gnused, gnugrep
, gnutar, gzip, mingettyWrapper, grubWrapper, parted, module_init_tools, hotplug
, gnutar, gzip, mingettyWrapper, grubWrapper, parted, module_init_tools
, udev, dhcpWrapper, man, nano}:
derivation {

10
fill-disk.sh
View File

@ -15,7 +15,6 @@ storePaths=/mystorepaths
sysvinitPath=@sysvinitPath@
bootPath=@bootPath@
modutils=@modutils@
hotplug=@hotplug@
mingetty=@mingetty@
echo mounting special filesystems
@ -357,15 +356,6 @@ ln -s @kernel@/lib/modules/$version/kernel $root/lib/modules/$version/kernel
cp @kernel@/lib/modules/$version/modules.* $root/lib/modules/$version
chmod 644 $root/lib/modules/$version/modules.*
###
### hotplug
###
echo "@hotplug@/sbin/hotplug" > $root/etc/sysconfig/hotplug
ln -s @hotplug@/sbin/hotplug $root/sbin/hotplug
ln -s @hotplug@/etc/hotplug $root/etc/hotplug
ln -s @hotplug@/etc/hotplug.d $root/etc/hotplug.d
###
### init
###

2
init/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, bash, coreutils, utillinux, e2fsprogs, nix, shadowutils, mingetty, grubWrapper, parted, module_init_tools, hotplug, dhcpWrapper}:
{ stdenv, bash, coreutils, utillinux, e2fsprogs, nix, shadowutils, mingetty, grubWrapper, parted, module_init_tools, dhcpWrapper}:
derivation {
name = "init";

6
make-disk.sh
View File

@ -74,7 +74,6 @@ e2fsprogs=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).e2fsprogsDiet
modutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).module_init_toolsStatic' | $NIX_CMD_PATH/nix-instantiate -))
grub=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).grubWrapper' | $NIX_CMD_PATH/nix-instantiate -))
mingettyWrapper=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).mingettyWrapper' | $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).dhcpWrapper' | $NIX_CMD_PATH/nix-instantiate -))
nano=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).nano' | $NIX_CMD_PATH/nix-instantiate -))
@ -136,7 +135,6 @@ cp -fa ${nixpkgs} ${archivesDir}
#cp -fvau --parents ${Kernel} ${archivesDir}
#cp -fvau --parents ${SysVinit} ${archivesDir}
#cp -fvau --parents ${BootPath} ${archivesDir}
#cp -fvau --parents ${hotplug} ${archivesDir}
#cp -fvau --parents ${udev} ${archivesDir}
#cp -fvau --parents ${dhcp} ${archivesDir}
#cp -fvau --parents ${nano} ${archivesDir}
@ -164,7 +162,6 @@ sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
-e "s^@modutils\@^$modutils^g" \
-e "s^@grub\@^$grub^g" \
-e "s^@kernel\@^$kernel^g" \
-e "s^@hotplug\@^$hotplug^g" \
-e "s^@gnugrep\@^$gnugrep^g" \
-e "s^@which\@^$which^g" \
-e "s^@kudzu\@^$kudzu^g" \
@ -186,7 +183,6 @@ sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
-e "s^@modutils\@^$modutils^g" \
-e "s^@grub\@^$grub^g" \
-e "s^@kernel\@^$kernel^g" \
-e "s^@hotplug\@^$hotplug^g" \
-e "s^@gnugrep\@^$gnugrep^g" \
-e "s^@which\@^$which^g" \
-e "s^@gnutar\@^$gnutar^g" \
@ -226,7 +222,6 @@ chmod u+x ${initdir}/ramdisk-login.sh
#cp -fau --parents ${utilLinux} ${initdir}
#cp -fau --parents ${coreUtilsDiet} ${initdir}
#cp -fau --parents ${modUtils} ${initdir}
#cp -fau --parents ${hotplug} ${initdir}
cp -fau --parents ${bash}/bin ${initdir}
cp -fau --parents ${utilLinux}/bin ${initdir}
chmod -R u+w ${initdir}
@ -237,7 +232,6 @@ cp -fau --parents ${modutils}/bin ${initdir}
chmod -R u+w ${initdir}
echo modutils
cp -fau --parents ${modutils}/sbin ${initdir}
#cp -fau --parents ${hotplug} ${initdir}
#cp -fau --parents ${kudzu} ${initdir}
touch ${archivesDir}/NIXOS

8
pkgs.nix
View File

@ -1,20 +1,20 @@
rec {
inherit (import /nixpkgs/trunk/pkgs/system/i686-linux.nix)
inherit (import /nixpkgs/trunk/pkgs/top-level/all-packages.nix {})
stdenv kernel bash bashStatic coreutils coreutilsDiet findutilsWrapper utillinux utillinuxStatic sysvinit
e2fsprogsDiet e2fsprogs
nettools nix subversion gcc wget which vim less screen openssh binutils
strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip
mingettyWrapper grubWrapper syslinux parted module_init_tools module_init_toolsStatic hotplug udev
mingettyWrapper grubWrapper syslinux parted module_init_tools module_init_toolsStatic udev
dhcpWrapper man nano eject sysklogd kudzu xawtv;
boot = (import ./boot) {inherit stdenv bash bashStatic coreutils findutilsWrapper
utillinux utillinuxStatic sysvinit e2fsprogs nettools nix subversion gcc wget which vim
less screen openssh binutils strace shadowutils iputils gnumake curl
gnused gnutar gnugrep gzip mingettyWrapper grubWrapper parted module_init_tools
hotplug udev dhcpWrapper man nano;};
udev dhcpWrapper man nano;};
init = (import ./init) {inherit stdenv bash bashStatic coreutilsDiet utillinux e2fsprogsDiet
nix shadowutils mingettyWrapper grubWrapper parted module_init_tools hotplug
nix shadowutils mingettyWrapper grubWrapper parted module_init_tools
dhcpWrapper man nano eject;};
everything = [boot sysvinit sysklogd kernel xawtv];