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

* udev: don't set the STARTUP flag anymore, since LVM no longer uses

Browse Source 
it.
* Don't call "vgscan" anymore; VG scans are supposed to be automatic.

svn path=/nixos/trunk/; revision=33275
This commit is contained in:
Eelco Dolstra 2012-03-19 19:10:27 +00:00
parent 81655b7247
commit 533448ae37
3 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/services/hardware/udev.nix
View File

@ -1,4 +1,4 @@
{pkgs, config, ...}: { config, pkgs, ... }:
with pkgs.lib; with pkgs.lib;
@ -260,13 +260,9 @@ in
'' ''
# Let udev create device nodes for all modules that have already # Let udev create device nodes for all modules that have already
# been loaded into the kernel (or for which support is built into # been loaded into the kernel (or for which support is built into
# the kernel). The `STARTUP' variable is needed to force # the kernel).
# the LVM rules to create device nodes. See
# http://www.mail-archive.com/fedora-devel-list@redhat.com/msg10261.html
udevadm control --env=STARTUP=1
udevadm trigger --action=add udevadm trigger --action=add
udevadm settle || true # wait for udev to finish udevadm settle || true # wait for udev to finish
udevadm control --env=STARTUP=
initctl emit -n new-devices initctl emit -n new-devices
''; '';

3
modules/system/boot/stage-1-init.sh
View File

@ -135,10 +135,8 @@ export UDEV_CONFIG_FILE=@udevConf@
mkdir -p /dev/.udev # !!! bug in udev? mkdir -p /dev/.udev # !!! bug in udev?
mkdir -p /dev/.mdadm mkdir -p /dev/.mdadm
udevd --daemon udevd --daemon
udevadm control --env=STARTUP=1
udevadm trigger --action=add udevadm trigger --action=add
udevadm settle || true udevadm settle || true
udevadm control --env=STARTUP=
# XXX: Use case usb->lvm will still fail, usb->luks->lvm is covered # XXX: Use case usb->lvm will still fail, usb->luks->lvm is covered
@ -146,7 +144,6 @@ udevadm control --env=STARTUP=
echo "starting device mapper and LVM..." echo "starting device mapper and LVM..."
lvm vgscan
lvm vgchange -ay lvm vgchange -ay
if test -n "$debug1devices"; then fail; fi if test -n "$debug1devices"; then fail; fi

4
modules/tasks/lvm.nix
View File

@ -11,10 +11,6 @@
script = script =
'' ''
# Scan for block devices that might contain LVM physical volumes
# and volume groups.
${pkgs.lvm2}/sbin/vgscan
# Make all logical volumes on all volume groups available, i.e., # Make all logical volumes on all volume groups available, i.e.,
# make them appear in /dev. # make them appear in /dev.
${pkgs.lvm2}/sbin/vgchange --available y ${pkgs.lvm2}/sbin/vgchange --available y