base-files: make sure tools are present in sysupgrade ramdisk

[openwrt/openwrt.git] / package / base-files / files / lib / upgrade / stage2

diff --git a/package/base-files/files/lib/upgrade/stage2 b/package/base-files/files/lib/upgrade/stage2
index 74edd61104888fde4d86f42725ef481979d28f74..5e0d73631b0c7383f271c072988a95238a234832 100755 (executable)
--- a/package/base-files/files/lib/upgrade/stage2
+++ b/package/base-files/files/lib/upgrade/stage2
@@ -46,13 +46,19 @@ switch_to_ramfs() {
                ubiupdatevol ubiattach ubiblock ubiformat               \
                ubidetach ubirsvol ubirmvol ubimkvol                    \
                snapshot snapshot_tool date logger                      \
+               /usr/sbin/fw_printenv /usr/bin/fwtool                   \
                $RAMFS_COPY_LOSETUP $RAMFS_COPY_LVM                     \
                $RAMFS_COPY_BIN
        do
                local file="$(command -v "$binary" 2>/dev/null)"
                [ -n "$file" ] && install_bin "$file"
        done
-       install_file /etc/resolv.conf /lib/*.sh /lib/functions/*.sh /lib/upgrade/*.sh /lib/upgrade/do_stage2 /usr/share/libubox/jshn.sh $RAMFS_COPY_DATA
+       install_file /etc/resolv.conf /lib/*.sh /lib/functions/*.sh     \
+               /lib/upgrade/*.sh /lib/upgrade/do_stage2                \
+               /usr/share/libubox/jshn.sh /usr/sbin/fw_setenv          \
+               /etc/fw_env.config $RAMFS_COPY_DATA
+
+       mkdir -p $RAM_ROOT/var/lock
 
        [ -L "/lib64" ] && ln -s /lib $RAM_ROOT/lib64