Author: eelco
Date: Mon Mar 19 19:10:27 2012
New Revision: 33275
URL: https://nixos.org/websvn/nix/?rev=33275&sc=1
Log:
* udev: don't set the STARTUP flag anymore, since LVM no longer uses
it.
* Don't call "vgscan" anymore; VG scans are supposed to be automatic.
Modified:
nixos/trunk/modules/services/hardware/udev.nix
nixos/trunk/modules/system/boot/stage-1-init.sh
nixos/trunk/modules/tasks/lvm.nix
Modified: nixos/trunk/modules/services/hardware/udev.nix
==============================================================================
--- nixos/trunk/modules/services/hardware/udev.nix Mon Mar 19 19:01:52
2012 (r33274)
+++ nixos/trunk/modules/services/hardware/udev.nix Mon Mar 19 19:10:27
2012 (r33275)
@@ -1,4 +1,4 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
with pkgs.lib;
@@ -260,13 +260,9 @@
''
# Let udev create device nodes for all modules that have already
# been loaded into the kernel (or for which support is built into
- # the kernel). The `STARTUP' variable is needed to force
- # the LVM rules to create device nodes. See
- #
http://www.mail-archive.com/[email protected]/msg10261.html
- udevadm control --env=STARTUP=1
+ # the kernel).
udevadm trigger --action=add
udevadm settle || true # wait for udev to finish
- udevadm control --env=STARTUP=
initctl emit -n new-devices
'';
Modified: nixos/trunk/modules/system/boot/stage-1-init.sh
==============================================================================
--- nixos/trunk/modules/system/boot/stage-1-init.sh Mon Mar 19 19:01:52
2012 (r33274)
+++ nixos/trunk/modules/system/boot/stage-1-init.sh Mon Mar 19 19:10:27
2012 (r33275)
@@ -135,10 +135,8 @@
mkdir -p /dev/.udev # !!! bug in udev?
mkdir -p /dev/.mdadm
udevd --daemon
-udevadm control --env=STARTUP=1
udevadm trigger --action=add
udevadm settle || true
-udevadm control --env=STARTUP=
# XXX: Use case usb->lvm will still fail, usb->luks->lvm is covered
@@ -146,7 +144,6 @@
echo "starting device mapper and LVM..."
-lvm vgscan
lvm vgchange -ay
if test -n "$debug1devices"; then fail; fi
Modified: nixos/trunk/modules/tasks/lvm.nix
==============================================================================
--- nixos/trunk/modules/tasks/lvm.nix Mon Mar 19 19:01:52 2012 (r33274)
+++ nixos/trunk/modules/tasks/lvm.nix Mon Mar 19 19:10:27 2012 (r33275)
@@ -11,10 +11,6 @@
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 them appear in /dev.
${pkgs.lvm2}/sbin/vgchange --available y
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
