From bb95bfee296b2bb6d64cc6f9c22b67a26d9f1af6 Mon Sep 17 00:00:00 2001
From: Pierre-Olivier Mercier <nemunaire@nemunai.re>
Date: Tue, 1 Mar 2022 22:31:02 +0100
Subject: [PATCH] challenge: Update init to use losetup for disk bonus

---
 pkg/challenge/init | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/pkg/challenge/init b/pkg/challenge/init
index 7c47338..b871c95 100755
--- a/pkg/challenge/init
+++ b/pkg/challenge/init
@@ -63,16 +63,28 @@ done
 /usr/bin/setsid /bin/shadow-up > /dev/null 2> /var/log/sup.log &
 
 # Prepare bonus 2
+rm /dev/null; mknod -m 0666 /dev/null c 1 3
+rm /dev/zero; mknod -m 0666 /dev/zero c 1 5
+
 mkdir -p /mnt
 
 for l in a b c d e f g h i j k l m n o p q r s t u v w x y z zz; do
     [ -b /dev/sd$l ] || break
 done
 
-/bin/dd if=/dev/zero of=/dev/sd${l} count=1 > /dev/null 2> /dev/null
-/bin/dd if=/dev/zero of=/dev/sd${l}1 count=1 bs=10240000 > /dev/null 2> /dev/null
-/sbin/mkfs.ext4 /dev/sd${l}1 > /dev/null 2> /dev/null
-mount /dev/sd${l}1 /mnt > /dev/null 2> /dev/null
+/bin/dd if=/dev/zero of=/dev/blk count=1 bs=10240000 > /dev/null 2> /dev/null
+cat <<EOF | fdisk /dev/blk
+n
+p
+1
+
+
+w
+EOF
+LOOPDEV=$(losetup -f)
+losetup -P "${LOOPDEV}" /dev/blk
+/sbin/mkfs.ext4 "${LOOPDEV}p1" > /dev/null 2> /dev/null
+mount "${LOOPDEV}" /mnt > /dev/null 2> /dev/null
 N1=$((72 - $RANDOM % 35))
 N2=$((25 + $RANDOM % 35))
 {