diff options
| author |   khilman <khilman@users.noreply.github.com> | 2019-04-07 20:35:55 -0700 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2019-04-07 20:35:55 -0700 |
| commit | 6d2fb57fdaf6bed78b131f7c6b4aed71d55630c7 (patch) | |
| tree | bd12f4a94330cbd3c75faa952b687b6a10e2bc5a /lava-slave | |
| parent | 31d0a888ee944ac0f8c0418dff942adfde448ca7 (diff) | |
| parent | 14e3c762e575d8742b39799018913e7d944111b6 (diff) | |
Merge pull request #86 from montjoie/support_2019.03
Support 2019.03
Diffstat (limited to 'lava-slave')
| -rw-r--r-- | lava-slave/Dockerfile | 9 | ||||
| -rw-r--r-- | lava-slave/grub.cfg | 1 | ||||
| -rwxr-xr-x | lava-slave/scripts/setup.sh | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/lava-slave/Dockerfile b/lava-slave/Dockerfile index 32a76b0..3ff2888 100644 --- a/lava-slave/Dockerfile +++ b/lava-slave/Dockerfile @@ -1,8 +1,8 @@ -FROM baylibre/lava-slave-base:2018.11-1_bpo9_1 +FROM baylibre/lava-slave-base:2019.03_stretch RUN apt-get update -RUN DEBIAN_FRONTEND=noninteractive apt-get -y install cu conmux +RUN DEBIAN_FRONTEND=noninteractive apt-get -y install cu conmux telnet COPY configs/lava-slave /etc/lava-dispatcher/lava-slave @@ -35,7 +35,9 @@ RUN apt-get update RUN apt-get -y install lavacli # PXE stuff -RUN apt-get -y install grub-efi-amd64-bin +RUN if [ $(uname -m) != amd64 ]; then dpkg --add-architecture amd64 && apt-get update; fi +RUN apt-get -y install grub-efi-amd64-bin:amd64 +RUN if [ $(uname -m) != amd64 ]; then dpkg --remove architecture amd64 && apt-get update; fi RUN cd /var/lib/lava/dispatcher/tmp && grub-mknetdir --net-directory=. COPY grub.cfg /var/lib/lava/dispatcher/tmp/boot/grub/ @@ -44,6 +46,7 @@ COPY default/* /etc/default/ COPY phyhostname /root/ COPY scripts/setup.sh . +RUN apt-get -y install patch COPY lava-patch/ /root/lava-patch RUN cd /usr/lib/python3/dist-packages && for patch in $(ls /root/lava-patch/*patch) ; do patch -p1 < $patch || exit $?;done diff --git a/lava-slave/grub.cfg b/lava-slave/grub.cfg index e133fed..d7074b3 100644 --- a/lava-slave/grub.cfg +++ b/lava-slave/grub.cfg @@ -5,7 +5,6 @@ insmod loopback insmod iso9660 insmod all_video insmod regexp -insmod biosdisk set pager=1 # This fake menu is necessary for letting LAVA see that grub is started diff --git a/lava-slave/scripts/setup.sh b/lava-slave/scripts/setup.sh index e0e8322..0b8a0b2 100755 --- a/lava-slave/scripts/setup.sh +++ b/lava-slave/scripts/setup.sh @@ -18,7 +18,7 @@ TIMEOUT=300 while [ $TIMEOUT -ge 1 ]; do STEP=2 - lavacli $LAVACLIOPTS device-types list 2>/dev/null >/dev/null + lavacli $LAVACLIOPTS device-types list >/dev/null if [ $? -eq 0 ];then TIMEOUT=0 else |