[SM-Commit] GIT changes to test cauldron by Quentin Rameau (1d4b0afda97878119313b43e513efe9971914d28)

Quentin Rameau scm at sourcemage.org
Mon Apr 12 09:50:35 EDT 2010


GIT changes to test cauldron by Quentin Rameau <quinq at sourcemage.org>:

 iso/usr/share/doc/smgl.install/steps/iso-kernel |    2 +-
 iso/usr/share/smgl.install/smgl-kernel          |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 1d4b0afda97878119313b43e513efe9971914d28
Author: Quentin Rameau <quinq at sourcemage.org>
Commit: Quentin Rameau <quinq at sourcemage.org>

    iso/.../smgl.install: new modprobe conf support
    
    iso/usr/share/doc/smgl.install/steps/iso-kernel,
    iso/usr/share/smgl.install/smgl-kernel:
    changed blacklist to blacklist.conf in order to respect modprobe
    configuration files new format.

diff --git a/iso/usr/share/doc/smgl.install/steps/iso-kernel b/iso/usr/share/doc/smgl.install/steps/iso-kernel
index 97deedc..8583b05 100644
--- a/iso/usr/share/doc/smgl.install/steps/iso-kernel
+++ b/iso/usr/share/doc/smgl.install/steps/iso-kernel
@@ -17,6 +17,6 @@ copy all the kernel modules:
  cp -a /lib/modules/$(uname -r) /mnt/root/lib/modules/
 
 you'll probably also want the modprobe blacklist:
- cp /etc/modprobe.d/blacklist /mnt/root/etc/modprobe.d/blacklist
+ cp /etc/modprobe.d/blacklist.conf /mnt/root/etc/modprobe.d/blacklist.conf
 
 Type next to go to the next step.
diff --git a/iso/usr/share/smgl.install/smgl-kernel b/iso/usr/share/smgl.install/smgl-kernel
index d163fb6..7ecb06e 100755
--- a/iso/usr/share/smgl.install/smgl-kernel
+++ b/iso/usr/share/smgl.install/smgl-kernel
@@ -52,8 +52,8 @@ echo "Installing kernel modules to $TARGET/lib/modules/$(uname -r)"
 cp -fr /lib/modules/$(uname -r) "$TARGET"/lib/modules/
 
 [[ ! -d "$TARGET"/etc/modprobe.d ]] && mkdir -p "$TARGET"/etc/modrobe.d
-echo "Installing modprobe blacklist to $TARGET/etc/modprobe.d/blacklist"
-cp -f /etc/modprobe.d/blacklist "$TARGET"/etc/modprobe.d/blacklist
+echo "Installing modprobe blacklist to $TARGET/etc/modprobe.d/blacklist.conf"
+cp -f /etc/modprobe.d/blacklist.conf "$TARGET"/etc/modprobe.d/blacklist.conf
 
 
 # vim:tabstop=2:softtabstop=2:shiftwidth=2:expandtab:ai



More information about the SM-Commit mailing list