[node-patches] Change in ovirt-node[master]: dracut: Fix sourcing of dracut libs

[fabiand at fedoraproject.org]

Fabian Deutsch has uploaded a new change for review.

Change subject: dracut: Fix sourcing of dracut libs
......................................................................

dracut: Fix sourcing of dracut libs

Previoulsy the condition was not robust against renames of the source
file, this is now changed by including the dracut libs if they are
available.

rhbz#917005

Change-Id: Idbcf916b58fc3e1af57a2503270327fefca9c54d
Signed-off-by: Fabian Deutsch <fabiand at fedoraproject.org>
---
M dracut/ovirt-cleanup.sh
1 file changed, 5 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/56/12556/1

diff --git a/dracut/ovirt-cleanup.sh b/dracut/ovirt-cleanup.sh
index 00a949b..80e264f 100755
--- a/dracut/ovirt-cleanup.sh
+++ b/dracut/ovirt-cleanup.sh
@@ -1,7 +1,10 @@
 #!/bin/sh
 
 . /sbin/ovirt-boot-functions
-if [ "$(basename $0)" = "01ovirt-cleanup.sh" ]; then
+
+if [ -f "/lib/dracut-lib.sh" ]
+then
+    # Only source if available (which is only the case in initramfs)
     . /lib/dracut-lib.sh
 fi
 
@@ -157,4 +160,4 @@
 
 IFS=$oldIFS
 
-return 0
+exit 0


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idbcf916b58fc3e1af57a2503270327fefca9c54d
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Fabian Deutsch <fabiand at fedoraproject.org>