X-Git-Url: https://plomlompom.com/repos/test.html?a=blobdiff_plain;f=jessie_postinstall.sh;h=08b34ab8367819c35cdecc8816c96583da5a9c5d;hb=70a844d0728f2664069a55dcf38c33e5a41ed70f;hp=f908cafc02848c81141c6d7b4b8e0991cdc2994a;hpb=2d1f18a11badc239cd7ab1638f8988087fd803ea;p=config

diff --git a/jessie_postinstall.sh b/jessie_postinstall.sh
index f908caf..08b34ab 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.com" ]; then
+    hostname="test.plomlompom"
+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
@@ -55,12 +72,6 @@ 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.
@@ -142,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 $2
+su plom -c '/home/plom/config/bin/symlink.sh '$1' '$2
 
 # Set up editor.
 mkdir -p .vimbackups