diff options
| author | Sebastian | 2014-01-30 11:30:48 +0100 |
|---|---|---|
| committer | Sebastian | 2014-01-30 11:30:48 +0100 |
| commit | 4d8896378340e8841e1b90c3b22e128a3502b07f (patch) | |
| tree | e7f7d46759baa790cfe5b7a5f2b6b74158e4b995 | |
| parent | allow to change default export path; on remote via mltk -n name; on server via (diff) | |
| parent | Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts (diff) | |
| download | tm-scripts-4d8896378340e8841e1b90c3b22e128a3502b07f.tar.gz tm-scripts-4d8896378340e8841e1b90c3b22e128a3502b07f.tar.xz tm-scripts-4d8896378340e8841e1b90c3b22e128a3502b07f.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
| -rwxr-xr-x | remote/rootfs/rootfs-stage31/data/inc/udhcpc-trigger | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/remote/rootfs/rootfs-stage31/data/inc/udhcpc-trigger b/remote/rootfs/rootfs-stage31/data/inc/udhcpc-trigger index 4f9cda68..50ace72e 100755 --- a/remote/rootfs/rootfs-stage31/data/inc/udhcpc-trigger +++ b/remote/rootfs/rootfs-stage31/data/inc/udhcpc-trigger @@ -79,7 +79,11 @@ if [ -n "$hostname" ]; then echo "..setting hostname $hostname (fqdn: $fqdn).." echo "$fqdn" > "/proc/sys/kernel/hostname" echo "$fqdn" > "/etc/hostname" +<<<<<<< HEAD + echo "$ip $fqdn $hostname" >> "/etc/hosts" +======= echo "$ip $fqdn $hostname" > "/etc/hosts" echo "SLX_HOSTNAME='$hostname'" >> "/run/config" +>>>>>>> 7d9fdc9dc8069ddb9f55a527119cc86894f2ed3b fi |