From 3e1ca3c9980d36c180d5557d329e8bbbc45c4bf7 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Tue, 20 May 2014 17:08:19 -0500
Subject: [PATCH] config: add bare examples

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 config/eewiki_bare_debian_stable_armel.conf | 20 ++++++++++++++++++++
 config/eewiki_bare_debian_stable_armhf.conf | 20 ++++++++++++++++++++
 scripts/chroot.sh                           |  5 +++--
 3 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 config/eewiki_bare_debian_stable_armel.conf
 create mode 100644 config/eewiki_bare_debian_stable_armhf.conf

diff --git a/config/eewiki_bare_debian_stable_armel.conf b/config/eewiki_bare_debian_stable_armel.conf
new file mode 100644
index 000000000..3b44a2663
--- /dev/null
+++ b/config/eewiki_bare_debian_stable_armel.conf
@@ -0,0 +1,20 @@
+#
+release="7.5"
+image_type="bare"
+#
+deb_distribution="debian"
+deb_codename="wheezy"
+deb_arch="armel"
+deb_include=""
+deb_exclude="aptitude aptitude-common groff-base info install-info libept1.4.12 manpages man-db tasksel tasksel-data vim-common vim-tiny wget whiptail"
+deb_components="main contrib non-free"
+#
+rfs_username="debian"
+rfs_fullname="Demo User"
+rfs_password="temppwd"
+rfs_hostname="arm"
+rfs_startup_scripts=""
+rfs_startup_scripts_rcnee=""
+rfs_strip_locales="enable"
+#
+chroot_very_small_image="enable"
diff --git a/config/eewiki_bare_debian_stable_armhf.conf b/config/eewiki_bare_debian_stable_armhf.conf
new file mode 100644
index 000000000..889e36562
--- /dev/null
+++ b/config/eewiki_bare_debian_stable_armhf.conf
@@ -0,0 +1,20 @@
+#
+release="7.5"
+image_type="bare"
+#
+deb_distribution="debian"
+deb_codename="wheezy"
+deb_arch="armhf"
+deb_include=""
+deb_exclude="aptitude aptitude-common groff-base info install-info libept1.4.12 manpages man-db tasksel tasksel-data vim-common vim-tiny wget whiptail"
+deb_components="main contrib non-free"
+#
+rfs_username="debian"
+rfs_fullname="Demo User"
+rfs_password="temppwd"
+rfs_hostname="arm"
+rfs_startup_scripts=""
+rfs_startup_scripts_rcnee=""
+rfs_strip_locales="enable"
+#
+chroot_very_small_image="enable"
diff --git a/scripts/chroot.sh b/scripts/chroot.sh
index 1f2018835..1f7548692 100755
--- a/scripts/chroot.sh
+++ b/scripts/chroot.sh
@@ -568,9 +568,10 @@ cat > ${DIR}/chroot_script.sh <<-__EOF__
 	}
 
 	add_user () {
+		groupadd ${rfs_username} || true
 		groupadd admin || true
-
 		groupadd spi || true
+
 		echo "KERNEL==\"spidev*\", GROUP=\"spi\", MODE=\"0660\"" > /etc/udev/rules.d/50-spi.rules
 
 		default_groups="admin,adm,dialout,i2c,spi,cdrom,floppy,audio,dip,video,netdev,plugdev,users"
@@ -591,7 +592,7 @@ cat > ${DIR}/chroot_script.sh <<-__EOF__
 		pass_crypt=\$(perl -e 'print crypt(\$ARGV[0], "rcn-ee-salt")' ${rfs_password})
 
 		useradd -G "\${default_groups}" -s /bin/bash -m -p \${pass_crypt} -c "${rfs_fullname}" ${rfs_username}
-		grep ${rfs_username} /etc/group
+		grep ${rfs_username} /etc/passwd
 
 		mkdir -p /home/${rfs_username}/bin
 		chown ${rfs_username}:${rfs_username} /home/${rfs_username}/bin
-- 
GitLab