From: Harald Hoyer <harald-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
To: Will Woods <wwoods-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
Cc: initramfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: Re: [PATCH] dmsquash-live: use 'rootfs.img' for rootfs image name
Date: Mon, 14 Mar 2011 16:31:11 +0100 [thread overview]
Message-ID: <4D7E34BF.1070805@redhat.com> (raw)
In-Reply-To: <1299878949-27941-1-git-send-email-wwoods-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
Am 11.03.2011 22:29, schrieb Will Woods:
> Every image gets handled the same way regardless of filesystem, so
> let's use a filesystem-neutral name (rather than adding new
> lines for every fstype anyone might want to use).
> ---
> modules.d/90dmsquash-live/dmsquash-live-root | 10 +++++-----
> 1 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/modules.d/90dmsquash-live/dmsquash-live-root b/modules.d/90dmsquash-live/dmsquash-live-root
> index 06893d5..16262b6 100755
> --- a/modules.d/90dmsquash-live/dmsquash-live-root
> +++ b/modules.d/90dmsquash-live/dmsquash-live-root
> @@ -48,7 +48,7 @@ if [ -f $livedev ]; then
> # no mount needed - we've already got the LiveOS image in initramfs
> case $livedev in
> *squashfs.img) SQUASHED=$livedev ;;
> - *ext3fs.img|*btrfs.img) FSIMG=$livedev ;;
> + *ext3fs.img|*rootfs.img) FSIMG=$livedev ;;
> esac
> else
> mount -n -t $fstype -o $liverw $livedev /dev/.run/initramfs/live
> @@ -135,8 +135,8 @@ fi
> # we might have an embedded fs image to use as rootfs (uncompressed live)
> if [ -e /dev/.run/initramfs/live/${live_dir}/ext3fs.img ]; then
> FSIMG="/dev/.run/initramfs/live/${live_dir}/ext3fs.img"
> -elif [ -e /dev/.run/initramfs/live/${live_dir}/btrfs.img ]; then
> - FSIMG="/dev/.run/initramfs/live/${live_dir}/btrfs.img"
> +elif [ -e /dev/.run/initramfs/live/${live_dir}/rootfs.img ]; then
> + FSIMG="/dev/.run/initramfs/live/${live_dir}/rootfs.img"
> fi
>
> if [ -n "$FSIMG" ] ; then
> @@ -170,8 +170,8 @@ if [ -e "$SQUASHED" ] ; then
> BASE_LOOPDEV=$( losetup -f )
> if [ -f /squashfs/LiveOS/ext3fs.img ]; then
> losetup -r $BASE_LOOPDEV /squashfs/LiveOS/ext3fs.img
> - elif [ -f /squashfs/LiveOS/btrfs.img ]; then
> - losetup -r $BASE_LOOPDEV /squashfs/LiveOS/btrfs.img
> + elif [ -f /squashfs/LiveOS/rootfs.img ]; then
> + losetup -r $BASE_LOOPDEV /squashfs/LiveOS/rootfs.img
> fi
>
> umount -l /squashfs
pushed
prev parent reply other threads:[~2011-03-14 15:31 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-11 21:29 [PATCH] dmsquash-live: use 'rootfs.img' for rootfs image name Will Woods
[not found] ` <1299878949-27941-1-git-send-email-wwoods-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2011-03-14 15:31 ` Harald Hoyer [this message]
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=4D7E34BF.1070805@redhat.com \
--to=harald-h+wxahxf7alqt0dzr+alfa@public.gmane.org \
--cc=initramfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=wwoods-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