cleanup: chroot_generic_startup_scripts -> rfs_startup_scripts conversion

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>

beagleboard.org_image.sh

@@ -117,16 +117,16 @@ minimal_armel () {
 		base_pkg_list="${base_pkg_list}"
 		chroot_multiarch_armel="${chroot_multiarch_armel}"
 
-		rfs_hostname="${rfs_hostname}"
-
 		rfs_username="${rfs_username}"
 		rfs_fullname="${rfs_fullname}"
 		rfs_password="${rfs_password}"
 
+		rfs_hostname="${rfs_hostname}"
+		rfs_startup_scripts="${rfs_startup_scripts}"
+
 		include_firmware="${include_firmware}"
 
 		chroot_very_small_image="${chroot_very_small_image}"
-		chroot_generic_startup_scripts="${chroot_generic_startup_scripts}"
 		chroot_ENABLE_DEB_SRC="${chroot_ENABLE_DEB_SRC}"
 		chroot_KERNEL_HTTP_DIR="${chroot_KERNEL_HTTP_DIR}"
 
@@ -405,7 +405,7 @@ chroot_COPY_SETUP_SDCARD="enable"
 
 #FIXME: things to add to .config:
 include_firmware="enable"
-chroot_generic_startup_scripts="enable"
+rfs_startup_scripts="enable"
 chroot_script="beagleboard.org.sh"
 chroot_uenv_txt="beagleboard.org.txt"
 

eewiki_barefs_image.sh

@@ -75,16 +75,16 @@ minimal_armel () {
 		base_pkg_list=""
 		chroot_multiarch_armel="${chroot_multiarch_armel}"
 
-		rfs_hostname="${rfs_hostname}"
-
 		rfs_username="${rfs_username}"
 		rfs_fullname="${rfs_fullname}"
 		rfs_password="${rfs_password}"
 
+		rfs_hostname="${rfs_hostname}"
+		rfs_startup_scripts="${rfs_startup_scripts}"
+
 		include_firmware="${include_firmware}"
 
 		chroot_very_small_image="${chroot_very_small_image}"
-		chroot_generic_startup_scripts="${chroot_generic_startup_scripts}"
 		chroot_ENABLE_DEB_SRC="${chroot_ENABLE_DEB_SRC}"
 		chroot_KERNEL_HTTP_DIR="${chroot_KERNEL_HTTP_DIR}"
 
@@ -279,7 +279,7 @@ fi
 
 #FIXME: things to add to .config:
 #include_firmware="enable"
-#chroot_generic_startup_scripts="enable"
+#rfs_startup_scripts="enable"
 #chroot_script=""
 
 #repo_external=""

eewiki_base_image.sh

@@ -75,16 +75,16 @@ minimal_armel () {
 		base_pkg_list=""
 		chroot_multiarch_armel="${chroot_multiarch_armel}"
 
-		rfs_hostname="${rfs_hostname}"
-
 		rfs_username="${rfs_username}"
 		rfs_fullname="${rfs_fullname}"
 		rfs_password="${rfs_password}"
 
+		rfs_hostname="${rfs_hostname}"
+		rfs_startup_scripts="${rfs_startup_scripts}"
+
 		include_firmware="${include_firmware}"
 
 		chroot_very_small_image="${chroot_very_small_image}"
-		chroot_generic_startup_scripts="${chroot_generic_startup_scripts}"
 		chroot_ENABLE_DEB_SRC="${chroot_ENABLE_DEB_SRC}"
 		chroot_KERNEL_HTTP_DIR="${chroot_KERNEL_HTTP_DIR}"
 
@@ -281,7 +281,7 @@ fi
 
 #FIXME: things to add to .config:
 include_firmware="enable"
-chroot_generic_startup_scripts="enable"
+rfs_startup_scripts="enable"
 #chroot_script=""
 
 #repo_external=""

rcn-ee_image.sh

@@ -85,16 +85,16 @@ minimal_armel () {
 		base_pkg_list="${base_pkg_list}"
 		chroot_multiarch_armel="${chroot_multiarch_armel}"
 
-		rfs_hostname="${rfs_hostname}"
-
 		rfs_username="${rfs_username}"
 		rfs_fullname="${rfs_fullname}"
 		rfs_password="${rfs_password}"
 
+		rfs_hostname="${rfs_hostname}"
+		rfs_startup_scripts="${rfs_startup_scripts}"
+
 		include_firmware="${include_firmware}"
 
 		chroot_very_small_image="${chroot_very_small_image}"
-		chroot_generic_startup_scripts="${chroot_generic_startup_scripts}"
 		chroot_ENABLE_DEB_SRC="${chroot_ENABLE_DEB_SRC}"
 		chroot_KERNEL_HTTP_DIR="${chroot_KERNEL_HTTP_DIR}"
 
@@ -359,7 +359,7 @@ chroot_COPY_SETUP_SDCARD="enable"
 
 #FIXME: things to add to .config:
 include_firmware="enable"
-chroot_generic_startup_scripts="enable"
+rfs_startup_scripts="enable"
 #chroot_script=""
 
 #repo_external=""

rcn-ee_test_image.sh

@@ -85,16 +85,17 @@ minimal_armel () {
 		base_pkg_list="${base_pkg_list}"
 		chroot_multiarch_armel="${chroot_multiarch_armel}"
 
-		rfs_hostname="${rfs_hostname}"
 
 		rfs_username="${rfs_username}"
 		rfs_fullname="${rfs_fullname}"
 		rfs_password="${rfs_password}"
 
+		rfs_hostname="${rfs_hostname}"
+		rfs_startup_scripts="${rfs_startup_scripts}"
+
 		include_firmware="${include_firmware}"
 
 		chroot_very_small_image="${chroot_very_small_image}"
-		chroot_generic_startup_scripts="${chroot_generic_startup_scripts}"
 		chroot_ENABLE_DEB_SRC="${chroot_ENABLE_DEB_SRC}"
 		chroot_KERNEL_HTTP_DIR="${chroot_KERNEL_HTTP_DIR}"
 
@@ -330,7 +331,7 @@ chroot_COPY_SETUP_SDCARD="enable"
 
 #FIXME: things to add to .config:
 include_firmware="enable"
-chroot_generic_startup_scripts="enable"
+rfs_startup_scripts="enable"
 #chroot_script=""
 
 #repo_external=""

scripts/chroot.sh

@@ -602,7 +602,7 @@ cat > ${DIR}/chroot_script.sh <<-__EOF__
 	}
 
 	debian_startup_script () {
-		if [ "x${chroot_generic_startup_scripts}" = "xenable" ] ; then
+		if [ "x${rfs_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
@@ -619,7 +619,7 @@ cat > ${DIR}/chroot_script.sh <<-__EOF__
 	}
 
 	ubuntu_startup_script () {
-		if [ "x${chroot_generic_startup_scripts}" = "xenable" ] ; then
+		if [ "x${rfs_startup_scripts}" = "xenable" ] ; then
 			if [ -f /etc/init/boot_scripts.conf ] ; then
 				chown root:root /etc/init/boot_scripts.conf
 			fi
@@ -642,7 +642,7 @@ cat > ${DIR}/chroot_script.sh <<-__EOF__
 			;;
 		esac
 
-		if [ "x${chroot_generic_startup_scripts}" = "xenable" ] ; then
+		if [ "x${rfs_startup_scripts}" = "xenable" ] ; then
 
 			if [ -f /usr/bin/git ] ; then
 				mkdir -p /opt/scripts/ || true
@@ -765,7 +765,7 @@ chroot_mount
 sudo chroot ${tempdir} /bin/sh chroot_script.sh
 echo "Log: Complete: [sudo chroot ${tempdir} /bin/sh chroot_script.sh]"
 
-if [ "x${chroot_generic_startup_scripts}" = "xenable" ] ; then
+if [ "x${rfs_startup_scripts}" = "xenable" ] ; then
 	if [ ! -f ${tempdir}/opt/scripts/.git/config ] ; then
 		echo "Log: ERROR: git clone of https://github.com/RobertCNelson/boot-scripts failed.."
 		exit 1

variables.txt

@@ -16,3 +16,4 @@ rfs_password
 
 Image Setup:
 rfs_hostname
+rfs_startup_scripts