resolve packages passwd conflicts

This commit is contained in:
Neale Pickett 2011-09-23 13:42:02 -06:00
parent 74d3b3d49e
commit 79caa65faf
4 changed files with 7 additions and 11 deletions

View File

@ -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

View File

@ -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

View File

@ -1 +0,0 @@
root:$1$xAJ7KwiU$BeKJjYGs9r/hY9Ag4qv4I1:0:0:root:/:/bin/sh

View File

@ -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