From 7e9d5f0586660ed2c5849c836e9de43f92f7d783 Mon Sep 17 00:00:00 2001 From: D4rk4 Date: Fri, 31 Jul 2020 15:32:43 +0200 Subject: [PATCH] Introducing systemd mfg.service --- contrib/firstboot.sh | 9 +++++++-- contrib/k8s-seed.txt | 4 +++- contrib/mfg.service | 15 +++++++++++++++ contrib/rc_local.tpl | 6 ------ 4 files changed, 25 insertions(+), 9 deletions(-) create mode 100644 contrib/mfg.service delete mode 100755 contrib/rc_local.tpl diff --git a/contrib/firstboot.sh b/contrib/firstboot.sh index 9c1d808..170ded0 100755 --- a/contrib/firstboot.sh +++ b/contrib/firstboot.sh @@ -1,4 +1,5 @@ #!/bin/bash +bootflag='/.manufactured' groot='/opt/coins-demo' k8sDemoWA () { @@ -11,5 +12,9 @@ ansible () { ansible-playbook bootstrap-node.yml && \ ansible-playbook init-cluster.yml } -k8sDemoWA; -ansible; + +if [ ! -f ${bootflag} ]; then + touch ${bootflag} + k8sDemoWA; + ansible; +fi diff --git a/contrib/k8s-seed.txt b/contrib/k8s-seed.txt index 7d11209..3389a55 100644 --- a/contrib/k8s-seed.txt +++ b/contrib/k8s-seed.txt @@ -102,7 +102,9 @@ d-i preseed/late_command string in-target /bin/sh -c " \ curl -L https://dl.bintray.com/flant/werf/v1.1.19+fix10/werf-linux-amd64-v1.1.19+fix10 -o /usr/bin/werf ; \ chmod +x /usr/bin/werf ; \ git clone https://git.ix.gs/public/coins-demo.git /opt/coins-demo ; \ - cp /opt/coins-demo/contrib/rc_local.tpl /etc/rc.local ; \ + cp /opt/coins-demo/contrib/mfg.service /usr/lib/systemd/system/ ; \ + systemctl daemon-reload ; \ + systemctl enable mfg.service ; \ systemctl enable serial-getty@ttyS0.service ; \ systemctl enable docker.service \ || true" diff --git a/contrib/mfg.service b/contrib/mfg.service new file mode 100644 index 0000000..81401b6 --- /dev/null +++ b/contrib/mfg.service @@ -0,0 +1,15 @@ +[Unit] +Description=Manufacturing service +After=serial-getty@ttyS0.service +After=docker.service + +[Service] +Type=oneshot +ExecStart=/opt/coins-demo/contrib/firstboot.sh +StandardInput=tty +TTYPath=/dev/ttyS0 +TTYReset=yes +TTYVHangup=yes + +[Install] +WantedBy=multi-user.target diff --git a/contrib/rc_local.tpl b/contrib/rc_local.tpl deleted file mode 100755 index c03aa0c..0000000 --- a/contrib/rc_local.tpl +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -bootflag="/.manufactured" -if [ ! -f ${bootflag} ]; then - exec /opt/coins-demo/contrib/firstboot.sh - touch ${bootflag} -fi