From 7db6f515cb417b67feaeb151322347840c4ae0b2 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 12 Aug 2013 00:05:16 +0200
Subject: [PATCH] linux: remove modules initscripts, port modules load to
 systemd

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/linux/config/modules               |  6 ----
 packages/linux/init.d/15_modules            | 35 ---------------------
 packages/linux/install                      |  3 --
 packages/linux/modules-load.d/coretemp.conf |  3 ++
 4 files changed, 3 insertions(+), 44 deletions(-)
 delete mode 100644 packages/linux/config/modules
 delete mode 100644 packages/linux/init.d/15_modules
 create mode 100644 packages/linux/modules-load.d/coretemp.conf

diff --git a/packages/linux/config/modules b/packages/linux/config/modules
deleted file mode 100644
index 00dba836e4..0000000000
--- a/packages/linux/config/modules
+++ /dev/null
@@ -1,6 +0,0 @@
-# /etc/modules: force some kernel modules to be loaded at boot time.
-#
-# This file contains the names of kernel modules that should be loaded
-# at boot time, one per line. Lines beginning with "#" are ignored.
-
-coretemp
diff --git a/packages/linux/init.d/15_modules b/packages/linux/init.d/15_modules
deleted file mode 100644
index 3965ca214c..0000000000
--- a/packages/linux/init.d/15_modules
+++ /dev/null
@@ -1,35 +0,0 @@
-################################################################################
-#      Copyright (C) 2009-2010 OpenELEC.tv
-#      http://www.openelec.tv
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-#
-# load modules
-#
-# runlevels: openelec, textmode
-
-(
-  progress "loading kernel modules"
-
-  IFS='
-'
-  for module in `cat /etc/modules|grep "^[^#]"`; do
-    eval "modprobe $module" >/dev/null 2>&1
-  done
-
-)&
diff --git a/packages/linux/install b/packages/linux/install
index 4e0f9ef455..94076019ed 100755
--- a/packages/linux/install
+++ b/packages/linux/install
@@ -35,9 +35,6 @@ mkdir -p $INSTALL/lib/modules/$VER
   [ -d $PKG_BUILD/modules/lib/firmware ] && \
     cp -rf $PKG_BUILD/modules/lib/firmware/* $INSTALL/lib/firmware || true
 
-mkdir -p $INSTALL/etc
-  cp $PKG_DIR/config/modules $INSTALL/etc
-
 mkdir -p $INSTALL/etc/modprobe.d
   cp $PKG_DIR/modprobe.d/*.conf $INSTALL/etc/modprobe.d
 
diff --git a/packages/linux/modules-load.d/coretemp.conf b/packages/linux/modules-load.d/coretemp.conf
new file mode 100644
index 0000000000..f0dbe5f2bc
--- /dev/null
+++ b/packages/linux/modules-load.d/coretemp.conf
@@ -0,0 +1,3 @@
+# load coretemp kernel module
+coretemp
+