use busybox tftp for file download
diff --git a/bin/download_manager.py b/bin/download_manager.py
index 74449a3..2a4cab9 100755
--- a/bin/download_manager.py
+++ b/bin/download_manager.py
@@ -5,7 +5,6 @@
import dbus
import dbus.service
import dbus.mainloop.glib
-import tftpy
import Openbmc
if (len(sys.argv) < 2):
print "Usage: download_manager.py [system name]"
@@ -35,14 +34,13 @@
def DownloadHandler(self,url,filename,path = None):
try:
filename = str(filename)
- client = tftpy.TftpClient(url, TFTP_PORT)
print "Downloading: "+filename+" from "+url
outfile = System.FLASH_DOWNLOAD_PATH+"/"+filename
- client.download(filename,outfile)
+ subprocess.call(["tftp", "-l",outfile,"-r",filename,"-g",url])
obj = bus.get_object("org.openbmc.control.Flash",path)
intf = dbus.Interface(obj,"org.openbmc.Flash")
intf.update(outfile)
-
+
except Exception as e:
print "ERROR DownloadManager: "+str(e)
obj = bus.get_object("org.openbmc.control.Flash",path)
diff --git a/objects/flash_bios_obj.c b/objects/flash_bios_obj.c
index 319cd84..bbd1c55 100644
--- a/objects/flash_bios_obj.c
+++ b/objects/flash_bios_obj.c
@@ -165,6 +165,12 @@
printf("Flash Done. Clearing locks\n");
shared_resource_set_lock(lock,false);
shared_resource_set_name(lock,"");
+ const gchar* filename = flash_get_filename(flash);
+ rc = unlink(filename);
+ if (rc != 0 )
+ {
+ printf("ERROR: Unable to delete file %s (%d)\n",filename,rc);
+ }
return TRUE;
}