Hmm, I want the convertfs.sh script to be dracut independent, so other it can be
used as a standalone script for the conversion.
Am 17.09.2012 12:01, schrieb Dave Young:
>
> 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@xxxxxxxxxx>
> ---
> 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"
>
--
To unsubscribe from this list: send the line "unsubscribe initramfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
