diff options
| author | Daniel Golle <daniel@makrotopia.org> | 2021-08-02 20:51:58 +0200 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2021-08-03 18:28:44 +0100 |
| commit | af76e26b557270307e05be168c3b9463886306f1 (patch) | |
| tree | 0f1fc7d5148a14072c039c59f6cc8acba0beb6ff | |
| parent | 022d1fe80f0bda01cbda62f29ee6f58b8dc0ae37 (diff) | |
| download | openwrt-af76e26b557270307e05be168c3b9463886306f1.tar.gz openwrt-af76e26b557270307e05be168c3b9463886306f1.tar.bz2 openwrt-af76e26b557270307e05be168c3b9463886306f1.zip | |
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 <fda77@users.noreply.github.com>
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
| -rwxr-xr-x | package/base-files/files/lib/upgrade/stage2 | 2 |
1 files changed, 1 insertions, 1 deletions
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() { # <new_root> <old_root> } 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 \ |