diff options
| author | Jonathan Bauer | 2014-01-30 11:36:31 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2014-01-30 11:36:31 +0100 |
| commit | b03e0ce4feecea1e50705cd3fd7a4119d04cdc6d (patch) | |
| tree | 6e9eb04323365902254d41fa39091d212c87504d | |
| parent | Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts (diff) | |
| download | tm-scripts-b03e0ce4feecea1e50705cd3fd7a4119d04cdc6d.tar.gz tm-scripts-b03e0ce4feecea1e50705cd3fd7a4119d04cdc6d.tar.xz tm-scripts-b03e0ce4feecea1e50705cd3fd7a4119d04cdc6d.zip | |
[rfs-s31] oops
| -rwxr-xr-x | remote/rootfs/rootfs-stage31/data/inc/udhcpc-trigger | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/remote/rootfs/rootfs-stage31/data/inc/udhcpc-trigger b/remote/rootfs/rootfs-stage31/data/inc/udhcpc-trigger index 50ace72e..a2c45378 100755 --- a/remote/rootfs/rootfs-stage31/data/inc/udhcpc-trigger +++ b/remote/rootfs/rootfs-stage31/data/inc/udhcpc-trigger @@ -79,11 +79,7 @@ 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 |