Commit cbf1f9d4 authored by Raphaël Hertzog's avatar Raphaël Hertzog

Some fixups to ensure we work with busybox/klibc-utils

Now that the PATH is sane again, no need to hardcode the path of many
tools.

Also it means that we use busybox/klibc-utils's mount and we should thus
aim to use a syntax that work with both of them. We thus use "mount -o
move" instead of "mount --move", and "mount -o bind" instead of "mount
--bind".
parent 3d23fcaf
......@@ -455,7 +455,7 @@ is_supported_fs ()
get_fstype ()
{
/sbin/blkid -s TYPE -o value $1 2>/dev/null
blkid -s TYPE -o value $1 2>/dev/null
}
where_is_mounted ()
......@@ -513,7 +513,7 @@ base_path ()
{
testpath="${1}"
mounts="$(awk '{print $2}' /proc/mounts)"
testpath="$(busybox realpath ${testpath})"
testpath="$(realpath ${testpath})"
while true
do
......@@ -631,7 +631,7 @@ setup_loop ()
echo "${passphrase}" > /tmp/passphrase
unset passphrase
exec 9</tmp/passphrase
/sbin/losetup ${options} -e "${encryption}" -p 9 "${dev}" "${fspath}"
losetup ${options} -e "${encryption}" -p 9 "${dev}" "${fspath}"
error=${?}
exec 9<&-
rm -f /tmp/passphrase
......@@ -738,7 +738,7 @@ mount_persistence_media ()
fi
elif [ "${backing}" != "${old_backing}" ]
then
if ! mount --move ${old_backing} ${backing} >/dev/null
if ! mount -o move ${old_backing} ${backing} >/dev/null
then
[ -z "${probe}" ] && log_warning_msg "Failed to move persistence media ${device}"
rmdir "${backing}"
......@@ -778,7 +778,7 @@ close_persistence_media ()
if is_active_luks_mapping ${device}
then
/sbin/cryptsetup luksClose ${device}
cryptsetup luksClose ${device}
fi
}
......@@ -792,7 +792,7 @@ open_luks_device ()
opts="${opts} --readonly"
fi
if /sbin/cryptsetup status "${name}" >/dev/null 2>&1
if cryptsetup status "${name}" >/dev/null 2>&1
then
re="^[[:space:]]*device:[[:space:]]*\([^[:space:]]*\)$"
opened_dev=$(cryptsetup status ${name} 2>/dev/null | grep "${re}" | sed "s|${re}|\1|")
......@@ -833,7 +833,7 @@ open_luks_device ()
while true
do
$cryptkeyscript "$cryptkeyprompt" | \
/sbin/cryptsetup -T 1 luksOpen ${dev} ${name} ${opts}
cryptsetup -T 1 luksOpen ${dev} ${name} ${opts}
if [ 0 -eq ${?} ]
then
......@@ -874,14 +874,14 @@ get_gpt_name ()
{
local dev
dev="${1}"
/sbin/blkid -s PART_ENTRY_NAME -p -o value ${dev} 2>/dev/null
blkid -s PART_ENTRY_NAME -p -o value ${dev} 2>/dev/null
}
is_gpt_device ()
{
local dev
dev="${1}"
[ "$(/sbin/blkid -s PART_ENTRY_SCHEME -p -o value ${dev} 2>/dev/null)" = "gpt" ]
[ "$(blkid -s PART_ENTRY_SCHEME -p -o value ${dev} 2>/dev/null)" = "gpt" ]
}
probe_for_gpt_name ()
......@@ -921,7 +921,7 @@ probe_for_fs_label ()
for label in ${overlays}
do
if [ "$(/sbin/blkid -s LABEL -o value $dev 2>/dev/null)" = "${label}" ]
if [ "$(blkid -s LABEL -o value $dev 2>/dev/null)" = "${label}" ]
then
echo "${label}=${dev}"
fi
......@@ -1114,7 +1114,7 @@ find_persistence_media ()
# Close luks device if it isn't used
if [ -z "${result}" ] && [ -n "${luks_device}" ] && is_active_luks_mapping "${luks_device}"
then
/sbin/cryptsetup luksClose "${luks_device}"
cryptsetup luksClose "${luks_device}"
fi
done
......@@ -1145,13 +1145,13 @@ get_mac ()
is_luks_partition ()
{
device="${1}"
/sbin/cryptsetup isLuks "${device}" 1>/dev/null 2>&1
cryptsetup isLuks "${device}" 1>/dev/null 2>&1
}
is_active_luks_mapping ()
{
device="${1}"
/sbin/cryptsetup status "${device}" 1>/dev/null 2>&1
cryptsetup status "${device}" 1>/dev/null 2>&1
}
get_luks_backing_device ()
......@@ -1590,7 +1590,7 @@ activate_custom_mounts ()
do_union ${dest} ${source} ${rootfs_dest_backing}
elif [ -n "${opt_bind}" ] && [ -z "${PERSISTENCE_READONLY}" ]
then
mount --bind "${source}" "${dest}"
mount -o bind "${source}" "${dest}"
elif [ -n "${opt_bind}" -o -n "${opt_union}" ] && [ -n "${PERSISTENCE_READONLY}" ]
then
# bind-mount and union mount are handled the same
......
......@@ -274,7 +274,7 @@ setup_unionfs ()
panic "only one RO file system supported with exposedroot: ${rootfslist}"
fi
mount --bind ${rootfs} ${rootmnt} || \
mount -o bind ${rootfs} ${rootmnt} || \
panic "bind mount of ${rootfs} failed"
if [ -z "${SKIP_UNION_MOUNTS}" ]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment