ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-30 02:29:01 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

base-files: sysupgrade stage2: fix losetup detection

Browse Source 
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>
This commit is contained in:
Daniel Golle 2021-08-02 20:51:58 +02:00
parent 022d1fe80f
commit af76e26b55
No known key found for this signature in database
GPG Key ID: 5A8F39C31C3217CA
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/base-files/files/lib/upgrade/stage2
View File

@ -33,7 +33,7 @@ supivot() { # <new_root> <old_root>
} }
switch_to_ramfs() { switch_to_ramfs() {
RAMFS_COPY_LOSETUP="$(command -v losetup)" RAMFS_COPY_LOSETUP="$(command -v /usr/sbin/losetup)"
RAMFS_COPY_LVM="$(command -v lvm)" RAMFS_COPY_LVM="$(command -v lvm)"
for binary in \ for binary in \