Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornl6720 <nl6720@gmail.com>2021-12-02 13:22:18 +0200
committernl6720 <nl6720@gmail.com>2021-12-02 13:22:18 +0200
commitbed586442c84579de1d7ac66239d4d3ba8e36764 (patch)
tree1c7f052220f3c384abf64a3589bc5953424fd547
parent499823a569acfc7246da5ffc644486bfbb11cfbc (diff)
hooks/archiso: remove unneeded file system type from _mnt_dev
It was only used because util-linux did not support detecting EROFS and the mount command required `-t erofs` to mount EROFS. util-linux 2.37 supports detecting EROFS; see https://github.com/util-linux/util-linux/commit/7b2a874e2ee306e9503210f8aa5eed7f53c06755. Now that the workaround is not needed anymore, it can be removed.
-rw-r--r--hooks/archiso5
1 files changed, 2 insertions, 3 deletions
diff --git a/hooks/archiso b/hooks/archiso
index 0ba4d07..9391b46 100644
--- a/hooks/archiso
+++ b/hooks/archiso
@@ -113,7 +113,7 @@ _mnt_erofs() {
fi
erofs_dev="$(losetup --find --show --read-only -- "${img}")"
echo "${erofs_dev}" >>/run/archiso/used_block_devices
- _mnt_dev "${erofs_dev}" "${mnt}" "-r" "defaults" "erofs"
+ _mnt_dev "${erofs_dev}" "${mnt}" "-r" "defaults"
}
# args: device, mountpoint, flags, opts
@@ -122,7 +122,6 @@ _mnt_dev() {
local mnt="${2}"
local flg="${3}"
local opts="${4}"
- local fstype="${5:-auto}"
mkdir -p "${mnt}"
@@ -135,7 +134,7 @@ _mnt_dev() {
launch_interactive_shell
done
- if mount -t "${fstype}" -o "${opts}" "${flg}" "${dev}" "${mnt}"; then
+ if mount -o "${opts}" "${flg}" "${dev}" "${mnt}"; then
msg ":: Device '${dev}' mounted successfully."
else
echo "ERROR; Failed to mount '${dev}'"