58c58,62
< def makeLinuxAlphaSystem(mem_mode, mdesc=None, ruby=False):
---
> def fillInCmdline(mdesc, template, **kwargs):
> kwargs.setdefault('disk', mdesc.disk())
> kwargs.setdefault('mem', mdesc.mem())
> kwargs.setdefault('script', mdesc.script())
> return template % kwargs
59a64,65
> def makeLinuxAlphaSystem(mem_mode, mdesc=None, ruby=False, cmdline=None):
>
116c122,124
< self.boot_osflags = 'root=/dev/hda1 console=ttyS0'
---
> if not cmdline:
> cmdline = 'root=/dev/hda1 console=ttyS0'
> self.boot_osflags = fillInCmdline(mdesc, cmdline)
186c194
< dtb_filename=None, bare_metal=False):
---
> dtb_filename=None, bare_metal=False, cmdline=None):
271,273c279,282
< boot_flags = 'earlyprintk=pl011,0x1c090000 console=ttyAMA0 ' + \
< 'lpj=19988480 norandmaps rw loglevel=8 ' + \
< 'mem=%s root=/dev/sda1' % mdesc.mem()
---
> if not cmdline:
> cmdline = 'earlyprintk=pl011,0x1c090000 console=ttyAMA0 ' + \
> 'lpj=19988480 norandmaps rw loglevel=8 ' + \
> 'mem=%(mem)s root=/dev/sda1'
281c290
< self.boot_osflags = boot_flags
---
> self.boot_osflags = fillInCmdline(mdesc, cmdline)
293c302
< def makeLinuxMipsSystem(mem_mode, mdesc=None):
---
> def makeLinuxMipsSystem(mem_mode, mdesc=None, cmdline=None):
329c338,340
< self.boot_osflags = 'root=/dev/hda1 console=ttyS0'
---
> if not cmdline:
> cmdline = 'root=/dev/hda1 console=ttyS0'
> self.boot_osflags = fillInCmdline(mdesc, cmdline)
504c515,516
< def makeLinuxX86System(mem_mode, numCPUs=1, mdesc=None, Ruby=False):
---
> def makeLinuxX86System(mem_mode, numCPUs=1, mdesc=None, Ruby=False,
> cmdline=None):
549,550c561,563
< self.boot_osflags = 'earlyprintk=ttyS0 console=ttyS0 lpj=7999923 ' + \
< 'root=/dev/hda1'
---
> if not cmdline:
> cmdline = 'earlyprintk=ttyS0 console=ttyS0 lpj=7999923 root=/dev/hda1'
> self.boot_osflags = fillInCmdline(mdesc, cmdline)