summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorentin LABBE <clabbe@baylibre.com>2018-01-11 16:25:13 +0100
committerCorentin LABBE <clabbe@baylibre.com>2018-02-02 14:26:34 +0100
commitdd13a9f0eb4732e72082738f800b81a92d0eb10c (patch)
tree1b99b4f7d782f433b2ee1f672899fde2db0ee5bc
parent902d925a55ef8961aea10051d70bbed6215e7106 (diff)
Generate udev rules in udev directory
-rwxr-xr-xlavalab-gen.py4
-rwxr-xr-xlavalab-gen.sh4
2 files changed, 5 insertions, 3 deletions
diff --git a/lavalab-gen.py b/lavalab-gen.py
index 93fc447..55f2317 100755
--- a/lavalab-gen.py
+++ b/lavalab-gen.py
@@ -101,7 +101,9 @@ def main(args):
fp = open(board_device_file, "w")
fp.write(device_line)
fp.close()
- fp = open("lavalab-udev-%s.rules" % lab_name, "w")
+ if not os.path.isdir("udev"):
+ os.mkdir("udev")
+ fp = open("udev/99-lavalab-udev-%s.rules" % lab_name, "w")
fp.write(udev_line)
fp.close()
if lab.has_key("dispatcher_ip"):
diff --git a/lavalab-gen.sh b/lavalab-gen.sh
index 26cbc23..d6fcf94 100755
--- a/lavalab-gen.sh
+++ b/lavalab-gen.sh
@@ -5,7 +5,7 @@ rm -rv lava-master/slaves/
rm -rv lava-slave/conmux/
rm -rv lava-master/tokens/
rm -rv lava-master/users/
-rm lavalab*rules
+rm udev/*lavalab*rules
if [ "$1" = "mrproper" ];then
exit 0
@@ -19,7 +19,7 @@ if [ $(id -u) -ne 0 ];then
BEROOT="sudo "
fi
$BEROOT rm /etc/udev/rules.d/*lavalab*rules
-$BEROOT cp *lavalab*rules /etc/udev/rules.d/
+$BEROOT cp udev/*lavalab*rules /etc/udev/rules.d/
$BEROOT udevadm control --reload-rules || exit $?
$BEROOT udevadm trigger || exit $?