merge with master

diff --git a/rules/50-udev-default.rules b/rules/50-udev-default.rules
index 160ff99..5ad787f 100755 (executable)
--- a/rules/50-udev-default.rules
+++ b/rules/50-udev-default.rules
@@ -2,8 +2,8 @@
 
 KERNEL=="pty[pqrstuvwxyzabcdef][0123456789abcdef]", GROUP="tty", MODE="0660"
 KERNEL=="tty[pqrstuvwxyzabcdef][0123456789abcdef]", GROUP="tty", MODE="0660"
-KERNEL=="ptmx", GROUP="tty", MODE="0666" SMACK="*"
-KERNEL=="tty", GROUP="tty", MODE="0666" SMACK="*"
+KERNEL=="ptmx", GROUP="tty", MODE="0666"
+KERNEL=="tty", GROUP="tty", MODE="0666"
 KERNEL=="tty[0-9]*", GROUP="tty", MODE="0620"
 KERNEL=="vcs|vcs[0-9]*|vcsa|vcsa[0-9]*", GROUP="tty"
 
@@ -16,7 +16,7 @@ KERNEL=="hvc*|hvsi*", GROUP="dialout"
 KERNEL=="vport*", ATTR{name}=="?*", SYMLINK+="virtio-ports/$attr{name}"
 
 # mem
-KERNEL=="null|zero|full|random|urandom", MODE="0666" SMACK="*"
+KERNEL=="null|zero|full|random|urandom", MODE="0666"
 KERNEL=="mem|kmem|port|nvram", GROUP="kmem", MODE="0640"
 
 # input
@@ -91,13 +91,13 @@ SUBSYSTEM=="aoe", GROUP="disk", MODE="0220"
 SUBSYSTEM=="aoe", KERNEL=="err", MODE="0440"
 
 # network
-KERNEL=="tun", MODE="0666", OPTIONS+="static_node=net/tun" SMACK="*"
+KERNEL=="tun", MODE="0666", OPTIONS+="static_node=net/tun"
 KERNEL=="rfkill", MODE="0644"
 
 # CPU
 KERNEL=="cpu[0-9]*", MODE="0444"
 
-KERNEL=="fuse", ACTION=="add", MODE="0666", OPTIONS+="static_node=fuse" SMACK="*"
+KERNEL=="fuse", ACTION=="add", MODE="0666", OPTIONS+="static_node=fuse"
 
 SUBSYSTEM=="rtc", ATTR{hctosys}=="1", SYMLINK+="rtc"
 KERNEL=="mmtimer", MODE="0644"