Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archiso
diff options
context:
space:
mode:
authorGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2012-01-05 17:58:12 -0300
committerGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2012-01-05 17:58:12 -0300
commit36f327c6d45bf739587e89fa102e5beb400b6281 (patch)
tree38a5d1019b1436ecf5e72514266689d17162e4c9 /archiso
parent2b211a90172374607c901064ce155f32b1a14fec (diff)
[archiso] simplify _mnt_fs() and _mnt_sfs()
mount is now from util-linux (like in e135003c13aef15abc78562a3ab17fa41c0330cc) Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
Diffstat (limited to 'archiso')
-rw-r--r--archiso/hooks/archiso10
1 files changed, 4 insertions, 6 deletions
diff --git a/archiso/hooks/archiso b/archiso/hooks/archiso
index 7012343..2635a4c 100644
--- a/archiso/hooks/archiso
+++ b/archiso/hooks/archiso
@@ -30,15 +30,13 @@ _mnt_fs() {
local img_fullname="${img##*/}";
local img_name="${img_fullname%%.*}"
local dm_snap_name="${dm_snap_prefix}_${img_name}"
- local ro_dev ro_dev_size ro_dev_fs_type rw_dev
+ local ro_dev ro_dev_size rw_dev
mkdir -p "${newroot}${mnt}"
_next_loop_dev
ro_dev=$(_make_loop_dev "${img}")
ro_dev_size=$(blockdev --getsz ${ro_dev})
- ro_dev_fs_type=$(blkid -o value -s TYPE -p ${ro_dev} 2> /dev/null)
-
if [[ "${cow_persistent}" == "P" ]]; then
if [[ -f "/run/archiso/cowspace/${cow_directory}/${img_name}.cow" ]]; then
@@ -61,8 +59,8 @@ _mnt_fs() {
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}' (${ro_dev_fs_type}) to '${newroot}${mnt}'"
- if ! mount -t "${ro_dev_fs_type}" "/dev/mapper/${dm_snap_name}" "${newroot}${mnt}" ; then
+ msg ":: Mounting '/dev/mapper/${dm_snap_name}' to '${newroot}${mnt}'"
+ if ! mount "/dev/mapper/${dm_snap_name}" "${newroot}${mnt}" ; then
echo "ERROR: while mounting '/dev/mapper/${dm_snap_name}' to '${newroot}${mnt}'"
launch_interactive_shell
else
@@ -89,7 +87,7 @@ _mnt_sfs() {
fi
_next_loop_dev
msg ":: Mounting '${img}' (SquashFS) to '${mnt}'"
- if ! mount -r -t squashfs $(_make_loop_dev "${img}") "${mnt}" &> /dev/null ; then
+ if ! mount -r $(_make_loop_dev "${img}") "${mnt}" &> /dev/null ; then
echo "ERROR: while mounting '${img}' to '${mnt}'"
launch_interactive_shell
fi