Revised sysupgrade part 1

[project/luci.git] / libs / sys / luasrc / sys / mtdow.lua

diff --git a/libs/sys/luasrc/sys/mtdow.lua b/libs/sys/luasrc/sys/mtdow.lua
index f464558..7c03845 100644 (file)
--- a/libs/sys/luasrc/sys/mtdow.lua
+++ b/libs/sys/luasrc/sys/mtdow.lua
@@ -44,7 +44,7 @@ EmulatedWriter.blocks = {
        image = {
                magic = "eb48",
                device = "/dev/hda",
-               write = WRITE_SEPARATELY
+               write = WRITE_EMULATED
        }
 }
 
@@ -63,7 +63,7 @@ CFEWriter.blocks = {
        image = {
                magic = {"4844", "5735"},
                device = "linux",
-               write = WRITE_COMBINED
+               write = WRITE_IMAGE
        }
 }
 
@@ -159,16 +159,16 @@ end
 
 function Writer._find_mtdblock(self, mtdname)
        local k
-       local prefix = "/dev/mtdblock"
+       local prefix = "/dev/mtd"
        prefix = prefix .. (fs.stat(prefix) and "/" or "")
        
        for l in io.lines("/proc/mtd") do
-               local k = l:match('([%w-_]+):.*-"%s"' % mtdname)
+               local k = l:match('mtd([%%w-_]+):.*"%s"' % mtdname)
                if k then return prefix..k end
        end
 end
 
-function Write._write_emulated(self, devicename, imagestream, appendfile)
+function Writer._write_emulated(self, devicename, imagestream, appendfile)
        local stat = (self:_write_memory(device, imagestream) == 0)
        stat = stat and (self:_refresh_block("rootfs") == 0)
        local squash = self:_find_mtdblock("rootfs_data")
@@ -181,47 +181,53 @@ function Write._write_emulated(self, devicename, imagestream, appendfile)
 end
 
 function Writer._write_memory(self, devicename, imagestream)
-       local devicestream = ltn12.sink.file(io.open(devicename, "w"))
-       local stat, err = ltn12.pump.all(imagestream, devicestream)
-       if stat then
-               return os.execute("sync")
+       local imageproc = posix.fork()
+       assert(imageproc ~= -1, ERROR_RESOURCE)
+       if imageproc == 0 then
+               fs.unlink(self.IMAGEFIFO)
+               assert(posix.mkfifo(self.IMAGEFIFO), ERROR_RESOURCE)
+               local imagefifo = io.open(self.IMAGEFIFO, "w")
+               assert(imagefifo, ERROR_RESOURCE)
+               ltn12.pump.all(imagestream, ltn12.sink.file(imagefifo))
+               os.exit(0)
        end
+       
+       return os.execute( 
+               "%s write '%s' '%s' >/dev/null 2>&1" % {
+               self.MTD, self.IMAGEFIFO, devicename
+               }
+       )       
 end
 
 function Writer._write_combined(self, devicename, imagestream, appendfile)
-       assert(fs.copy(self.MTD, self.SAFEMTD), ERROR_INTERNAL)
-       assert(posix.mkfifo(self.IMAGEFIFO), ERROR_RESOURCE)
-       
-       local imagefifo = io.open(self.IMAGEFIFO, "w")
-       
-       assert(imagefifo, ERROR_RESOURCE)
-       
        local imageproc = posix.fork()
        assert(imageproc ~= -1, ERROR_RESOURCE)
        if imageproc == 0 then
+               fs.unlink(self.IMAGEFIFO)
+               assert(posix.mkfifo(self.IMAGEFIFO), ERROR_RESOURCE)
+               local imagefifo = io.open(self.IMAGEFIFO, "w")
+               assert(imagefifo, ERROR_RESOURCE)
                ltn12.pump.all(imagestream, ltn12.sink.file(imagefifo))
                os.exit(0)
        end
        
        return os.execute( 
-               "%s -j '%s' write '%s' '%s'" % {
-                       self.SAFEMTD, appendfile, devicename, self.IMAGEFIFO
+               "%s -j '%s' write '%s' '%s' >/dev/null 2>&1" % {
+                       self.MTD, appendfile, self.IMAGEFIFO, devicename
                }
        )
 end
 
 function Writer._refresh_block(self, devicename)
-       assert(fs.copy(self.MTD, self.SAFEMTD), ERROR_INTERNAL)
-       return os.execute("%s refresh '%s'" % {self.SAFEMTD, devicename})
+       return os.execute("%s refresh '%s' >/dev/null 2>&1" % {self.MTD, devicename})
 end
 
 function Writer._append(self, devicename, appendfile, erase)
-       assert(fs.copy(self.MTD, self.SAFEMTD), ERROR_INTERNAL)
        erase = erase and ("-e '%s' " % devicename) or ''
        
        return os.execute( 
-               "%s %s jffs2write '%s' '%s'" % {
-                       self.SAFEMTD, erase, appendfile, devicename
+               "%s %s jffs2write '%s' '%s' >/dev/null 2>&1" % {
+                       self.MTD, erase, appendfile, devicename
                }
        )
 end
\ No newline at end of file