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

[config] / jessie_postinstall.sh

diff --git a/jessie_postinstall.sh b/jessie_postinstall.sh
index fb4161fd2a00114fcfb80087c8f9ebb62ae25ea6..f908cafc02848c81141c6d7b4b8e0991cdc2994a 100755 (executable)
--- a/jessie_postinstall.sh
+++ b/jessie_postinstall.sh
@@ -55,6 +55,12 @@ ExecStart=/sbin/dhclient eth0
 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 @@ config/bin/symlink.sh
 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
@@ -212,12 +218,12 @@ elif [ "$1" = "thinkpad" ]; then
 
     # Set up OpenGL and hardware acceleration.
     if [ "$2" = "X200s" ]; then
-        apt-get -y install libgl1-mesa-dri
         apt-get -y install i965-va-driver
-        usermod -aG video plom
     elif [ "$2" = "T450s" ]; then
         apt-get -y -t jessie-backports install xserver-xorg-video-intel
     fi
+    apt-get -y install libgl1-mesa-dri
+    usermod -aG video plom
 
     # Install xrandr.
     apt-get -y install x11-xserver-utils