diff options
| author | makefu <github@syntax-fehler.de> | 2014-04-02 04:08:54 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2014-04-02 04:08:54 +0200 |
| commit | 7515ca585d1cbf2df269bfd46017fe513dbb848c (patch) | |
| tree | b254d0326d305806c04a02dba6617c65da6e2d64 /filehooker/root-image | |
| parent | e33e18050f7c3fdc9093f3f2da8470fbf8017e57 (diff) | |
set hostname correctly, using own mac-based hostid
Diffstat (limited to 'filehooker/root-image')
6 files changed, 11 insertions, 9 deletions
diff --git a/filehooker/root-image/etc/systemd/system/filehooker-hostname.service b/filehooker/root-image/etc/systemd/system/filehooker-hostname.service index 8a23773c..bcee7964 100644 --- a/filehooker/root-image/etc/systemd/system/filehooker-hostname.service +++ b/filehooker/root-image/etc/systemd/system/filehooker-hostname.service @@ -1,11 +1,11 @@ [Unit] Description=change filehooker hostname -Before=network.target nss-lookup.target +Before=network.target nss-lookup.target multi-user.target [Service] Type=oneshot RemainAfterExit=yes -ExecStart=/krebs/bin/filehooker_set_hostname.sh +ExecStart=/krebs/bin/set-hostname.sh [Install] WantedBy=multi-user.target diff --git a/filehooker/root-image/etc/systemd/system/ntpdate.service.d/set_hwclock.conf b/filehooker/root-image/etc/systemd/system/ntpdate.service.d/set_hwclock.conf new file mode 100644 index 00000000..e57550c8 --- /dev/null +++ b/filehooker/root-image/etc/systemd/system/ntpdate.service.d/set_hwclock.conf @@ -0,0 +1,2 @@ +[Service] +ExecStart=/usr/bin/hwclock --systohc --utc -w diff --git a/filehooker/root-image/etc/systemd/system/start-ncdc@hooker.service.d/wait.service b/filehooker/root-image/etc/systemd/system/start-ncdc@hooker.service.d/wait.service deleted file mode 100644 index 45a9b4c8..00000000 --- a/filehooker/root-image/etc/systemd/system/start-ncdc@hooker.service.d/wait.service +++ /dev/null @@ -1,2 +0,0 @@ -[service] -ExecStartPre=/usr/bin/sleep 20 diff --git a/filehooker/root-image/krebs/bin/filehooker_set_hostname.sh b/filehooker/root-image/krebs/bin/filehooker_set_hostname.sh deleted file mode 100755 index cb9b0170..00000000 --- a/filehooker/root-image/krebs/bin/filehooker_set_hostname.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/bash -hostn="filehooker$RANDOM" -echo "$hostn" > /etc/hostname -hostname $hostn - diff --git a/filehooker/root-image/krebs/bin/macid.sh b/filehooker/root-image/krebs/bin/macid.sh new file mode 100755 index 00000000..0fccc84b --- /dev/null +++ b/filehooker/root-image/krebs/bin/macid.sh @@ -0,0 +1,2 @@ +#!/bin/sh +ip addr | grep ether | awk '{print $2}' | sort |md5sum | awk '{print $1}' | dd bs=1 count=6 2>/dev/null diff --git a/filehooker/root-image/krebs/bin/set-hostname.sh b/filehooker/root-image/krebs/bin/set-hostname.sh new file mode 100755 index 00000000..31101a18 --- /dev/null +++ b/filehooker/root-image/krebs/bin/set-hostname.sh @@ -0,0 +1,5 @@ +#!/bin/sh +hostn="elch_$(/krebs/bin/macid.sh)" +hostnamectl set-hostname "$hostn" +hostname $hostn +echo "$hostn" > /etc/hostname |