From a60c6c2d55df3d0334ecee6a0aeb0763cb8de5d9 Mon Sep 17 00:00:00 2001 From: Thomas Gambier <thomas.gambier@nexedi.com> Date: Thu, 1 Aug 2019 17:42:50 +0200 Subject: [PATCH] [nayuos] remove compilation of re6stnet inside NayuOS --- software/nayuos/scripts/test_nayuos_image | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/software/nayuos/scripts/test_nayuos_image b/software/nayuos/scripts/test_nayuos_image index 11f8bf48b..849a8af70 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,13 +36,11 @@ install -d "${MOUNTPOINT}" ./mount_gpt_image.sh --safe --most_recent --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}") virtualenvbin=$(ls "${MOUNTPOINT}/${VIRTUALENV_BIN}") chromium_policy=$(ls "${MOUNTPOINT}/${CHROMIUM_POLICY}") - else is_empty=1 fi @@ -60,15 +56,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}" -- 2.30.9