Bläddra i källkod

Duplicated entry in /etc/hosts

Bob Motram 10 år sedan
förälder
incheckning
cf0011c11c
1 ändrade filer med 6 tillägg och 3 borttagningar
  1. 6
    3
      src/freedombone

+ 6
- 3
src/freedombone Visa fil

@@ -4396,8 +4396,11 @@ function set_your_domain_name {
4396 4396
   fi
4397 4397
   echo "$DEFAULT_DOMAIN_NAME" > /etc/hostname
4398 4398
   hostname $DEFAULT_DOMAIN_NAME
4399
-  sed -i "s/127.0.1.1.*/127.0.1.1       $DEFAULT_DOMAIN_NAME/g" /etc/hosts
4400
-  echo "127.0.1.1  $DEFAULT_DOMAIN_NAME" >> /etc/hosts
4399
+  if grep -q "127.0.1.1" /etc/hosts; then
4400
+      sed -i "s/127.0.1.1.*/127.0.1.1       $DEFAULT_DOMAIN_NAME/g" /etc/hosts
4401
+  else
4402
+      echo "127.0.1.1  $DEFAULT_DOMAIN_NAME" >> /etc/hosts
4403
+  fi
4401 4404
   echo 'set_your_domain_name' >> $COMPLETION_FILE
4402 4405
 }
4403 4406
 
@@ -8047,7 +8050,7 @@ function intrusion_detection {
8047 8050
   sed -i 's|/var/log.*||g' /etc/tripwire/twpol.txt
8048 8051
   # Ignore /etc/tripwire
8049 8052
   if ! grep -q "!/etc/tripwire" /etc/tripwire/twpol.txt; then
8050
-	  sed -i '\|/etc\t\t->.*|a\        !/etc/tripwire;' /etc/tripwire/twpol.txt
8053
+          sed -i '\|/etc\t\t->.*|a\        !/etc/tripwire;' /etc/tripwire/twpol.txt
8051 8054
   fi
8052 8055
   # Avoid logging the changed database
8053 8056
   sed -i 's|$(TWETC)/tw.pol.*||g' /etc/tripwire/twpol.txt