From: Harald Hoyer <harald@redhat.com>
Date: Tue, 7 Feb 2012 16:45:03 +0000 (+0100)
Subject: 90btrfs/btrfs_finished.sh: put check in a function
X-Git-Tag: 015~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=204db8a134e74af203021de77033b95ee800a0ea;p=thirdparty%2Fdracut.git

90btrfs/btrfs_finished.sh: put check in a function
---

diff --git a/modules.d/90btrfs/btrfs_finished.sh b/modules.d/90btrfs/btrfs_finished.sh
index ba65bfd26..7e87dec72 100755
--- a/modules.d/90btrfs/btrfs_finished.sh
+++ b/modules.d/90btrfs/btrfs_finished.sh
@@ -4,19 +4,21 @@
 
 type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
 
-dev="${1:-/dev/root}"
-
-[ -e "$dev" ] && {
-    local rootinfo;
-    rootinfo=$(udevadm info --query=env "--name=$dev" 2>/dev/null)
-    if strstr "$rootinfo" "ID_FS_TYPE=btrfs"; then
+btrfs_check_complete() {
+    local _rootinfo _dev
+    _dev="${1:-/dev/root}"
+    [ -e "$_dev" ] || return 0
+    _rootinfo=$(udevadm info --query=env "--name=$_dev" 2>/dev/null)
+    if strstr "$_rootinfo" "ID_FS_TYPE=btrfs"; then
         info "Checking, if btrfs device complete"
         unset __btrfs_mount
-        mount -o ro "$dev" /tmp >/dev/null 2>&1
+        mount -o ro "$_dev" /tmp >/dev/null 2>&1
         __btrfs_mount=$?
-        [ $__btrfs_mount -eq 0 ] && umount "$dev" >/dev/null 2>&1
-        exit $__btrfs_mount
+        [ $__btrfs_mount -eq 0 ] && umount "$_dev" >/dev/null 2>&1
+        return $__btrfs_mount
     fi
+    return 0
 }
 
-exit 0
+btrfs_check_complete $1
+exit $?