From e898a83b05e717326d0b326d6697239bbe25ba4b Mon Sep 17 00:00:00 2001
From: Daniel STAN <daniel.stan@crans.org>
Date: Sun, 20 Apr 2014 12:45:32 +0200
Subject: [PATCH] isci: PATH=/usr/scripts

---
 gestion/iscsi/get_volume_mapping.py   | 7 +++----
 gestion/iscsi/udev_get_iscsi_name.py  | 5 ++---
 gestion/iscsi/udev_update_symlinks.py | 6 ++----
 gestion/iscsi/update.sh               | 6 +++---
 4 files changed, 10 insertions(+), 14 deletions(-)
 mode change 100644 => 100755 gestion/iscsi/get_volume_mapping.py
 mode change 100644 => 100755 gestion/iscsi/udev_update_symlinks.py

diff --git a/gestion/iscsi/get_volume_mapping.py b/gestion/iscsi/get_volume_mapping.py
old mode 100644
new mode 100755
index ae076442..b0793bd9
--- a/gestion/iscsi/get_volume_mapping.py
+++ b/gestion/iscsi/get_volume_mapping.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/bin/bash /usr/scripts/python.sh
 # -*- coding: utf-8 -*-
 
 # slon-get-volume-mapping.py
@@ -17,9 +17,8 @@ import sys
 
 coding = "utf-8"
 
-sys.path.append("/usr/scripts/gestion")
-from config import ISCSI_MAP_FILE
-import affich_tools
+from gestion.config import ISCSI_MAP_FILE
+from gestion import affich_tools
 
 def get_mapping(baie_name):
     map_file = ISCSI_MAP_FILE % (baie_name,)
diff --git a/gestion/iscsi/udev_get_iscsi_name.py b/gestion/iscsi/udev_get_iscsi_name.py
index 5ae79f6b..efd2dd2e 100755
--- a/gestion/iscsi/udev_get_iscsi_name.py
+++ b/gestion/iscsi/udev_get_iscsi_name.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/bin/bash /usr/scripts/python.sh
 # -*- coding: utf-8 -*-
 
 # udev-get-iscsi-name.py
@@ -12,8 +12,7 @@ pour les liens symboliques pour les périphériques iscsi'''
 
 import sys
 import os
-sys.path.append("/usr/scripts/gestion")
-from config import ISCSI_MAP_FILE
+from gestion.config import ISCSI_MAP_FILE
 
 def getname(device, baie):
     map_file = ISCSI_MAP_FILE % (baie,)
diff --git a/gestion/iscsi/udev_update_symlinks.py b/gestion/iscsi/udev_update_symlinks.py
old mode 100644
new mode 100755
index 9788023b..9819aebf
--- a/gestion/iscsi/udev_update_symlinks.py
+++ b/gestion/iscsi/udev_update_symlinks.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/bin/bash /usr/scripts/python.sh
 # -*- coding: utf-8 -*-
 #
 # Auteur : Pierre-Elliott Bécue <becue@crans.org>
@@ -7,9 +7,7 @@
 
 import sys
 import os
-sys.path.append('/usr/scripts/gestion/iscsi')
-sys.path.append('/usr/scripts/gestion')
-from affich_tools import coul
+from gestion.affich_tools import coul
 import udev_get_iscsi_name as ugin
 import subprocess
 
diff --git a/gestion/iscsi/update.sh b/gestion/iscsi/update.sh
index dea50a23..818506e3 100755
--- a/gestion/iscsi/update.sh
+++ b/gestion/iscsi/update.sh
@@ -28,8 +28,8 @@ exec_cmd() {
 }
 
 exec_cmd "Récupération du mapping lun<->nom de volume" \
-    python /usr/scripts/gestion/iscsi/get_volume_mapping.py nols
-    python /usr/scripts/gestion/iscsi/get_volume_mapping.py slon
+    /usr/scripts/gestion/iscsi/get_volume_mapping.py nols
+    /usr/scripts/gestion/iscsi/get_volume_mapping.py slon
 
 exec_cmd "Rechargement des règles de udev" \
     invoke-rc.d udev reload
@@ -38,4 +38,4 @@ exec_cmd "Rescan des volumes iscsi" \
     iscsiadm -m session --rescan
 
 exec_cmd "Mises à jours des liens symboliques dans /dev" \
-    python /usr/scripts/gestion/iscsi/udev_update_symlinks.py --clean
+    /usr/scripts/gestion/iscsi/udev_update_symlinks.py --clean