Drop my_dirname (pointless).

svn-id: @7858

diff --git a/geninitrd b/geninitrd
index 34d1b4ef276b7081656112900542679f2e98d352..68ccdaf3952eee197398f365ad775709d9bf1f82 100755 (executable)
--- 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