From f9d56d8d227d4d9b487551bb5d16e843ebe975ef Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Mon, 26 Oct 2015 12:56:21 -0500
Subject: [PATCH] chroot: vivid,wily,xenail = systemd, trusty = uptart
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
scripts/chroot.sh | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/scripts/chroot.sh b/scripts/chroot.sh
index 41a6357a5..d1fb39995 100755
--- a/scripts/chroot.sh
+++ b/scripts/chroot.sh
@@ -408,14 +408,7 @@ if [ "x${deb_arch}" = "xarmhf" ] ; then
;;
ubuntu)
case "${deb_codename}" in
- xenial)
- #while bb-customizations installes "generic-board-startup.service" other boards/configs could use this default.
- sudo cp "${OIB_DIR}/target/init_scripts/systemd-generic-board-startup.service" "${tempdir}/lib/systemd/system/generic-board-startup.service"
- sudo cp "${OIB_DIR}/target/init_scripts/systemd-capemgr.service" "${tempdir}/lib/systemd/system/capemgr.service"
- sudo cp "${OIB_DIR}/target/init_scripts/capemgr" "${tempdir}/etc/default/"
- distro="Ubuntu"
- ;;
- *)
+ trusty)
sudo cp "${OIB_DIR}/target/init_scripts/generic-${deb_distribution}.conf" "${tempdir}/etc/init/generic-boot-script.conf"
sudo cp "${OIB_DIR}/target/init_scripts/capemgr-${deb_distribution}.sh" "${tempdir}/etc/init/capemgr.sh"
sudo cp "${OIB_DIR}/target/init_scripts/capemgr" "${tempdir}/etc/default/"
@@ -428,6 +421,13 @@ if [ "x${deb_arch}" = "xarmhf" ] ; then
sudo sed -i -e 's:sleep 59:#sleep 59:g' "${tempdir}/etc/init/failsafe.conf"
fi
;;
+ vivid|wily|xenial)
+ #while bb-customizations installes "generic-board-startup.service" other boards/configs could use this default.
+ sudo cp "${OIB_DIR}/target/init_scripts/systemd-generic-board-startup.service" "${tempdir}/lib/systemd/system/generic-board-startup.service"
+ sudo cp "${OIB_DIR}/target/init_scripts/systemd-capemgr.service" "${tempdir}/lib/systemd/system/capemgr.service"
+ sudo cp "${OIB_DIR}/target/init_scripts/capemgr" "${tempdir}/etc/default/"
+ distro="Ubuntu"
+ ;;
esac
;;
esac
--
GitLab