From: Christian Heller <c.heller@plomlompom.de>
Date: Sun, 13 Dec 2015 01:03:33 +0000 (+0100)
Subject: Merge branch 'master' of http://github.com/plomlompom/config
X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/balance?a=commitdiff_plain;h=2d1f18a11badc239cd7ab1638f8988087fd803ea;hp=-c;p=config

Merge branch 'master' of github.com/plomlompom/config
---

2d1f18a11badc239cd7ab1638f8988087fd803ea
diff --combined jessie_postinstall.sh
index f073da1,02e0b3a..f908caf
--- a/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