From 252db67ee01f711806f683a930d4d90bd607b68c Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Thu, 19 Dec 2013 12:18:30 -0600
Subject: [PATCH] rename: startup scripts
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
beagleboard.org_image.sh | 4 ++--
eewiki_barefs_image.sh | 4 ++--
eewiki_base_image.sh | 4 ++--
rcn-ee_image.sh | 4 ++--
scripts/chroot.sh | 6 +++---
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/beagleboard.org_image.sh b/beagleboard.org_image.sh
index e629fb788..3d39e0fc6 100755
--- a/beagleboard.org_image.sh
+++ b/beagleboard.org_image.sh
@@ -97,7 +97,7 @@ minimal_armel () {
include_firmware="${include_firmware}"
chroot_very_small_image="${chroot_very_small_image}"
- chroot_rcnee_startup_scripts="${chroot_rcnee_startup_scripts}"
+ chroot_generic_startup_scripts="${chroot_generic_startup_scripts}"
chroot_ENABLE_DEB_SRC="${chroot_ENABLE_DEB_SRC}"
chroot_KERNEL_HTTP_DIR="${chroot_KERNEL_HTTP_DIR}"
@@ -320,7 +320,7 @@ chroot_COPY_SETUP_SDCARD="enable"
#FIXME: things to add to .config:
include_firmware="enable"
-chroot_rcnee_startup_scripts="enable"
+chroot_generic_startup_scripts="enable"
chroot_nuke_root_password="enable"
chroot_install_cloud9="enable"
#chroot_cloud9_git_tag="v2.0.93"
diff --git a/eewiki_barefs_image.sh b/eewiki_barefs_image.sh
index a3d0f86cb..7b44caf94 100755
--- a/eewiki_barefs_image.sh
+++ b/eewiki_barefs_image.sh
@@ -79,7 +79,7 @@ minimal_armel () {
include_firmware="${include_firmware}"
chroot_very_small_image="${chroot_very_small_image}"
- chroot_rcnee_startup_scripts="${chroot_rcnee_startup_scripts}"
+ chroot_generic_startup_scripts="${chroot_generic_startup_scripts}"
chroot_ENABLE_DEB_SRC="${chroot_ENABLE_DEB_SRC}"
chroot_KERNEL_HTTP_DIR="${chroot_KERNEL_HTTP_DIR}"
@@ -264,7 +264,7 @@ fi
#FIXME: things to add to .config:
#include_firmware="enable"
-#chroot_rcnee_startup_scripts="enable"
+#chroot_generic_startup_scripts="enable"
no_pkgs="enable"
dpkg_arch="armel"
diff --git a/eewiki_base_image.sh b/eewiki_base_image.sh
index 91432d90d..5d58f6465 100755
--- a/eewiki_base_image.sh
+++ b/eewiki_base_image.sh
@@ -80,7 +80,7 @@ minimal_armel () {
include_firmware="${include_firmware}"
chroot_very_small_image="${chroot_very_small_image}"
- chroot_rcnee_startup_scripts="${chroot_rcnee_startup_scripts}"
+ chroot_generic_startup_scripts="${chroot_generic_startup_scripts}"
chroot_ENABLE_DEB_SRC="${chroot_ENABLE_DEB_SRC}"
chroot_KERNEL_HTTP_DIR="${chroot_KERNEL_HTTP_DIR}"
@@ -267,7 +267,7 @@ fi
#FIXME: things to add to .config:
include_firmware="enable"
-chroot_rcnee_startup_scripts="enable"
+chroot_generic_startup_scripts="enable"
#no_pkgs="enable"
dpkg_arch="armel"
diff --git a/rcn-ee_image.sh b/rcn-ee_image.sh
index 3fd731db5..ddf929d5a 100755
--- a/rcn-ee_image.sh
+++ b/rcn-ee_image.sh
@@ -90,7 +90,7 @@ minimal_armel () {
include_firmware="${include_firmware}"
chroot_very_small_image="${chroot_very_small_image}"
- chroot_rcnee_startup_scripts="${chroot_rcnee_startup_scripts}"
+ chroot_generic_startup_scripts="${chroot_generic_startup_scripts}"
chroot_ENABLE_DEB_SRC="${chroot_ENABLE_DEB_SRC}"
chroot_KERNEL_HTTP_DIR="${chroot_KERNEL_HTTP_DIR}"
@@ -355,7 +355,7 @@ chroot_COPY_SETUP_SDCARD="enable"
#FIXME: things to add to .config:
include_firmware="enable"
-chroot_rcnee_startup_scripts="enable"
+chroot_generic_startup_scripts="enable"
#chroot_install_cloud9="enable"
#no_pkgs="enable"
diff --git a/scripts/chroot.sh b/scripts/chroot.sh
index 970350af1..61336b31c 100755
--- a/scripts/chroot.sh
+++ b/scripts/chroot.sh
@@ -517,7 +517,7 @@ cat > ${DIR}/chroot_script.sh <<-__EOF__
}
debian_startup_script () {
- if [ "x${chroot_rcnee_startup_scripts}" = "xenable" ] ; then
+ if [ "x${chroot_generic_startup_scripts}" = "xenable" ] ; then
if [ -f /etc/init.d/boot_scripts.sh ] ; then
chown root:root /etc/init.d/boot_scripts.sh
chmod +x /etc/init.d/boot_scripts.sh
@@ -527,7 +527,7 @@ cat > ${DIR}/chroot_script.sh <<-__EOF__
}
ubuntu_startup_script () {
- if [ "x${chroot_rcnee_startup_scripts}" = "xenable" ] ; then
+ if [ "x${chroot_generic_startup_scripts}" = "xenable" ] ; then
if [ -f /etc/init/boot_scripts.conf ] ; then
chown root:root /etc/init/boot_scripts.conf
fi
@@ -550,7 +550,7 @@ cat > ${DIR}/chroot_script.sh <<-__EOF__
;;
esac
- if [ "x${chroot_rcnee_startup_scripts}" = "xenable" ] ; then
+ if [ "x${chroot_generic_startup_scripts}" = "xenable" ] ; then
pkg="git-core"
dpkg_check
--
GitLab