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

[archiso] simplify _mnt_dev() (mount is now from util-linux)

Browse Source 
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
This commit is contained in:
Gerardo Exequiel Pozzi 2011-11-28 10:35:05 -03:00
parent baf0ae0013
commit e135003c13
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

@ -98,8 +98,6 @@ _mnt_dev() {
local mnt="${2}" local mnt="${2}"
local flg="${3}" local flg="${3}"
local fstype fserror
mkdir -p "${mnt}" mkdir -p "${mnt}"
msg ":: Mounting '${dev}' to '${mnt}'" msg ":: Mounting '${dev}' to '${mnt}'"
@ -111,21 +109,10 @@ _mnt_dev() {
launch_interactive_shell launch_interactive_shell
done done
fstype=$(blkid -o value -s TYPE -p "${dev}" 2> /dev/null) if mount "${flg}" "${dev}" "${mnt}"; then
if [[ -n "${fstype}" ]]; then msg ":: Device '${dev}' mounted successfully."
if mount ${flg} -t "${fstype}" "${dev}" "${mnt}"; then
msg ":: Device '${dev}' mounted successfully."
fserror=0
else
echo "ERROR; Failed to mount '${dev}' (FS is ${fstype})"
fserror=1
fi
else else
echo "ERROR: '${dev}' found, but the filesystem type is unknown." echo "ERROR; Failed to mount '${dev}'"
fserror=1
fi
if [[ ${fserror} -eq 1 ]]; then
echo " Falling back to interactive prompt" echo " Falling back to interactive prompt"
echo " You can try to fix the problem manually, log out when you are finished" echo " You can try to fix the problem manually, log out when you are finished"
launch_interactive_shell launch_interactive_shell