From f2e76fa67923cef261dd5182226f8612fb453e62 Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Tue, 25 Jun 2013 17:49:03 +0200
Subject: [PATCH] attempt to gather more data on bootcd boot sequence when run
 under systemd

---
 initscripts/pl_wrapper  | 10 ++++++++++
 prep.sh                 |  2 +-
 systemd/pl_boot.service |  4 +---
 3 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 initscripts/pl_wrapper

diff --git a/initscripts/pl_wrapper b/initscripts/pl_wrapper
new file mode 100644
index 0000000..6e08c84
--- /dev/null
+++ b/initscripts/pl_wrapper
@@ -0,0 +1,10 @@
+#!/bin/bash
+#
+# nodes starting up with fedora18 - especially under kvm/qemu btw
+# tend to unreliably startup, this is an attempt to get more details 
+# on what is actually going on by running pl_boot and pl_sysinit in -x mode
+# and logging everything in /var/log/pl-boot
+#
+# also we just run both in sequence instead of relying on convoluted systemd dependencies
+#
+(bash -x /etc/init.d/pl_sysinit ; bash -x /etc/init.d/pl_boot) >> /var/log/pl-boot 2>&1
diff --git a/prep.sh b/prep.sh
index 6e256c0..fe47ee0 100755
--- a/prep.sh
+++ b/prep.sh
@@ -60,7 +60,7 @@ install -D -m 755 ipnmac/ipnmac.x86 $bootcd/usr/sbin/ipnmac
 
 # Install initscripts
 echo "* Installing initscripts"
-for file in pl_functions pl_sysinit pl_hwinit pl_netinit pl_validateconf pl_boot ; do
+for file in pl_functions pl_sysinit pl_hwinit pl_netinit pl_validateconf pl_boot pl_wrapper ; do
     sed -i -e "s,@PLDISTRO@,$pldistro,g" -e "s,@FCDISTRO@,$fcdistro,g" initscripts/$file
     install -D -m 755 initscripts/$file $bootcd/etc/init.d/$file
 done
diff --git a/systemd/pl_boot.service b/systemd/pl_boot.service
index 793bd3d..c8f0a38 100644
--- a/systemd/pl_boot.service
+++ b/systemd/pl_boot.service
@@ -2,7 +2,5 @@
 Description=pl_boot service
 
 [Service]
-ExecStart=/etc/init.d/pl_boot
-ExecStartPre=/etc/init.d/pl_sysinit
+ExecStart=/etc/init.d/pl_wrapper
 Type=oneshot
-
-- 
2.43.0