From e0d40537b42ac1c3132b85bc580327411146355a Mon Sep 17 00:00:00 2001
From: Hugo Villeneuve <hugo@hugovil.com>
Date: Mon, 25 Aug 2014 14:12:12 -0400
Subject: [PATCH] Fix invalid hostname setting

Use only host, not host.domain
---
 config/acer-731/sysinfos     | 2 +-
 config/amd64/sysinfos        | 4 ++--
 config/arm/sysinfos          | 2 +-
 config/hp-mini/sysinfos      | 4 ++--
 config/m68k/sysinfos         | 4 ++--
 config/merlion/sysinfos      | 4 ++--
 config/sony-pcgz505/sysinfos | 6 +++---
 stage1/create-config-files   | 2 +-
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/config/acer-731/sysinfos b/config/acer-731/sysinfos
index 0f8b2ea..6d076a8 100644
--- a/config/acer-731/sysinfos
+++ b/config/acer-731/sysinfos
@@ -34,7 +34,7 @@ WIFI_SUPPORT="yes"
 # General network settings
 INTERFACES="eth0 wlan0"
 MACHINE_NAME="acer"
-DOMAIN="hugovil.com"
+DOMAIN="lan"
 LAN_NETWORK_MASK="192.168.1.0/24" # Utilise par sane in stage3
 
 # Network interface card eth0 settings
diff --git a/config/amd64/sysinfos b/config/amd64/sysinfos
index b20247c..2c795f4 100644
--- a/config/amd64/sysinfos
+++ b/config/amd64/sysinfos
@@ -33,8 +33,8 @@ WIFI_SUPPORT="no"
 
 # General network settings
 INTERFACES="eth0"
-MACHINE_NAME="chambers64"
-DOMAIN="mongol.com"
+MACHINE_NAME="amd64"
+DOMAIN="lan"
 LAN_NETWORK_MASK="192.168.1.0/24" # Utilise par sane in stage3
 
 # Network interface card eth0 settings
diff --git a/config/arm/sysinfos b/config/arm/sysinfos
index cfe6dbe..ec19d64 100644
--- a/config/arm/sysinfos
+++ b/config/arm/sysinfos
@@ -28,7 +28,7 @@ MACHINE_ARCHITECTURE=""
 # General network settings
 INTERFACES="eth0"
 MACHINE_NAME="arm"
-DOMAIN="mongol.com"
+DOMAIN="lan"
 LAN_NETWORK_MASK="192.168.1.0/24" # Utilise par sane in stage3
 
 # Network interface card eth0 settings
diff --git a/config/hp-mini/sysinfos b/config/hp-mini/sysinfos
index ea1faf1..0edaf71 100644
--- a/config/hp-mini/sysinfos
+++ b/config/hp-mini/sysinfos
@@ -28,8 +28,8 @@ B43_LPPHY="yes"
 
 # General network settings
 INTERFACES="eth0 wlan0"
-MACHINE_NAME="gresimuth"
-DOMAIN="mongol.com"
+MACHINE_NAME="hp-mini"
+DOMAIN="lan"
 LAN_NETWORK_MASK="192.168.1.0/24" # Utilise par sane in stage3
 
 # Network interface card eth0 settings
diff --git a/config/m68k/sysinfos b/config/m68k/sysinfos
index e02692f..ffc8bb2 100644
--- a/config/m68k/sysinfos
+++ b/config/m68k/sysinfos
@@ -27,8 +27,8 @@ MACHINE_ARCHITECTURE=""
 
 # General network settings
 INTERFACES="eth0"
-MACHINE_NAME="arm"
-DOMAIN="mongol.com"
+MACHINE_NAME="m68k"
+DOMAIN="lan"
 LAN_NETWORK_MASK="192.168.1.0/24" # Utilise par sane in stage3
 
 # Network interface card eth0 settings
diff --git a/config/merlion/sysinfos b/config/merlion/sysinfos
index e67a502..35d08e6 100644
--- a/config/merlion/sysinfos
+++ b/config/merlion/sysinfos
@@ -28,8 +28,8 @@ B43_LPPHY="no"
 
 # General network settings
 INTERFACES="eth0 wlan0"
-MACHINE_NAME="gresimuth"
-DOMAIN="mongol.com"
+MACHINE_NAME="merlion"
+DOMAIN="lan"
 LAN_NETWORK_MASK="192.168.1.0/24" # Utilise par sane in stage3
 
 # Network interface card eth0 settings
diff --git a/config/sony-pcgz505/sysinfos b/config/sony-pcgz505/sysinfos
index 36b2f52..65b6b8c 100644
--- a/config/sony-pcgz505/sysinfos
+++ b/config/sony-pcgz505/sysinfos
@@ -7,7 +7,7 @@ INST_TYPE="workstation"
 HVL_TARGET="x86"
 MAKEJOBS=1
 
-# Destination path where to install new Linux-HV system. This is usually where
+  Destination path where to install new Linux-HV system. This is usually where
 # you have mounted your new LFS partition, but it can also be any directory.
 # This is relevant only for stage 0 and 1.
 LFS="/mnt/stockage/hvlinux-hp-mini"
@@ -28,8 +28,8 @@ B43_LPPHY="yes"
 
 # General network settings
 INTERFACES="eth0 wlan0"
-MACHINE_NAME="gresimuth"
-DOMAIN="mongol.com"
+MACHINE_NAME="sony"
+DOMAIN="lan"
 LAN_NETWORK_MASK="192.168.1.0/24" # Utilise par sane in stage3
 
 # Network interface card eth0 settings
diff --git a/stage1/create-config-files b/stage1/create-config-files
index e65c544..043f171 100755
--- a/stage1/create-config-files
+++ b/stage1/create-config-files
@@ -242,7 +242,7 @@ echo "Creating /etc/shutdown.allow"
 echo "${REGUSER}" > ${LFS}/etc/shutdown.allow
 
 # Hostname
-echo "${MACHINE_NAME}.${DOMAIN}" > ${LFS}/etc/hostname
+echo "${MACHINE_NAME}" > ${LFS}/etc/hostname
 chmod 644 ${LFS}/etc/hostname
 
 echo "127.0.0.1 localhost ${MACHINE_NAME}" > ${LFS}/etc/hosts
-- 
2.20.1