diff --git a/software/nayuos/instance.cfg b/software/nayuos/instance.cfg index d51e875f11d7e85caa5870f94402aef7e1396251..286de3f82c95be750d631fbde91fac17120debc3 100644 --- a/software/nayuos/instance.cfg +++ b/software/nayuos/instance.cfg @@ -116,4 +116,4 @@ context = # those packages will be marked as dependency of root filesystem raw nayu_dev_rootfs_packages app-misc/nayuos-chromium-policy # those packages will be marked as dependency of the chromium build itself - raw nayu_dev_packages net-misc/re6stnet dev-vcs/git dev-python/flask dev-python/virtualenv sys-fs/cryptsetup + raw nayu_dev_packages dev-vcs/git dev-python/flask dev-python/virtualenv sys-fs/cryptsetup diff --git a/software/nayuos/scripts/test_nayuos_image b/software/nayuos/scripts/test_nayuos_image index 80755036f43c07133d1401ee5115fe5a5a7afc91..b0eecabee80c5ad21c3ce3c4766c4147ca0ba7ba 100644 --- a/software/nayuos/scripts/test_nayuos_image +++ b/software/nayuos/scripts/test_nayuos_image @@ -10,8 +10,6 @@ fi BOARD=$1 MOUNTPOINT="/tmp/${BOARD}" -ORIGINAL_GRANDENET_SCRIPT=~/trunk/src/third_party/chromiumos-overlay/net-misc/re6stnet/files/grandenet -GRANDENET_SCRIPT="usr/local/bin/grandenet" INIT_SSH_SERVER="etc/init/openssh-server.conf" BASHRC="etc/skel/.bashrc" GIT_CORE="usr/local/libexec/git-core/" @@ -38,7 +36,6 @@ install -d "${MOUNTPOINT}" ./mount_gpt_image.sh --safe -f $( ./get_latest_image.sh --board=${BOARD} ) -r ${MOUNTPOINT} echo $(ls "${MOUNTPOINT}/usr/local") if [[ $(ls "${MOUNTPOINT}/usr/local") ]] ; then - my_diff=$(diff "${ORIGINAL_GRANDENET_SCRIPT}" "${MOUNTPOINT}/${GRANDENET_SCRIPT}") opensshd_config=$(ls "${MOUNTPOINT}/${INIT_SSH_SERVER}") gitcore=$(ls "${MOUNTPOINT}/${GIT_CORE}") gitexport=$(grep "${GIT_EXPECTED_EXPORT}" "${MOUNTPOINT}/${BASHRC}") @@ -60,15 +57,6 @@ if [[ "${is_empty}" == "1" ]] ; then else print_result ${SUCCESS} "/usr/local is not empty." - echo "* test grandenet script existence and content" - if [[ ${no_grandenet_script} == 1 ]] ; then - print_result ${FAILURE} "grandenet script is missing (no file at ${GRANDENET_SCRIPT})." - elif [[ ${my_diff} != "" ]] ; then - print_result ${FAILURE} "grandenet scripts differs:\n${my_diff}" - else - print_result ${SUCCESS} "${GRANDENET_SCRIPT} exists and contains what is expected." - fi - echo "* test openssh server init script absence" if [[ ${opensshd_config} ]] ; then print_result ${FAILURE} "opensshd config exists: ${opensshd_config}"