FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > Debian > Debian User

 
 
LinkBack Thread Tools
 
Old 01-16-2009, 08:46 PM
Chris Lumens
 
Default Fix more problems in expandModuleSet, based on a patch from markmc (#480307).

(1) Remove the extra calls to cat.
(2) Remove an extra paren on the modules.block line.
(3) Use $version instead of $kernel.
---
scripts/mk-images | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/mk-images b/scripts/mk-images
index 631434c..951ca8a 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -261,15 +261,15 @@ expandModuleSet() {
if [ $char = '=' ]; then
NAME=$(echo $name | cut -c2-)
if [ "$NAME" = "ata" ]; then
- SET="$SET $(cat $MBD_DIR/lib/modules/$kernel/modules.block |egrep '(ata|ahci)' |sed -e 's/.ko//')"
+ SET="$SET $(egrep '(ata|ahci)' $MBD_DIR/lib/modules/$version/modules.block |sed -e 's/.ko//')"
elif [ "$NAME" = "scsi" ]; then
- SET="$SET $(cat $MBD_DIR/lib/modules/$kernel/modules.block) |sed -e 's/.ko//')"
+ SET="$SET $(sed -e 's/.ko//' $MBD_DIR/lib/modules/$version/modules.block)"
elif [ "$NAME" = "net" ]; then
- SET="$SET $(cat $MBD_DIR/lib/modules/$kernel/modules.networking) |sed -e 's/.ko//')"
+ SET="$SET $(sed -e 's/.ko//' $MBD_DIR/lib/modules/$version/modules.networking)"
else
# Ignore if group list does not exist
- if [ -e $MBD_DIR/lib/modules/$kernel/modules.$NAME ]; then
- SET="$SET $(cat $MBD_DIR/lib/modules/$kernel/modules.$NAME |sed -e 's/.ko//')"
+ if [ -e $MBD_DIR/lib/modules/$version/modules.$NAME ]; then
+ SET="$SET $(sed -e 's/.ko//' $MBD_DIR/lib/modules/$version/modules.$NAME)"
fi
fi
else
--
1.6.0.3

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
 

Thread Tools




All times are GMT. The time now is 11:10 AM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org