Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/core

Browse Source
This commit is contained in:
Joanna Rutkowska 2012-03-31 19:52:28 +02:00
commit cb9b76d039
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
misc/block_add_change
View File

@ -16,6 +16,11 @@ if [ -n "`ls -A /sys/$DEVPATH/holders 2> /dev/null`" ]; then
xenstore-rm "$XS_KEY" xenstore-rm "$XS_KEY"
exit 0 exit 0
fi fi
# ... and "empty" loop devices
if [ "$MAJOR" -eq 7 -a ! -d /sys/$DEVPATH/loop ]; then
xenstore-rm "$XS_KEY"
exit 0
fi
# Special case for CD # Special case for CD
if [ "$ID_TYPE" = "cd" ]; then if [ "$ID_TYPE" = "cd" ]; then
@ -26,6 +31,11 @@ if [ "$ID_TYPE" = "cd" ]; then
fi fi
MODE=r MODE=r
fi fi
# Special description for loop devices
if [ -d /sys/$DEVPATH/loop ]; then
DESC=$(cat /sys/$DEVPATH/loop/backing_file)
fi
xenstore-write "$XS_KEY/desc" "$DESC" "$XS_KEY/size" "$SIZE" "$XS_KEY/mode" "$MODE" xenstore-write "$XS_KEY/desc" "$DESC" "$XS_KEY/size" "$SIZE" "$XS_KEY/mode" "$MODE"
# Make sure that block backend is loaded # Make sure that block backend is loaded

3
misc/qubes_block.rules
View File

@ -6,9 +6,6 @@ SUBSYSTEM!="block", GOTO="qubes_block_end"
# Skip xen-blkfront devices # Skip xen-blkfront devices
ENV{MAJOR}=="202", GOTO="qubes_block_end" ENV{MAJOR}=="202", GOTO="qubes_block_end"
# Skip loop devices
ENV{MAJOR}=="7", GOTO="qubes_block_end"
# Skip device-mapper devices # Skip device-mapper devices
ENV{MAJOR}=="253", GOTO="qubes_block_end" ENV{MAJOR}=="253", GOTO="qubes_block_end"