Johannes/ISO
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[archiso] Use _mnt_dev() for SquashFS and dm-mapper

Browse Source 
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
This commit is contained in:
Gerardo Exequiel Pozzi 2012-02-22 19:19:30 -03:00
parent bc4731a0d3
commit 9703564262
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
archiso/hooks/archiso
View File

@ -8,8 +8,6 @@ _mnt_fs() {
local dm_snap_name="${dm_snap_prefix}_${img_name}" local dm_snap_name="${dm_snap_prefix}_${img_name}"
local ro_dev ro_dev_size rw_dev local ro_dev ro_dev_size rw_dev
mkdir -p "${newroot}${mnt}"
ro_dev=$(losetup --find --show "${img}") ro_dev=$(losetup --find --show "${img}")
ro_dev_size=$(blockdev --getsz ${ro_dev}) ro_dev_size=$(blockdev --getsz ${ro_dev})
@ -33,13 +31,8 @@ _mnt_fs() {
echo "0 ${ro_dev_size} snapshot ${ro_dev} ${rw_dev} ${cow_persistent} 8" | dmsetup create ${dm_snap_name} echo "0 ${ro_dev_size} snapshot ${ro_dev} ${rw_dev} ${cow_persistent} 8" | dmsetup create ${dm_snap_name}
msg ":: Mounting '/dev/mapper/${dm_snap_name}' to '${newroot}${mnt}'" _mnt_dev "/dev/mapper/${dm_snap_name}" "${newroot}${mnt}" "-w"
if ! mount "/dev/mapper/${dm_snap_name}" "${newroot}${mnt}" ; then echo "/dev/mapper/${dm_snap_name} ${mnt} auto defaults 0 0" >> ${newroot}/etc/fstab
echo "ERROR: while mounting '/dev/mapper/${dm_snap_name}' to '${newroot}${mnt}'"
launch_interactive_shell
else
echo "/dev/mapper/${dm_snap_name} ${mnt} auto defaults 0 0" >> ${newroot}/etc/fstab
fi
} }
# args: /path/to/image_file, mountpoint # args: /path/to/image_file, mountpoint
@ -48,8 +41,6 @@ _mnt_sfs() {
local mnt="${2}" local mnt="${2}"
local img_fullname="${img##*/}" local img_fullname="${img##*/}"
mkdir -p "${mnt}"
if [[ "${copytoram}" == "y" ]]; then if [[ "${copytoram}" == "y" ]]; then
msg -n ":: Copying squashfs image to RAM..." msg -n ":: Copying squashfs image to RAM..."
if ! cp "${img}" "/run/archiso/copytoram/${img_fullname}" ; then if ! cp "${img}" "/run/archiso/copytoram/${img_fullname}" ; then
@ -59,11 +50,7 @@ _mnt_sfs() {
img="/run/archiso/copytoram/${img_fullname}" img="/run/archiso/copytoram/${img_fullname}"
msg "done." msg "done."
fi fi
msg ":: Mounting '${img}' (SquashFS) to '${mnt}'" _mnt_dev "${img}" "${mnt}" "-r"
if ! mount -r "${img}" "${mnt}" &> /dev/null ; then
echo "ERROR: while mounting '${img}' to '${mnt}'"
launch_interactive_shell
fi
} }
# args: device, mountpoint, flags # args: device, mountpoint, flags