mkinitrd unification across distributions
 help / color / mirror / Atom feed
From: Dave Young <dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
To: initramfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	harald-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org,
	vgoyal-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org,
	chaowang-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org,
	kzak-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org
Subject: [PATCH 2/2 v2] use lib function ismounted in convertfs module
Date: Mon, 17 Sep 2012 18:01:10 +0800	[thread overview]
Message-ID: <20120917100110.GA18642@darkstar.nay.redhat.com> (raw)


convertfs module use a private function of ismounted(), this is
duplicate of the one in dracut-lib.sh.

Change to use global ismounted

Signed-off-by: Dave Young <dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
 modules.d/30convertfs/convertfs.sh |    9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

--- dracut.orig/modules.d/30convertfs/convertfs.sh
+++ dracut/modules.d/30convertfs/convertfs.sh
@@ -9,6 +9,8 @@ if [[ ! -d "$ROOT" ]]; then
     exit 1
 fi
 
+type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
+
 if [[ "$ROOT" -ef / ]]; then
     echo "Can't convert the running system."
     echo "Please boot with 'rd.convertfs' on the kernel command line,"
@@ -73,13 +75,6 @@ if [[ ! -e "$testfile" ]]; then
 fi
 rm -f "$testfile"
 
-ismounted() {
-    while read a m a; do
-        [[ "$m" = "$1" ]] && return 0
-    done < /proc/mounts
-    return 1
-}
-
 # clean up after ourselves no matter how we die.
 cleanup() {
     echo "Something failed. Move back to the original state"

             reply	other threads:[~2012-09-17 10:01 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-17 10:01 Dave Young [this message]
     [not found] ` <20120917100110.GA18642-4/PLUo9XfK+sDdueE5tM26fLeoKvNuZc@public.gmane.org>
2012-09-20  8:38   ` [PATCH 2/2 v2] use lib function ismounted in convertfs module Harald Hoyer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20120917100110.GA18642@darkstar.nay.redhat.com \
    --to=dyoung-h+wxahxf7alqt0dzr+alfa@public.gmane.org \
    --cc=chaowang-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
    --cc=harald-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
    --cc=initramfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=kzak-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
    --cc=vgoyal-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox