From 6b4c96d195b7c3066035090e45febd15f971a5e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Mon, 13 Jan 2014 05:00:01 +0100 Subject: [PATCH] Improve block devices detection during system startup Not only refresh the info about mounted devices, but also check for others - detected before xenstored was running. Because of recent change in udev rules (adding flock) it shouldn't deadlock now. --- linux/aux-tools/startup-misc.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/linux/aux-tools/startup-misc.sh b/linux/aux-tools/startup-misc.sh index 57d06c82..9edd0e8a 100755 --- a/linux/aux-tools/startup-misc.sh +++ b/linux/aux-tools/startup-misc.sh @@ -13,9 +13,4 @@ cp /var/lib/qubes/qubes.xml /var/lib/qubes/backup/qubes-$(date +%F-%T).xml /usr/lib/qubes/cleanup-dispvms # Hide mounted devices from qubes-block list (at first udev run, only / is mounted) -for dev in `xenstore-list /local/domain/0/qubes-block-devices 2> /dev/null`; do - ( eval `udevadm info -q property -n $dev|sed -e 's/\([^=]*\)=\(.*\)/export \1="\2"/'`; - /usr/lib/qubes/udev-block-add-change > /dev/null - ) -done - +udevadm trigger --action=change --subsystem-match=block