diff options
| author | Karel Kočí <cynerd@email.cz> | 2015-09-14 11:26:36 +0200 |
|---|---|---|
| committer | Karel Kočí <cynerd@email.cz> | 2015-09-14 11:26:36 +0200 |
| commit | 78d096b2b1f286e15ed12a2789da102fe5849184 (patch) | |
| tree | 296250bb2f7c89076ff9570a1d18c40dde677cda | |
| parent | 0d622d23b8f8ad6d63589900fc65a398ab9ee344 (diff) | |
| download | linux-conf-perf-78d096b2b1f286e15ed12a2789da102fe5849184.tar.gz linux-conf-perf-78d096b2b1f286e15ed12a2789da102fe5849184.tar.bz2 linux-conf-perf-78d096b2b1f286e15ed12a2789da102fe5849184.zip | |
Change boot to execute only one scripts
Boot is now executing only lcpinit script. /init scripts is not used
during measurements. Booting without boot script, only using novaboot
scripts, results in using /init script. This helps to access cli in
booted machine without editing any files.
| -rwxr-xr-x | targets/ryuglab/boot/boot | 2 | ||||
| -rw-r--r-- | tests/cyclictest/root/.config | 16 | ||||
| -rwxr-xr-x | tests/cyclictest/root/overlay/etc/init.d/S90lcp | 3 | ||||
| -rwxr-xr-x | tests/cyclictest/root/overlay/sbin/lcpinit | 2 |
4 files changed, 18 insertions, 5 deletions
diff --git a/targets/ryuglab/boot/boot b/targets/ryuglab/boot/boot index 3f88f6e..715327a 100755 --- a/targets/ryuglab/boot/boot +++ b/targets/ryuglab/boot/boot @@ -10,4 +10,4 @@ ln -sf ../../../jobfiles/linuxImage uImage ln -sf ../../../tests/cyclictest/root/images/rootfs.cpio.uboot rootfs.cpio.uboot novaboot nbscripts --exiton="NOVABOOT EXIT LINUX-CONF-PERF" --exiton-timeout=120 \ - --exiton="Kernel panic" + --exiton="Kernel panic" --append="rdinit=/sbin/lcpinit" diff --git a/tests/cyclictest/root/.config b/tests/cyclictest/root/.config index 0b86ab6..fca1941 100644 --- a/tests/cyclictest/root/.config +++ b/tests/cyclictest/root/.config @@ -238,7 +238,21 @@ BR2_SYSTEM_BIN_SH_BUSYBOX=y # # BR2_SYSTEM_BIN_SH_NONE is not set BR2_SYSTEM_BIN_SH="/bin/busybox" -# BR2_TARGET_GENERIC_GETTY is not set +BR2_TARGET_GENERIC_GETTY=y + +# +# getty options +# +BR2_TARGET_GENERIC_GETTY_PORT="console" +BR2_TARGET_GENERIC_GETTY_BAUDRATE_KEEP=y +# BR2_TARGET_GENERIC_GETTY_BAUDRATE_9600 is not set +# BR2_TARGET_GENERIC_GETTY_BAUDRATE_19200 is not set +# BR2_TARGET_GENERIC_GETTY_BAUDRATE_38400 is not set +# BR2_TARGET_GENERIC_GETTY_BAUDRATE_57600 is not set +# BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200 is not set +BR2_TARGET_GENERIC_GETTY_BAUDRATE="0" +BR2_TARGET_GENERIC_GETTY_TERM="vt100" +BR2_TARGET_GENERIC_GETTY_OPTIONS="" BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y BR2_SYSTEM_DHCP="" # BR2_TARGET_TZ_INFO is not set diff --git a/tests/cyclictest/root/overlay/etc/init.d/S90lcp b/tests/cyclictest/root/overlay/etc/init.d/S90lcp deleted file mode 100755 index b5a9076..0000000 --- a/tests/cyclictest/root/overlay/etc/init.d/S90lcp +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -/sbin/lcpinit diff --git a/tests/cyclictest/root/overlay/sbin/lcpinit b/tests/cyclictest/root/overlay/sbin/lcpinit index 02c39af..15cc11c 100755 --- a/tests/cyclictest/root/overlay/sbin/lcpinit +++ b/tests/cyclictest/root/overlay/sbin/lcpinit @@ -1,5 +1,7 @@ #!/bin/sh +/bin/mount -t devtmpfs devtmpfs /dev + echo Command: cyclictest -n -p99 -t3 -l10000 -q echo Version: `cyclictest --help | head -1` echo |