Don't update the host-name field in dhclient.conf when not hardcoded.

On Debian and Ubuntu, the default host-name field in dhclient.conf is set to either "<hostname>" or "gethostname()" both of which get replaced by the machine's hostname at query time. The sed call currently present in lxc-clone hardcodes the hostname in dhclient.conf, causing dpkg to prompt on isc-dhcp updates. Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>

Don't update the host-name field in dhclient.conf when not hardcoded.
33f3de4e · Stéphane Graber · e470cba0 · 33f3de4e
Commit 33f3de4e authored Aug 29, 2012 by Stéphane Graber
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

lxc-clone.in src/lxc/lxc-clone.in +1 -1

No files found.
--- a/src/lxc/lxc-clone.in
+++ b/src/lxc/lxc-clone.in
@@ -265,7 +265,7 @@ fi
 echo "Updating rootfs..."

 # so you can 'ssh $hostname.' or 'ssh $hostname.local'
-if [ -f $rootfs/etc/dhcp/dhclient.conf ]; then
+if [ -f $rootfs/etc/dhcp/dhclient.conf ] && ! grep -q "^send host-name.*hostname" $rootfs/etc/dhcp/dhclient.conf; then
    sed -i "s/send host-name.*$/send host-name \"$hostname\";/" $rootfs/etc/dhcp/dhclient.conf
 fi