From: Kay Sievers <kay.sievers@vrfy.org>
Date: Wed, 9 Jul 2008 21:50:46 +0000 (+0200)
Subject: rules: use consistently OPTIONS+=
X-Git-Tag: 174~1670
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c35425071caa4379ebeeed2680f35829bbfd9a8;p=systemd

rules: use consistently OPTIONS+=

Thanks to Marco for the pointer.
---

diff --git a/etc/udev/packages/64-md-raid.rules b/etc/udev/packages/64-md-raid.rules
index b8baea20..d0510b30 100644
--- a/etc/udev/packages/64-md-raid.rules
+++ b/etc/udev/packages/64-md-raid.rules
@@ -15,7 +15,7 @@ ENV{MD_NAME}=="?*", SYMLINK+="disk/by-id/md-name-$env{MD_NAME}"
 ENV{MD_UUID}=="?*", SYMLINK+="disk/by-id/md-uuid-$env{MD_UUID}"
 
 IMPORT{program}="vol_id --export $tempnode"
-OPTIONS="link_priority=100"
+OPTIONS+="link_priority=100"
 ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"
 ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}"
 
diff --git a/etc/udev/rules.d/50-udev-default.rules b/etc/udev/rules.d/50-udev-default.rules
index d201b056..718d1899 100644
--- a/etc/udev/rules.d/50-udev-default.rules
+++ b/etc/udev/rules.d/50-udev-default.rules
@@ -1,12 +1,12 @@
 # do not edit this file, it will be overwritten on update
 
-KERNEL=="pty[pqrstuvwxyzabcdef][0123456789abcdef]", GROUP="tty", MODE="0660", OPTIONS="last_rule"
-KERNEL=="tty[pqrstuvwxyzabcdef][0123456789abcdef]", GROUP="tty", MODE="0660", OPTIONS="last_rule"
-KERNEL=="ptmx",			GROUP="tty", MODE="0666", OPTIONS="last_rule"
-KERNEL=="tty",			GROUP="tty", MODE="0666", OPTIONS="last_rule"
-KERNEL=="tty[0-9]*",		GROUP="tty", MODE="0620", OPTIONS="last_rule"
-KERNEL=="vcs|vcs[0-9]*|vcsa|vcsa[0-9]*", GROUP="tty", OPTIONS="last_rule"
-KERNEL=="console",		MODE="0600", OPTIONS="last_rule"
+KERNEL=="pty[pqrstuvwxyzabcdef][0123456789abcdef]", GROUP="tty", MODE="0660", OPTIONS+="last_rule"
+KERNEL=="tty[pqrstuvwxyzabcdef][0123456789abcdef]", GROUP="tty", MODE="0660", OPTIONS+="last_rule"
+KERNEL=="ptmx",			GROUP="tty", MODE="0666", OPTIONS+="last_rule"
+KERNEL=="tty",			GROUP="tty", MODE="0666", OPTIONS+="last_rule"
+KERNEL=="tty[0-9]*",		GROUP="tty", MODE="0620", OPTIONS+="last_rule"
+KERNEL=="vcs|vcs[0-9]*|vcsa|vcsa[0-9]*", GROUP="tty", OPTIONS+="last_rule"
+KERNEL=="console",		MODE="0600", OPTIONS+="last_rule"
 
 # serial
 KERNEL=="tty[A-Z]*|pppox*|ircomm*|noz*", GROUP="uucp"
diff --git a/etc/udev/suse/64-device-mapper.rules b/etc/udev/suse/64-device-mapper.rules
index c6142ea1..b065aec5 100644
--- a/etc/udev/suse/64-device-mapper.rules
+++ b/etc/udev/suse/64-device-mapper.rules
@@ -15,8 +15,8 @@ ENV{DM_STATE}=="SUSPENDED", GOTO="device_mapper_end"
 ENV{DM_TARGET_TYPES}=="|*error*", GOTO="device_mapper_end"
 
 IMPORT{program}="vol_id --export $tempnode"
-OPTIONS="link_priority=-100"
-ENV{DM_TARGET_TYPES}=="*snapshot-origin*", OPTIONS="link_priority=-90"
+OPTIONS+="link_priority=-100"
+ENV{DM_TARGET_TYPES}=="*snapshot-origin*", OPTIONS+="link_priority=-90"
 ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"
 ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}"