From 82894e898a5a2bb344d4f7d2a6c675f2fa9be8a8 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Mon, 10 Jun 2013 14:06:42 -0500
Subject: [PATCH] ubuntu: remove upstart sleep delays by default
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
scripts/chroot.sh | 7 +++++++
tools/setup_sdcard.sh | 12 ------------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/scripts/chroot.sh b/scripts/chroot.sh
index d14e4b8f3..ef5600fe0 100755
--- a/scripts/chroot.sh
+++ b/scripts/chroot.sh
@@ -257,6 +257,13 @@ ubuntu)
sudo mv /tmp/${wfile} ${tempdir}/etc/${wfile}
+ if [ -f ${tempdir}/etc/init/failsafe.conf ] ; then
+ #Ubuntu: with no ethernet cable connected it can take up to 2 mins to login, removing upstart sleep calls..."
+ sudo sed -i -e 's:sleep 20:#sleep 20:g' ${tempdir}/etc/init/failsafe.conf
+ sudo sed -i -e 's:sleep 40:#sleep 40:g' ${tempdir}/etc/init/failsafe.conf
+ sudo sed -i -e 's:sleep 59:#sleep 59:g' ${tempdir}/etc/init/failsafe.conf
+ fi
+
;;
esac
diff --git a/tools/setup_sdcard.sh b/tools/setup_sdcard.sh
index c2e32369f..6d72d74e3 100755
--- a/tools/setup_sdcard.sh
+++ b/tools/setup_sdcard.sh
@@ -1102,18 +1102,6 @@ populate_rootfs () {
echo "vm.min_free_kbytes = ${usbnet_mem}" >> ${TEMPDIR}/disk/etc/sysctl.conf
fi
- if [ -f ${TEMPDIR}/disk/etc/init/failsafe.conf ] ; then
- echo "Ubuntu: with no ethernet cable connected it can take up to 2 mins to login, removing upstart sleep calls..."
- echo "-----------------------------"
- echo "Ubuntu: to unfix: sudo sed -i -e 's:#sleep 20:sleep 20:g' /etc/init/failsafe.conf"
- echo "Ubuntu: to unfix: sudo sed -i -e 's:#sleep 40:sleep 40:g' /etc/init/failsafe.conf"
- echo "Ubuntu: to unfix: sudo sed -i -e 's:#sleep 59:sleep 59:g' /etc/init/failsafe.conf"
- echo "-----------------------------"
- sed -i -e 's:sleep 20:#sleep 20:g' ${TEMPDIR}/disk/etc/init/failsafe.conf
- sed -i -e 's:sleep 40:#sleep 40:g' ${TEMPDIR}/disk/etc/init/failsafe.conf
- sed -i -e 's:sleep 59:#sleep 59:g' ${TEMPDIR}/disk/etc/init/failsafe.conf
- fi
-
if [ "${CREATE_SWAP}" ] ; then
echo "-----------------------------"
echo "Extra: Creating SWAP File"
--
GitLab