Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-rc-0.8 grimoire by Jaka Kranjc (f4b0b15efa384ad329dcab1443a191ff1f5fea81)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-rc-0.8 grimoire by Jaka Kranjc (f4b0b15efa384ad329dcab1443a191ff1f5fea81)
  • Date: Mon, 12 Mar 2007 11:31:36 -0500

GIT changes to stable-rc-0.8 grimoire by Jaka Kranjc
<lynxlynxlynx AT sourcemage.org>:

kernels/module-init-tools/HISTORY | 6 +++++
kernels/module-init-tools/INSTALL | 36
++++++++++++++++++--------------
kernels/module-init-tools/modprobe.conf | 1
3 files changed, 28 insertions(+), 15 deletions(-)

New commits:
commit f4b0b15efa384ad329dcab1443a191ff1f5fea81
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

module-init-tools: install default modprobe.conf to fix #13446
(cherry picked from commit 8440311ed371bd993b9b1686c83ee17f4e2131ef)

diff --git a/kernels/module-init-tools/HISTORY
b/kernels/module-init-tools/HISTORY
index 5fe2345..6f2c764 100644
--- a/kernels/module-init-tools/HISTORY
+++ b/kernels/module-init-tools/HISTORY
@@ -1,3 +1,9 @@
+2007-03-11 Juuso Alasuutari <iuso AT sourcemage.org>
+ * PREPARE: Deleted (removal was scheduled for during stable-0.7).
+ * INSTALL: Install default modprobe.conf to include modprobe.d,
+ fixes #13446.
+ * modprobe.conf: Added.
+
2007-02-22 Treeve Jelbert <treeve AT pi.be>
* DETAILS: version 3.3-pre10

diff --git a/kernels/module-init-tools/INSTALL
b/kernels/module-init-tools/INSTALL
index d00f468..8897ff6 100755
--- a/kernels/module-init-tools/INSTALL
+++ b/kernels/module-init-tools/INSTALL
@@ -1,23 +1,29 @@
-mkdir -p $INSTALL_ROOT/lib/modules &&
-make_normal &&
+mkdir -p "$INSTALL_ROOT/lib/modules" &&
+make_normal &&

-if [ $OLD_TOO == y ] ; then
- cd $SOURCE_DIRECTORY2 &&
- make install DESTDIR=$INSTALL_ROOT &&
- mkdir -p ${INSTALL_ROOT}/etc/modules.d &&
- touch ${INSTALL_ROOT}/etc/modules &&
- touch ${INSTALL_ROOT}/etc/modules.conf &&
- cd $SOURCE_DIRECTORY &&
- rm_source_dir $SOURCE_DIRECTORY2 &&
- if ! [[ $INSTALL_ROOT ]] ; then
+if [[ $OLD_TOO == y ]]
+then
+ cd "$SOURCE_DIRECTORY2" &&
+ make install DESTDIR="$INSTALL_ROOT" &&
+ mkdir -p "$INSTALL_ROOT/etc/modules.d" &&
+ touch "$INSTALL_ROOT/etc/modules" &&
+ touch "$INSTALL_ROOT/etc/modules.conf" &&
+ cd "$SOURCE_DIRECTORY" &&
+ rm_source_dir "$SOURCE_DIRECTORY2" &&
+ if [[ -z $INSTALL_ROOT ]]
+ then
make moveold
fi
fi &&

-make install DESTDIR=$INSTALL_ROOT &&
+make install DESTDIR="$INSTALL_ROOT" &&

-if [ $OLD_TOO == y ] && ! [[ $INSTALL_ROOT ]] ; then
- ./generate-modprobe.conf ${INSTALL_ROOT}/etc/modprobe.conf
+if [[ $OLD_TOO == y ]] && [[ -z $INSTALL_ROOT ]]
+then
+ ./generate-modprobe.conf /etc/modprobe.conf
fi &&

-install_config_file modprobe.devfs ${INSTALL_ROOT}/etc/modprobe.devfs
+install_config_file "$SCRIPT_DIRECTORY/modprobe.conf" \
+ "$INSTALL_ROOT/etc/modprobe.conf" &&
+install_config_file modprobe.devfs \
+ "$INSTALL_ROOT/etc/modprobe.devfs"
diff --git a/kernels/module-init-tools/modprobe.conf
b/kernels/module-init-tools/modprobe.conf
new file mode 100644
index 0000000..72e3bc9
--- /dev/null
+++ b/kernels/module-init-tools/modprobe.conf
@@ -0,0 +1 @@
+include /etc/modprobe.d/



  • [SM-Commit] GIT changes to stable-rc-0.8 grimoire by Jaka Kranjc (f4b0b15efa384ad329dcab1443a191ff1f5fea81), Jaka Kranjc, 03/12/2007

Archive powered by MHonArc 2.6.24.

Top of Page