diff options
| author |   Kevin Hilman <khilman@baylibre.com> | 2019-06-17 09:24:52 -0700 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2019-06-17 09:24:52 -0700 |
| commit | b9e4d31719373b52c7113d0e8a960332fd8ef8c6 (patch) | |
| tree | 46b78a70a9c4c1f2a98b25fe53eb676f11cd700d | |
| parent | 81ef14e81c55d18c6fd988294bd09c29b18a4afd (diff) | |
| parent | 0c5fa6a11b1c540b1ffaa8fdcddb54b1bb2fe6e5 (diff) | |
Merge pull request #94 from montjoie/pxe-fix
Install PXE stuff at runtime
| -rw-r--r-- | lava-slave/Dockerfile | 3 | ||||
| -rwxr-xr-x | lava-slave/scripts/setup.sh | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lava-slave/Dockerfile b/lava-slave/Dockerfile index d6375f2..5fdae2f 100644 --- a/lava-slave/Dockerfile +++ b/lava-slave/Dockerfile @@ -41,8 +41,7 @@ RUN apt-get -y install lavacli 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/ +COPY grub.cfg /root/ COPY default/* /etc/default/ diff --git a/lava-slave/scripts/setup.sh b/lava-slave/scripts/setup.sh index fce01f8..1fb0bb3 100755 --- a/lava-slave/scripts/setup.sh +++ b/lava-slave/scripts/setup.sh @@ -10,6 +10,12 @@ if [ -z "$LAVA_MASTER_URI" ];then exit 11 fi +# Install PXE +OPWD=$(pwd) +cd /var/lib/lava/dispatcher/tmp && grub-mknetdir --net-directory=. +cp /root/grub.cfg /var/lib/lava/dispatcher/tmp/boot/grub/ +cd $OPWD + lavacli identities add --uri $LAVA_MASTER_BASEURI --token $LAVA_MASTER_TOKEN --username $LAVA_MASTER_USER default echo "Dynamic slave for $LAVA_MASTER ($LAVA_MASTER_URI)" |