瀏覽代碼

Set hostname for mesh install

Bob Mottram 9 年之前
父節點
當前提交
c571ece021
共有 1 個檔案被更改,包括 23 行新增13 行删除
  1. 23
    13
      src/freedombone

+ 23
- 13
src/freedombone 查看文件

@@ -5639,12 +5639,14 @@ function set_your_domain_name {
5639 5639
   if grep -Fxq "set_your_domain_name" $COMPLETION_FILE; then
5640 5640
       return
5641 5641
   fi
5642
+
5643
+  echo "$DEFAULT_DOMAIN_NAME" > /etc/hostname
5644
+  hostname $DEFAULT_DOMAIN_NAME
5645
+
5642 5646
   if [[ $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
5643 5647
       return
5644 5648
   fi
5645 5649
 
5646
-  echo "$DEFAULT_DOMAIN_NAME" > /etc/hostname
5647
-  hostname $DEFAULT_DOMAIN_NAME
5648 5650
   if grep -q "127.0.1.1" /etc/hosts; then
5649 5651
       sed -i "s/127.0.1.1.*/127.0.1.1       $DEFAULT_DOMAIN_NAME/g" /etc/hosts
5650 5652
   else
@@ -6091,17 +6093,25 @@ function configure_internet_protocol {
6091 6093
   sed -i "s/#net.ipv4.conf.all.rp_filter=1/net.ipv4.conf.all.rp_filter=1/g" /etc/sysctl.conf
6092 6094
   sed -i "s/#net.ipv4.ip_forward=1/net.ipv4.ip_forward=0/g" /etc/sysctl.conf
6093 6095
   sed -i "s/#net.ipv6.conf.all.forwarding=1/net.ipv6.conf.all.forwarding=0/g" /etc/sysctl.conf
6094
-  echo '# ignore pings' >> /etc/sysctl.conf
6095
-  echo 'net.ipv4.icmp_echo_ignore_all = 1' >> /etc/sysctl.conf
6096
-  echo 'net.ipv6.icmp_echo_ignore_all = 1' >> /etc/sysctl.conf
6097
-  echo '# disable ipv6' >> /etc/sysctl.conf
6098
-  echo 'net.ipv6.conf.all.disable_ipv6 = 1' >> /etc/sysctl.conf
6099
-  echo 'net.ipv4.tcp_synack_retries = 2' >> /etc/sysctl.conf
6100
-  echo 'net.ipv4.tcp_syn_retries = 1' >> /etc/sysctl.conf
6101
-  echo '# keepalive' >> /etc/sysctl.conf
6102
-  echo 'net.ipv4.tcp_keepalive_probes = 9' >> /etc/sysctl.conf
6103
-  echo 'net.ipv4.tcp_keepalive_intvl = 75' >> /etc/sysctl.conf
6104
-  echo 'net.ipv4.tcp_keepalive_time = 7200' >> /etc/sysctl.conf
6096
+  if ! grep -q "ignore pings" /etc/sysctl.conf; then
6097
+      echo '# ignore pings' >> /etc/sysctl.conf
6098
+      echo 'net.ipv4.icmp_echo_ignore_all = 1' >> /etc/sysctl.conf
6099
+      echo 'net.ipv6.icmp_echo_ignore_all = 1' >> /etc/sysctl.conf
6100
+  fi
6101
+  if ! grep -q "disable ipv6" /etc/sysctl.conf; then
6102
+      echo '# disable ipv6' >> /etc/sysctl.conf
6103
+      echo 'net.ipv6.conf.all.disable_ipv6 = 1' >> /etc/sysctl.conf
6104
+  fi
6105
+  if ! grep -q "net.ipv4.tcp_synack_retries" /etc/sysctl.conf; then
6106
+      echo 'net.ipv4.tcp_synack_retries = 2' >> /etc/sysctl.conf
6107
+      echo 'net.ipv4.tcp_syn_retries = 1' >> /etc/sysctl.conf
6108
+  fi
6109
+  if ! grep -q "keepalive" /etc/sysctl.conf; then
6110
+      echo '# keepalive' >> /etc/sysctl.conf
6111
+      echo 'net.ipv4.tcp_keepalive_probes = 9' >> /etc/sysctl.conf
6112
+      echo 'net.ipv4.tcp_keepalive_intvl = 75' >> /etc/sysctl.conf
6113
+      echo 'net.ipv4.tcp_keepalive_time = 7200' >> /etc/sysctl.conf
6114
+  fi
6105 6115
   echo 'configure_internet_protocol' >> $COMPLETION_FILE
6106 6116
 }
6107 6117