From: Daniel Golle Date: Mon, 2 Aug 2021 18:51:58 +0000 (+0200) Subject: base-files: sysupgrade stage2: fix losetup detection X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=af76e26b557270307e05be168c3b9463886306f1;p=openwrt%2Fstaging%2Fjow.git base-files: sysupgrade stage2: fix losetup detection If the busybox applet losetup was selected, `command -v` selects that during sysupgrade. As this applet is in another path and doesn't cover the '-D' option which is used to make sure user-defined loop devices are no longer active during sysupgrade. Detect losetup at the path of the full utility to avoid error messages in case of the busybox applet being selected. Reported-by: fda77 Signed-off-by: Daniel Golle --- diff --git a/package/base-files/files/lib/upgrade/stage2 b/package/base-files/files/lib/upgrade/stage2 index 13c3622f38..30ad19f7f1 100755 --- a/package/base-files/files/lib/upgrade/stage2 +++ b/package/base-files/files/lib/upgrade/stage2 @@ -33,7 +33,7 @@ supivot() { # } switch_to_ramfs() { - RAMFS_COPY_LOSETUP="$(command -v losetup)" + RAMFS_COPY_LOSETUP="$(command -v /usr/sbin/losetup)" RAMFS_COPY_LVM="$(command -v lvm)" for binary in \