Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to test cauldron by Justin Boffemmyer (3a204fa1e9da90b965366523bc39e73773dd6f74)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Justin Boffemmyer <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to test cauldron by Justin Boffemmyer (3a204fa1e9da90b965366523bc39e73773dd6f74)
  • Date: Sun, 13 Sep 2009 09:42:55 -0500

GIT changes to test cauldron by Justin Boffemmyer <flux AT sourcemage.org>:

scripts/add-sauce.sh | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 3a204fa1e9da90b965366523bc39e73773dd6f74
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

scripts/add-sauce.sh: suffix .conf to blacklist

Add the .conf suffix to the module blacklist file. Cleaned up the
blacklisting code a little as well to hardcode less (more robust). This
fixes bug #15390.

diff --git a/scripts/add-sauce.sh b/scripts/add-sauce.sh
index df56de6..6fa1560 100755
--- a/scripts/add-sauce.sh
+++ b/scripts/add-sauce.sh
@@ -84,14 +84,19 @@ fi >&2
function blacklist_modules {
local SRC="${1%/}"
local DEST="${2%/}"
+ local BLACKLIST="$DEST/etc/modprobe.d/blacklist.conf"

+
+ # ensure that both the source and destination variables are directories
[[ ! -d "$SRC" || ! -d "$DEST" ]] && return 3
- mkdir -p "$DEST"/etc/modprobe.d
+
+ # ensure that the destination modprobe.d directory hierarchy exists
+ mkdir -p "${BLACKLISTi%/*}"

find "$SRC" -name "*.ko" |
sed 's#^.*/##' |
sed 's#^\(.*\)\.ko$#install \1 /bin/true#' |
- sort >> "$DEST"/etc/modprobe.d/blacklist
+ sort >> "$BLACKLIST"
}

if [[ $TYPE == "iso" ]] ;then




Archive powered by MHonArc 2.6.24.

Top of Page