makedist.inc.sh: support for hostname configuration with domain (systemd)

Silvan Calarco
1 parent cfdd9d4067
Showing 1 changed file with 1 additions and 4 deletions Side-by-side Diff
makedist.inc.sh
@@ -85,10 +85,7 @@
 [[ "$TARGET_HOSTNAME" ]] || TARGET_HOSTNAME="$MAKEDIST_TARGET"
 [[ "$TARGET_DOMAIN" ]] || TARGET_DOMAIN="localdomain"
  
-echo "$TARGET_HOSTNAME" > $MOUNTDIR/etc/hostname
-sed -i "s|HOSTNAME=.*|HOSTNAME=$TARGET_HOSTNAME|" $MOUNTDIR/etc/sysconfig/network
-sed -i "s|\(127\.0\.0\.1\W*\)\(.*\)|\1 $TARGET_HOSTNAME.$TARGET_DOMAIN $TARGET_HOSTNAME \2|" \
-   $MOUNTDIR/etc/hosts
+echo "$TARGET_HOSTNAME.$TARGET_DOMAIN" > $MOUNTDIR/etc/hostname
  
 #install_rpms_by_target "Installing tools packages for ${MAKEDIST_TARGET} target" ${MAKEDIST_TARGET}-tools ""
 install_rpms_by_target "Installing ${PLATFORM} platform packages" ${MAKEDIST_TARGET}-${PLATFORM} "${RPMEXTRAARGS}"
...	...	@@ -85,10 +85,7 @@
85	85	[[ "$TARGET_HOSTNAME" ]] \|\| TARGET_HOSTNAME="$MAKEDIST_TARGET"
86	86	[[ "$TARGET_DOMAIN" ]] \|\| TARGET_DOMAIN="localdomain"
87	87
88		-echo "$TARGET_HOSTNAME" > $MOUNTDIR/etc/hostname
89		-sed -i "s\|HOSTNAME=.*\|HOSTNAME=$TARGET_HOSTNAME\|" $MOUNTDIR/etc/sysconfig/network
90		-sed -i "s\|\(127\.0\.0\.1\W\)\(.\)\|\1 $TARGET_HOSTNAME.$TARGET_DOMAIN $TARGET_HOSTNAME \2\|" \
91		- $MOUNTDIR/etc/hosts
	88	+echo "$TARGET_HOSTNAME.$TARGET_DOMAIN" > $MOUNTDIR/etc/hostname
92	89
93	90	#install_rpms_by_target "Installing tools packages for ${MAKEDIST_TARGET} target" ${MAKEDIST_TARGET}-tools ""
94	91	install_rpms_by_target "Installing ${PLATFORM} platform packages" ${MAKEDIST_TARGET}-${PLATFORM} "${RPMEXTRAARGS}"