X-Git-Url: https://plomlompom.com/repos/bar%20baz.html?a=blobdiff_plain;f=jessie_postinstall.sh;h=1b2978aec1c34ed181d2eec3259b68433f9ce9e1;hb=67e783c56b750fdb3d9e77eada3cd3dd9935d5f7;hp=244bf75dfe1b45a0f3cb90a19b3e706eda8328f9;hpb=f1c6e45ee30068d863c835942e76c2d6ae87fd95;p=config

diff --git a/jessie_postinstall.sh b/jessie_postinstall.sh
index 244bf75..1b2978a 100755
--- a/jessie_postinstall.sh
+++ b/jessie_postinstall.sh
@@ -12,6 +12,23 @@ if [ "$1" = "thinkpad" ] && [ ! "$2" = "X200s" ] && [ ! "$2" = "T450s" ]; then
     false
 fi
 
+if [ "$1" = "server" ] && [ ! "$2" = "plomlompom.com" ] && \
+        [ ! "$2" = "test.plomlompom.com" ]; then
+    echo "Need server type."
+    false
+fi
+
+# Some important variables
+if [ "$2" = "plomlompom.com" ]; then
+    hostname="plomlompom"
+elif [ "$2" = "test.plomlompom" ]; then
+    hostname="test.plomlompom.com"
+elif [ "$2" = "X200s" ]; then
+    hostname="X220s"
+elif [ "$2" = "T450s" ]; then
+    hostname="T450s"
+fi
+
 if [ "$1" = "server" ]; then
     # Set root pw.
     passwd
@@ -35,13 +52,13 @@ rm list_all_packages list_white_unsorted list_white list_black
 echo 'APT::Install-Recommends "false";' >> /etc/apt/apt.conf.d/99mindeps
 echo 'APT::Install-Suggests "false";' >> /etc/apt/apt.conf.d/99mindeps
 
+# Set hostname and FQDN.
+echo $hostname > /etc/hostname
+hostname $hostname
 if [ "$1" = "server" ]; then
-    # Set hostname and FQDN.
-    echo 'plomlompom' > /etc/hostname
-    hostname 'plomlompom'
     echo '127.0.0.1 localhost' > /etc/hosts
     ip=`hostname -I`
-    echo "$ip plomlompom.com plomlompom" >> /etc/hosts
+    echo "$ip $2 $hostname" >> /etc/hosts
 
     # Call dhclient on startup.
     cat > /etc/systemd/system/dhclient.service << EOF
@@ -59,16 +76,22 @@ 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
 if [ "$1" = "thinkpad" ]; then
-    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
+    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
@@ -130,7 +153,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
@@ -197,14 +220,20 @@ 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 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.
@@ -212,7 +241,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/'