Patchwork [PATCHv2,5/6] update-modules: update script to read /etc/modules-load.d/ directory

login
register
mail settings
Submitter Martin Jansa
Date March 23, 2012, 2:37 p.m.
Message ID <1332513443-16002-1-git-send-email-Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/24289/
State Accepted
Commit 38302a1353cf072b7c6c54f7f90936e4c2180102
Headers show

Comments

Martin Jansa - March 23, 2012, 2:37 p.m.
* show warning for old /etc/modutils/* files without .conf extension
* v2: keep adding modules also from old /etc/modutils/* after showing
  warning, this way update-modules will be backward compatible also on
  images without kernel upgrade

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../update-modules-1.0/update-modules              |   15 +++++++++++++--
 .../update-modules/update-modules_1.0.bb           |    2 +-
 2 files changed, 14 insertions(+), 3 deletions(-)

Patch

diff --git a/meta/recipes-kernel/update-modules/update-modules-1.0/update-modules b/meta/recipes-kernel/update-modules/update-modules-1.0/update-modules
index 7ee7df8..99040a1 100755
--- a/meta/recipes-kernel/update-modules/update-modules-1.0/update-modules
+++ b/meta/recipes-kernel/update-modules/update-modules-1.0/update-modules
@@ -103,8 +103,8 @@  createfile() {
 $HEADER"
 #
 # Please do not edit this file directly. If you want to change or add
-# anything please take a look at the files in /etc/modutils and read
-# the manpage for update-modules.
+# anything please take a look at the files in /etc/modutils, /etc/modules-load.d 
+# and read the manpage for update-modules.
 #
 EOF
 }
@@ -161,6 +161,7 @@  fi
 createfile "$MODCONFTMPFILE"
 createfile "$MODULESTMPFILE"
 
+# well we're using /etc/modprobe.d/*.conf instead of /etc/modutils/*.conf anyway..
 for cfg in /etc/modutils/* $CONF ; do
 	if [ -f "$cfg" ]; then # this check is necesarry to skip /etc/modutils/archs
 		if echo $cfg | grep -q '\.dpkg-[a-z]*\|~$' ; then
@@ -168,6 +169,16 @@  for cfg in /etc/modutils/* $CONF ; do
 		elif echo $cfg | grep -q '\.conf$' ; then
 			addfile "$cfg" "$MODCONFTMPFILE"
 		else
+			echo "Please migrate your $cfg file to /etc/modules-load.d/*.conf"
+			addfile "$cfg" "$MODULESTMPFILE"
+		fi
+	fi
+done
+for cfg in /etc/modules-load.d/*.conf; do
+	if [ -f "$cfg" ]; then # this check is necesarry to skip weird entries
+		if echo $cfg | grep -q '\.dpkg-[a-z]*\|~$' ; then
+		        true
+		else
 			addfile "$cfg" "$MODULESTMPFILE"
 		fi
 	fi
diff --git a/meta/recipes-kernel/update-modules/update-modules_1.0.bb b/meta/recipes-kernel/update-modules/update-modules_1.0.bb
index d9697de..2af75e6 100644
--- a/meta/recipes-kernel/update-modules/update-modules_1.0.bb
+++ b/meta/recipes-kernel/update-modules/update-modules_1.0.bb
@@ -5,7 +5,7 @@  LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYING.GPL;md5=751419260aa954499f7abaabaa
 
 RDEPENDS_${PN} = "module-init-tools-depmod"
 
-PR = "r12"
+PR = "r13"
 
 SRC_URI = "file://update-modules \
            file://COPYING.GPL"