Fix symlink script calling bug.

[config] / jessie_postinstall.sh

diff --git a/jessie_postinstall.sh b/jessie_postinstall.sh
index 007d594a4ed8605347a2c83238997bb46b941df7..0884d132be63bef8fa155eaf86312da57cc5f2c9 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.
@@ -65,10 +71,8 @@ echo 'deb http://security.debian.org/ jessie/updates main contrib non-free' \
 echo 'deb http://ftp.debian.org/debian/ jessie-updates main contrib non-free' \
     >> /etc/apt/sources.list
 if [ "$1" = "thinkpad" ]; then
-    if [ "$2" = "T450s" ]; then
-        echo 'deb http://ftp.debian.org/debian/ jessie-backports main contrib' \
+    echo 'deb http://ftp.debian.org/debian/ jessie-backports main contrib' \
 ' non-free' >> /etc/apt/sources.list
-    fi
     echo 'deb http://ftp.debian.org/debian/ testing main contrib non-free' \
         >> /etc/apt/sources.list
     echo 'deb http://security.debian.org/ testing/updates main contrib' \
@@ -138,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
@@ -205,26 +209,28 @@ elif [ "$1" = "thinkpad" ]; then
         amixer -c 0 sset Master playback 100% unmute
     elif [ "$2" = "T450s" ]; then
         amixer -c 1 sset Master playback 100% unmute
+        # Re-order souncards so the commonly used one is the first one.
+        echo 'options snd_hda_intel index=1,0' >> /etc/modprobe.d/sound.conf
     fi
 
     # Set up window system, i3, redshift.
     apt-get -y install xserver-xorg xinit xterm i3 i3status dmenu redshift
 
     # Set up OpenGL and hardware acceleration.
-    if [ "$1" = "X220s" ]; then
-        apt-get -y install libgl1-mesa-dri
+    if [ "$2" = "X200s" ]; then
         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
 
     # Set up pentadactyl. 
     apt-get -y install iceweasel
-    apt-get -y -t testing install xul-ext-pentadactyl
+    apt-get -y -t jessie-backports install xul-ext-pentadactyl
     apt-get -y install vim-gtk
     su plom -c 'mkdir -p /home/plom/downloads/'