kernel
/
dracut
mirror of https://git.kernel.org/pub/scm/boot/dracut/dracut.git/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

dmsquash-live: use 'rootfs.img' for rootfs image name 

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).
master
Will Woods 2011-03-11 16:29:09 -05:00 committed by Harald Hoyer
parent 6927f09e1c
commit fe17f4e86b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules.d/90dmsquash-live/dmsquash-live-root
View File

@ -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