Angepasst Include Reihenfolge

leonsio · May 15, 2016 · 6be02bd · 6be02bd
1 parent da587af
commit 6be02bd
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/bin/yahm-module b/bin/yahm-module
@@ -95,6 +95,7 @@ enable_modules()
     fi
 
     progress "Executing ${MODULE} module_install()"
+    source ${YAHM_DIR}/share/modules/${MODULE}
 
     _module_install
 
@@ -121,6 +122,7 @@ disable_modules()
     fi
 
     progress "Executing ${MODULE} module_remove()"
+    source ${YAHM_DIR}/share/modules/${MODULE}
 
     _module_remove
 

diff --git a/share/include.sh b/share/include.sh
@@ -106,9 +106,6 @@ do
             then
                 die "Specified module can not be found"
             fi
-
-            # Modul laden
-            source ${YAHM_DIR}/share/modules/${MODULE}
             ;;
         v)
             IS_VERBOSE=1

diff --git a/share/modules/hm-mod-rpi-pcb b/share/modules/hm-mod-rpi-pcb
@@ -9,6 +9,7 @@ description="GPIO Funkmodul für Raspberry Pi2/3"
 # Default Parameter
 file_hm_mod_rpi_pcb='/etc/init.d/hm-mod-rpi-pcb'
 file_cmdline_txt='/boot/cmdline.txt'
+file_rfd_conf="${LXC_ROOT_FS}/usr/local/etc/config/rfd.conf"
 reboot=0 # Neustart ausfuehren
 
 kernel_version=$(uname -r | sed -e 's/-.*//i')
@@ -21,7 +22,6 @@ fi
 
 _module_install()
 {
-    file_rfd_conf="${LXC_ROOT_FS}/usr/local/etc/config/rfd.conf"
 
     if [ -e ${LXC_ROOT_MODULES}/hm-fake-lan-gw ] && [ $IS_FORCE -ne 1 ]
     then
@@ -176,9 +176,6 @@ EOF
 
 _module_remove()
 {
-
-    file_rfd_conf="${LXC_ROOT_FS}/usr/local/etc/config/rfd.conf"
-
     if [ "$BOARD_TYPE" != "Raspberry Pi" ] && [ $IS_FORCE -ne 1 ]
     then
         die "ERROR: This module is for Raspberry Pi only, use -f flag to overwrite this check"