Skip to content

Commit

Permalink
base-files: sysupgrade stage2: fix losetup detection
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
dangowrt committed Aug 3, 2021
1 parent 022d1fe commit af76e26
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion package/base-files/files/lib/upgrade/stage2
Expand Up @@ -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 \
Expand Down

0 comments on commit af76e26

Please sign in to comment.