Fix for MT05639, which had regressed in rev.30805. nw. 

Of course, device options have to be removed *before* the
call of set_system_name (which sets the options of the new
system), or the system is launched with no media options 
available! :-)