More lenient directory creation.

[config] / jessie_postinstall.sh

diff --git a/jessie_postinstall.sh b/jessie_postinstall.sh
index 939d6a4cef54a30ec78b76776180e27596faad2f..76a75f6cd266a8dfc39b7edbb1cb625bd0fd9cd4 100755 (executable)
--- a/jessie_postinstall.sh
+++ b/jessie_postinstall.sh
@@ -97,7 +97,9 @@ if [ "$1" = "thinkpad" ] || [ "$2" = "public" ]; then
     echo 'APT::Default-Release "stable";' \
         >> /etc/apt/apt.conf.d/99defaultrelease
 fi
-dhclient eth0
+if [ "$1" = "thinkpad" ]; then
+    dhclient eth0
+fi
 apt-get update
 apt-get -y dist-upgrade
 
@@ -217,13 +219,14 @@ if [ "$1" = "server" ]; then
 
     elif [ "$2" = "public" ]; then
         # Set up twtxt environment.
+        apt-get -y install screen
         apt-get -y -t jessie-backports install golang
         su - plom -c 'git clone '\
 'https://github.com/plomlompom/htwtxt $GOPATH/src/htwtxt'
         su - plom -c 'go get htwtxt'
         path=`su - plom -c 'echo $GOPATH/bin/htwtxt'`
         setcap 'cap_net_bind_service=+ep' $path
-        su - plom -c 'mkdir ~/htwtxt'
+        su - plom -c 'mkdir -p ~/htwtxt'
     fi
 
 elif [ "$1" = "thinkpad" ]; then