Fix symlink script calling bug.

[config] / jessie_postinstall.sh

diff --git a/jessie_postinstall.sh b/jessie_postinstall.sh
index 4a8faa5d6203fbd62ef86593f0b40e5c7d1d06cd..0884d132be63bef8fa155eaf86312da57cc5f2c9 100755 (executable)
--- a/jessie_postinstall.sh
+++ b/jessie_postinstall.sh
@@ -2,11 +2,16 @@
 set -x
 set -e
 
-if [ "$1" = "" ]; then
+if [ ! "$1" = "thinkpad" ] && [ ! "$1" = "server" ]; then
     echo "Need argument."
     false
 fi
 
+if [ "$1" = "thinkpad" ] && [ ! "$2" = "X200s" ] && [ ! "$2" = "T450s" ]; then
+    echo "Need Thinkpad type."
+    false
+fi
+
 if [ "$1" = "server" ]; then
     # Set root pw.
     passwd
@@ -50,19 +55,33 @@ 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.
 echo 'deb http://ftp.debian.org/debian/ jessie main contrib non-free' \
-    >/etc/apt/sources.list
-echo 'deb http://security.debian.org/ jessie/updates main contrib non-free' \ 
+    > /etc/apt/sources.list
+echo 'deb http://security.debian.org/ jessie/updates main contrib non-free' \
     >> /etc/apt/sources.list
 echo 'deb http://ftp.debian.org/debian/ jessie-updates main contrib non-free' \
     >> /etc/apt/sources.list
-#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 non-free' >> /etc/apt/sources.list
-#echo 'deb http://ftp.debian.org/debian/ testing-updates main contrib non-free' >> /etc/apt/sources.list
-#echo 'APT::Default-Release "stable"' >> /etc/apt/apt.conf.d/99defaultrelease
+if [ "$1" = "thinkpad" ]; then
+    echo 'deb http://ftp.debian.org/debian/ jessie-backports main contrib' \
+' non-free' >> /etc/apt/sources.list
+    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' \
+' non-free' >> /etc/apt/sources.list
+    echo 'deb http://ftp.debian.org/debian/ testing-updates main contrib' \
+' non-free' >> /etc/apt/sources.list
+    echo 'APT::Default-Release "stable";' \
+        >> /etc/apt/apt.conf.d/99defaultrelease
+fi
 dhclient eth0
 apt-get update
 apt-get -y dist-upgrade
@@ -123,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 server'
+su plom -c '/home/plom/config/bin/symlink.sh '$1' '$2
 
 # Set up editor.
 mkdir -p .vimbackups
@@ -186,14 +205,24 @@ elif [ "$1" = "thinkpad" ]; then
     # Set up sound.
     usermod -aG audio plom
     apt-get -y install alsa-utils
-    amixer -c 0 sset Master playback 100% unmute
+    if [ "$2" = "X200s" ]; 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 and OpenGL.
-    apt-get -y install xserver-xorg xinit xterm i3 i3status dmenu
+    # 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 [ "$2" = "X200s" ]; then
+        apt-get -y install i965-va-driver
+    elif [ "$2" = "T450s" ]; then
+        apt-get -y -t jessie-backports install xserver-xorg-video-intel
+    fi
     apt-get -y install libgl1-mesa-dri
-    apt-get -y install i965-va-driver
     usermod -aG video plom
 
     # Install xrandr.
@@ -201,7 +230,7 @@ elif [ "$1" = "thinkpad" ]; then
 
     # 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/'