From b42c447d27913be72b36ef005185a26aa3c9c032 Mon Sep 17 00:00:00 2001
From: Pierre-Olivier Mercier <nemunaire@nemunai.re>
Date: Sun, 24 Feb 2019 15:10:08 +0100
Subject: [PATCH] challenge: update

---
 challenge.yml            | 8 --------
 pkg/challenge/Dockerfile | 1 +
 pkg/challenge/adlin      | 2 ++
 pkg/challenge/init       | 1 +
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/challenge.yml b/challenge.yml
index 77d5161..ebd9c97 100644
--- a/challenge.yml
+++ b/challenge.yml
@@ -68,14 +68,6 @@ files:
       uucp:!::0::::::
       operator:!::0::::::
     mode: "0640"
-  - path: etc/periodic/15min/netreboot
-    contents: |
-      #!/bin/sh
-
-      ping -c 1 172.23.0.1 && \
-          sleep 3 && \
-          reboot -f
-    mode: "0755"
   - path: init
     source: pkg/challenge/init
     mode: "0755"
diff --git a/pkg/challenge/Dockerfile b/pkg/challenge/Dockerfile
index 65fca92..6c3252f 100644
--- a/pkg/challenge/Dockerfile
+++ b/pkg/challenge/Dockerfile
@@ -32,6 +32,7 @@ RUN apk add --no-cache --initdb -p /out \
     man \
     musl \
     nano \
+    open-iscsi \
     openssh-client \
     openssh-doc \
     openssh-keygen \
diff --git a/pkg/challenge/adlin b/pkg/challenge/adlin
index 938fb80..6223018 100755
--- a/pkg/challenge/adlin
+++ b/pkg/challenge/adlin
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+init-crypto 2> /dev/null > /dev/null
+
 # FUNCTIONS ###########################################################
 
 # script usage
diff --git a/pkg/challenge/init b/pkg/challenge/init
index ac2cdb6..4657ef3 100755
--- a/pkg/challenge/init
+++ b/pkg/challenge/init
@@ -39,6 +39,7 @@ done
 
 # Randomize time at boot
 /bin/date -s 19$((70 + $RANDOM % 30))0$((1 + $RANDOM % 9))0$((1 + $RANDOM % 9))0$((1 + $RANDOM % 9)).0$((1 + $RANDOM % 9))01 > /dev/null
+/sbin/sysctl -w kernel.panic_on_oops=1 > /dev/null
 /sbin/sysctl -w net.ipv4.ip_default_ttl=4 > /dev/null
 
 # Launch some daemons