From 9de81afbd67c442a6c96ccca04b8e62e8cbd2b93 Mon Sep 17 00:00:00 2001 From: John Hensley Date: Thu, 14 Nov 2019 17:15:23 -0500 Subject: [PATCH] Force the creation of udev rules link Ensure that rc.local doesn't throw an error if the link to our udev rules should somehow already exist. Also create it during "make sys-usb", so that "udevadm control --reload" has something to work with and sys-usb doesn't have to be rebooted for auto attachment to start working. --- dom0/sys-usb.sls | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dom0/sys-usb.sls b/dom0/sys-usb.sls index df8dd3f6..c3399742 100644 --- a/dom0/sys-usb.sls +++ b/dom0/sys-usb.sls @@ -23,12 +23,12 @@ sd-rc-local-udev-rules: - marker_end: "### END securedrop-workstation ###" - content: | # Add udev rules for export devices - ln -s /rw/config/sd/etc/udev/rules.d/99-sd-export-usb.rules /etc/udev/rules.d/ + ln -sf /rw/config/sd/etc/udev/rules.d/99-sd-export-usb.rules /etc/udev/rules.d/ udevadm control --reload - require: - file: sd-udev-rules cmd.run: - - name: udevadm control --reload + - name: ln -sf /rw/config/sd/etc/udev/rules.d/99-sd-export-usb.rules /etc/udev/rules.d/ && udevadm control --reload - require: - file: sd-rc-local-udev-rules