diff options
| author | Karel Kočí <cynerd@email.cz> | 2015-08-13 15:53:06 +0200 |
|---|---|---|
| committer | Karel Kočí <cynerd@email.cz> | 2015-08-13 15:53:06 +0200 |
| commit | b6abf4e8fe0c3b40305dfdd0410abfbf3c804874 (patch) | |
| tree | 0e63a8695c793e79ba1b64b6674002c02f514040 /scripts/nbscript | |
| parent | a8c91e078ccb3780a53748cc52b7974bfc65b636 (diff) | |
| parent | 72316e351df5159384d70faa708224ff2fcc8dd2 (diff) | |
| download | linux-conf-perf-b6abf4e8fe0c3b40305dfdd0410abfbf3c804874.tar.gz linux-conf-perf-b6abf4e8fe0c3b40305dfdd0410abfbf3c804874.tar.bz2 linux-conf-perf-b6abf4e8fe0c3b40305dfdd0410abfbf3c804874.zip | |
Merge branch 'measuring'
Removing measuring branch. Idea was to make measuring configuration
separate from master. But keeping changes in master and measuring
branch consistent was pain.
Diffstat (limited to 'scripts/nbscript')
| -rw-r--r-- | scripts/nbscript | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/nbscript b/scripts/nbscript index ef99dd8..0f5ec55 100644 --- a/scripts/nbscript +++ b/scripts/nbscript @@ -1,4 +1,4 @@ #!/usr/bin/env novaboot # Novaboot script load ../jobfiles/linuxImage console=ttyS0,115200 -load ../buildroot/output/images/rootfs.cpio.gz +load ../root/cyclictest/images/rootfs.cpio.gz |