am e4e7fef1: am 5951a369: am b4819e4a: Merge "init: support longer command lines"

* commit 'e4e7fef1bc19ce83a6076eca65fa1a2f6eac862e':
  init: support longer command lines
This commit is contained in:
Dima Zavin 2013-09-13 09:44:57 -07:00 committed by Android Git Automerger
commit cfea27aeb1

View file

@ -450,13 +450,13 @@ void get_hardware_name(char *hardware, unsigned int *revision)
void import_kernel_cmdline(int in_qemu,
void (*import_kernel_nv)(char *name, int in_qemu))
{
char cmdline[1024];
char cmdline[2048];
char *ptr;
int fd;
fd = open("/proc/cmdline", O_RDONLY);
if (fd >= 0) {
int n = read(fd, cmdline, 1023);
int n = read(fd, cmdline, sizeof(cmdline) - 1);
if (n < 0) n = 0;
/* get rid of trailing newline, it happens */