From 4d44e4f0b5d54327c112ad26a4b26397789d7192 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 13 Jul 2011 20:06:11 +0200 Subject: [PATCH] udev: actually check for existance of ID_PATH_TAG before we use it --- src/71-seat.rules | 2 +- src/logind.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/71-seat.rules b/src/71-seat.rules index dca5e5f2a..7c062034e 100644 --- a/src/71-seat.rules +++ b/src/71-seat.rules @@ -16,6 +16,6 @@ SUBSYSTEM=="usb", ATTR{bDeviceClass}=="09", TAG+="seat" SUBSYSTEM=="usb", ATTR{idVendor}=="2230", ATTR{idProduct}=="0001", ENV{ID_AUTOSEAT}="1" TAG=="seat", ENV{ID_PATH}=="", IMPORT{program}="path_id %p" -TAG=="seat", ENV{ID_FOR_SEAT}=="", ENV{ID_PATH}!="", ENV{ID_FOR_SEAT}="$env{SUBSYSTEM}-$env{ID_PATH_TAG}" +TAG=="seat", ENV{ID_FOR_SEAT}=="", ENV{ID_PATH_TAG}!="", ENV{ID_FOR_SEAT}="$env{SUBSYSTEM}-$env{ID_PATH_TAG}" LABEL="seat_end" diff --git a/src/logind.h b/src/logind.h index d91cae38f..7f584558a 100644 --- a/src/logind.h +++ b/src/logind.h @@ -40,7 +40,6 @@ * * udev: * drop redundant udev_device_get_is_initialized() use as soon as libudev is fixed - * properly escape/remove : and . from seat names in udev rules * use device_has_tag() as soon as it is available * trigger based on libudev if available * enumerate recursively with libudev when triggering -- 2.30.2