From d9206f0aa09d3fd4b22aa9e9131ff9decbd1b7a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Mon, 22 Jan 2018 19:11:50 +0100 Subject: [PATCH] Place list of loaded modules in /var/run directly Do not use /var/run/qubes for this, as it may be non-root writeable and someone may want to isolate root/user. Also, remove the file after resume. (cherry picked from commit 79b38cf1060d28bb175e54184b6d222192180cac) --- qubes-rpc/prepare-suspend | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/qubes-rpc/prepare-suspend b/qubes-rpc/prepare-suspend index f5f3721..e6da7e6 100755 --- a/qubes-rpc/prepare-suspend +++ b/qubes-rpc/prepare-suspend @@ -36,11 +36,13 @@ if [ x"$action" = x"suspend" ]; then modprobe -r $mod fi done - echo $LOADED_MODULES > /var/run/qubes/suspend-modules-loaded + echo "$LOADED_MODULES" > /var/run/qubes-suspend-modules-loaded else - for mod in `cat /var/run/qubes/suspend-modules-loaded`; do - modprobe $mod + # shellcheck disable=SC2013 + for mod in $(cat /var/run/qubes-suspend-modules-loaded); do + modprobe "$mod" done + rm -f /var/run/qubes-suspend-modules-loaded if qsvc network-manager ; then dbus-send --system --print-reply \ --dest=org.freedesktop.NetworkManager \