From fce744b0d9a648da5e2765af625c96370492f698 Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Mon, 13 Dec 2021 09:39:23 +0800
Subject: [PATCH] update images and rootfs build shell script
---
bsp/rootfs/build.sh | 34 +++++++++++++++++++++++++---------
1 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/bsp/rootfs/build.sh b/bsp/rootfs/build.sh
index c279fa3..eb3d8c3 100755
--- a/bsp/rootfs/build.sh
+++ b/bsp/rootfs/build.sh
@@ -96,14 +96,6 @@
chroot ${ROOTFS_DIR} dpkg --configure -a
printf "\n\n -- debootstrap fetch done -- \n\n"
- # set root password
- chroot ${ROOTFS_DIR} sh -c "echo root:${DEF_PASSWD} | chpasswd"
-
- # add extra user account
- chroot ${ROOTFS_DIR} sh -c "useradd -m -G sudo -s /bin/bash ${DEF_USER}"
- chroot ${ROOTFS_DIR} sh -c "echo ${DEF_USER}:${DEF_PASSWD} | chpasswd"
- chroot ${ROOTFS_DIR} sh -c "usermod -G video,audio ${DEF_USER}"
-
# Clear the MD5 value to install extra apps
sed -i -e "s|.*md5val.*|\t\"md5val\":\"MD5_Auto_Generate_Here\"|g" $APT_CONF
}
@@ -143,6 +135,22 @@
sed -i -e "s|.*md5val.*|\t\"md5val\":\"$md5_calc\"|g" $APT_CONF
printf "\n\n -- debootstrap apt install done --\n\n"
+
+ # modify root password
+ chroot ${ROOTFS_DIR} sh -c "echo root:${DEF_PASSWD} | chpasswd"
+
+ # add extra user account
+ set +e
+ grep "$DEF_USER" ${ROOTFS_DIR}/etc/passwd > /dev/null 2>&1
+ if [ $? != 0 ] ; then
+ printf "\n\n -- setup default user account --\n\n"
+ chroot ${ROOTFS_DIR} sh -c "useradd -m -s /bin/bash ${DEF_USER}"
+ chroot ${ROOTFS_DIR} sh -c "echo ${DEF_USER}:${DEF_PASSWD} | chpasswd"
+ chroot ${ROOTFS_DIR} sh -c "usermod -G video,audio,sudo avnet"
+
+ echo "${DEF_USER} ALL=(ALL:ALL) NOPASSWD:ALL" >> ${ROOTFS_DIR}/etc/sudoers
+ fi
+ set -e
fi
fi
}
@@ -158,6 +166,10 @@
rm -rf ${ROOTFS_DIR}/lib/modules/
cp -af ${DRV_PATH}/lib/modules ${ROOTFS_DIR}/lib/
+ if [ ! -d ${ROOTFS_DIR}/lib/firmware -a -s firmware.tar.bz2 ] ; then
+ tar -xjf firmware.tar.bz2 -C ${ROOTFS_DIR}/lib/
+ fi
+
printf "\n\n -- install kernel modules done --\n\n"
}
@@ -168,8 +180,12 @@
set +e
# update hostnmae and issue
+ echo "GNU/Linux $ROOTFS \n \l, default password '$DEF_PASSWD'." > ${ROOTFS_DIR}/etc/issue
echo $DEF_HOSTNAME > ${ROOTFS_DIR}/etc/hostname
- echo "$BOARD GNU/Linux $ROOTFS \n \l, default password '$DEF_PASSWD'." > ${ROOTFS_DIR}/etc/issue
+ grep "$BOARD" ${ROOTFS_DIR}/etc/hosts > /dev/null 2>&1
+ if [ $? != 0 ] ; then
+ echo "127.0.0.1 ${BOARD}" >> ${ROOTFS_DIR}/etc/hosts
+ fi
# update dns server
echo "nameserver 114.114.114.114" > ${ROOTFS_DIR}/etc/resolv.conf
--
Gitblit v1.9.1