diff options
| author | Andrey Konovalov <andreyknvl@google.com> | 2020-03-28 12:04:19 +0100 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2020-03-28 12:29:27 +0100 |
| commit | fd6a38e1fc6e0084590177c436c4eb50bee401c6 (patch) | |
| tree | 29c273255ddcda3e2c94695c773c6579ef62e22d | |
| parent | f1ebdfba7dc69d1934e89c2613ab7b4ec300016b (diff) | |
tools, dashboard: move net.ifnames=0 to create-gce-image.sh
Looks like it affects not only android-5.4.
| -rw-r--r-- | dashboard/config/android/cmdline-5.4 | 1 | ||||
| -rwxr-xr-x | tools/create-gce-image.sh | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/dashboard/config/android/cmdline-5.4 b/dashboard/config/android/cmdline-5.4 index b1f4c08da..46858c875 100644 --- a/dashboard/config/android/cmdline-5.4 +++ b/dashboard/config/android/cmdline-5.4 @@ -9,4 +9,3 @@ vivid.multiplanar=1,2,1,2,1,2,1,2,1,2,1,2,1,2,1,2 dummy_hcd.num=8 binder.debug_mask=0 panic_on_warn=0 -net.ifnames=0 diff --git a/tools/create-gce-image.sh b/tools/create-gce-image.sh index bc0de3f45..6e53b54ea 100755 --- a/tools/create-gce-image.sh +++ b/tools/create-gce-image.sh @@ -190,7 +190,7 @@ menuentry 'linux' --class gnu-linux --class gnu --class os { insmod part_msdos insmod ext2 set root='(hd0,1)' - linux /vmlinuz root=/dev/sda1 console=ttyS0 earlyprintk=serial vsyscall=native rodata=n oops=panic panic_on_warn=1 nmi_watchdog=panic panic=86400 $CMDLINE + linux /vmlinuz root=/dev/sda1 console=ttyS0 earlyprintk=serial vsyscall=native rodata=n oops=panic panic_on_warn=1 nmi_watchdog=panic panic=86400 net.ifnames=0 $CMDLINE } EOF sudo grub-install --target=i386-pc --boot-directory=disk.mnt/boot --no-floppy $DISKDEV @@ -208,7 +208,7 @@ menuentry 'linux' --class gnu-linux --class gnu --class os { insmod part_gpt insmod ext2 set root='(ieee1275/disk,gpt2)' - linux /vmlinuz root=/dev/sda2 console=ttyS0 earlyprintk=serial rodata=n oops=panic panic_on_warn=1 nmi_watchdog=panic panic=86400 $CMDLINE + linux /vmlinuz root=/dev/sda2 console=ttyS0 earlyprintk=serial rodata=n oops=panic panic_on_warn=1 nmi_watchdog=panic panic=86400 net.ifnames=0 $CMDLINE } EOF sudo grub-install --target=powerpc-ieee1275 --boot-directory=disk.mnt/boot $DISKDEV"p1" |