[node-patches] Change in ovirt-node[master]: handle basename missing from kernel image

[mburns at redhat.com]

Hello Fabian Deutsch,

I'd like you to do a code review.  Please visit

    http://gerrit.ovirt.org/10836

to review the following change.

Change subject: handle basename missing from kernel image
......................................................................

handle basename missing from kernel image

basename got removed during the F18 dev cycle, this patch
includes it always in ovirt-node builds

Change-Id: Ia4d79a464c9aefc74b832772bf1eb50317d29a0e
Signed-off-by: Fabian Deutsch <fabiand at fedoraproject.org>
Signed-off-by: Mike Burns <mburns at redhat.com>
---
M dracut/module-setup.sh
M dracut/ovirt-boot-functions
2 files changed, 2 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/36/10836/1

diff --git a/dracut/module-setup.sh b/dracut/module-setup.sh
index e47b1d0..e4569f4 100755
--- a/dracut/module-setup.sh
+++ b/dracut/module-setup.sh
@@ -14,6 +14,8 @@
     inst yes
     inst head
     inst awk
+    inst dirname
+    inst basename
 
     inst_hook pre-pivot 01 "$moddir/ovirt-cleanup.sh"
     inst_simple "$moddir/ovirt-boot-functions" /sbin/ovirt-boot-functions
diff --git a/dracut/ovirt-boot-functions b/dracut/ovirt-boot-functions
index d59133b..67135d8 100644
--- a/dracut/ovirt-boot-functions
+++ b/dracut/ovirt-boot-functions
@@ -4,14 +4,6 @@
 SEP=','
 TAB=$'\t'
 
-dirname() {
-    if [ -e /usr/bin/dirname ]; then
-        /usr/bin/dirname $@
-    else
-        echo $1 | sed 's/\/'$(basename $1)'$//'
-    fi
-}
-
 # compat function to handle different udev versions
 udev_info() {
     local name=$1


--
To view, visit http://gerrit.ovirt.org/10836
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia4d79a464c9aefc74b832772bf1eb50317d29a0e
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Michael Burns <mburns at redhat.com>
Gerrit-Reviewer: Fabian Deutsch <fabiand at fedoraproject.org>