From: Elan Ruusamäe <glen@pld-linux.org>
Date: Tue, 17 Oct 2006 22:22:42 +0000 (+0000)
Subject: Drop my_dirname (pointless).
X-Git-Tag: 8360~79
X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=87d21026de47f94c998237f3fc5764e83bf7faca;p=projects%2Fgeninitrd.git

Drop my_dirname (pointless).

svn-id: @7858
---

diff --git a/geninitrd b/geninitrd
index 34d1b4e..68ccdaf 100755
--- a/geninitrd
+++ b/geninitrd
@@ -65,10 +65,6 @@ usage () {
 }
 
 
-my_dirname() {
-	echo $1|awk -F/ '{print substr($0, 0, length($0) - length($NF));}'
-}
-
 find_depmod () {
 	typeset mods module f level depfile first
 
@@ -698,7 +694,7 @@ modules_install() {
 	modules="$1"
 
 	for mod in $modules; do
-		MODULEDIR="`my_dirname "$mod"`"
+		MODULEDIR="`dirname "$mod"`"
 		mkdir -p "$MNTIMAGE/lib/modules/$kernel/$MODULEDIR"
 		cp $verbose -a "/lib/modules/$kernel/$mod" "$MNTIMAGE/lib/modules/$kernel/$mod"
 		gunzip "$MNTIMAGE/lib/modules/$kernel/$mod" 2> /dev/null
@@ -710,7 +706,7 @@ modules_add_linuxrc() {
 	linuxrc="$2"
 
 	for mod in $modules; do
-		MODULE2="`my_dirname "$mod"`"
+		MODULE2="`dirname "$mod"`"
 		NAME2=`basename "$mod" .gz`
 		MODULE2=$MODULE2/$NAME2
 		module="`echo $mod | awk -F/ '{ $0=$NF } /'$modext'.*$/ { gsub(/'$modext'.*/, NIL, $0); } { print $0; }'`"
@@ -1236,7 +1232,7 @@ initrd_gen_softraid() {
 
 		for f in $cr_dev_list $cr_rootdev $dev_list_extra; do
 			# mkdir in case of devfs name
-			mkdir -p $MNTIMAGE/`my_dirname $f`
+			mkdir -p $MNTIMAGE/`dirname $f`
 			[ -e "$MNTIMAGE/$f" ] && continue
 			[ -n "$verbose" ] && echo "copying $f"
 			# this works fine with and without devfs