Merge branch 'master' of http://github.com/plomlompom/config

diff --combined jessie_postinstall.sh
index f073da1c21f3e590c3ab1435a6db04372ed4ac1e,02e0b3ac20f07b37cc2df3fa8a5177f4e5ea3ac1..f908cafc02848c81141c6d7b4b8e0991cdc2994a
--- 1/jessie_postinstall.sh
--- 2/jessie_postinstall.sh
+++ b/jessie_postinstall.sh
@@@ -55,6 -55,12 +55,12 @@@ ExecStart=/sbin/dhclient eth
  WantedBy=multi-user.target
  EOF
      systemctl enable /etc/systemd/system/dhclient.service
+ elif [ "$1" = "thinkpad" ]; then
+     if [ "$2" = "X200s" ]; then
+         echo 'X200s' > /etc/hostname
+     elif [ "$2" = "T450s" ]; then
+         echo 'T450s' > /etc/hostname
+     fi
  fi
  
  # Package management config, system upgrade.
@@@ -136,7 -142,7 +142,7 @@@ config/bin/symlink.s
  useradd -m -s /bin/bash plom
  rm -rf /home/plom/config
  su - plom -c 'git clone http://github.com/plomlompom/config /home/plom/config'
 -su plom -c '/home/plom/config/bin/symlink.sh '$1
 +su plom -c '/home/plom/config/bin/symlink.sh '$1 $2
  
  # Set up editor.
  mkdir -p .vimbackups