From 79caa65faf2fab85f3ebec6c98349d77a3bb32b1 Mon Sep 17 00:00:00 2001
From: Neale Pickett <neale@lanl.gov>
Date: Fri, 23 Sep 2011 13:42:02 -0600
Subject: [PATCH] resolve packages passwd conflicts

---
 packages/ctfbase/service/ctfd/passwd |  3 ---
 packages/ctfbase/service/ctfd/run    | 10 ++++------
 packages/router/service/sshd/passwd  |  1 -
 packages/router/service/sshd/run     |  4 +++-
 4 files changed, 7 insertions(+), 11 deletions(-)
 delete mode 100644 packages/ctfbase/service/ctfd/passwd
 delete mode 100644 packages/router/service/sshd/passwd

diff --git a/packages/ctfbase/service/ctfd/passwd b/packages/ctfbase/service/ctfd/passwd
deleted file mode 100644
index b0ebfea..0000000
--- a/packages/ctfbase/service/ctfd/passwd
+++ /dev/null
@@ -1,3 +0,0 @@
-root:$1$bEGCYemG$pAo9KXWQKgQNijRGKSb7e1:0:0:root:/:/bin/ash
-ctf:x:100:100:CTF Services:/:/bin/false
-nobody:x:65534:65534:nobody:/:/bin/false
diff --git a/packages/ctfbase/service/ctfd/run b/packages/ctfbase/service/ctfd/run
index 462ed5d..796021e 100755
--- a/packages/ctfbase/service/ctfd/run
+++ b/packages/ctfbase/service/ctfd/run
@@ -3,15 +3,13 @@
 exec 2>&1
 
 # Make user accounts
-if ! [ -r /etc/passwd ]; then
-    cat passwd >/etc/passwd
-fi
+adduser -D -u 0 -h /var root || true
+adduser -D -u 100 -h /tmp -g 'CTF Services' ctf || true
+adduser -D -u 65534 -h / nobody || true
+echo 'root:$1$bEGCYemG$pAo9KXWQKgQNijRGKSb7e1' | chpasswd --encrypted
 
 # Set up networking for all CTF ips
 ip link set eth0 up
-if ! ip route | grep -q default; then
-    ip route add default via fd82:b410:3441:1661::1 || exit 1
-fi
 
 install -o root -m 0755 -d /var/lib/ctf/tokens
 exec ./ctfd
diff --git a/packages/router/service/sshd/passwd b/packages/router/service/sshd/passwd
deleted file mode 100644
index 97e6113..0000000
--- a/packages/router/service/sshd/passwd
+++ /dev/null
@@ -1 +0,0 @@
-root:$1$xAJ7KwiU$BeKJjYGs9r/hY9Ag4qv4I1:0:0:root:/:/bin/sh
\ No newline at end of file
diff --git a/packages/router/service/sshd/run b/packages/router/service/sshd/run
index 0a56304..529fed1 100755
--- a/packages/router/service/sshd/run
+++ b/packages/router/service/sshd/run
@@ -2,6 +2,8 @@
 
 exec 2>&1
 
-cat passwd > /etc/passwd
+if adduser -D -u 0 -h / -s /bin/sh root; then
+    echo 'root:$1$xAJ7KwiU$BeKJjYGs9r/hY9Ag4qv4I1' | chpasswd --encrypted
+done
 
 exec dropbear -r ./rsa.key -E -F