diff --git a/roles/1-prep/templates/iiab-network-reset b/roles/1-prep/templates/iiab-network-reset index e17fe7add..1bf0ee361 100755 --- a/roles/1-prep/templates/iiab-network-reset +++ b/roles/1-prep/templates/iiab-network-reset @@ -15,12 +15,8 @@ cat << EOF > /tmp/script2overview #!/bin/bash # generate the body overview part diagnostic package about network echo "==========================================================" -for f in \$(ls /etc/sysconfig/network-scripts/ifcfg-*|gawk '{printf(" %s",\$1)}'); do - echo - echo \$f - cat \$f -done -echo +echo iiab.env +cat /etc/iiab/iiab.env echo "==========================================================" echo ifconfig ifconfig @@ -47,62 +43,29 @@ netstat -rn echo echo "==========================================================" echo "install log -- last 50 lines" -tail -50 /opt/schoolserver/iiab/iiab-install.log +tail -50 /opt/iiab/iiab/iiab-install.log echo echo "==========================================================" echo "iiab-network log -- last 50 lines" -if [ -f /opt/schoolserver/iiab/iiab-network.log ]; then -tail -50 /opt/schoolserver/iiab/iiab-network.log +if [ -f /opt/iiab/iiab/iiab-network.log ]; then +tail -50 /opt/iiab/iiab/iiab-network.log else echo no iiab-network.log fi echo echo "==========================================================" -cat /etc/fedora-release | grep 18 -if [ \$? -eq 0 ]; then - echo "nmcli conn list" - nmcli conn list 3>&2 -else - echo "nmcli conn show" - nmcli conn show 3>&2 -fi -echo -echo "==========================================================" -echo nmcli dev wifi list -nmcli dev wifi list EOF chmod 755 /tmp/script2overview /tmp/script2overview > /tmp/$basket/overview -if [ -f /opt/schoolserver/iiab/iiab-network.log ]; then - cp /opt/schoolserver/iiab/iiab-network.log /tmp/$basket +if [ -f /opt/iiab/iiab/iiab-network.log ]; then + cp /opt/iiab/iiab/iiab-network.log /tmp/$basket else touch /tmp/$basket/no_iiab-network.log fi -if [ -f /etc/sysconfig/iiab_domain_name ];then - cp -p /etc/sysconfig/iiab_domain_name /tmp/$basket -else - touch /tmp/$basket/iiab_domain_name_not_set -fi - -if [ -f /etc/sysconfig/iiab_lan_device ];then - cp -p /etc/sysconfig/iiab_lan_device /tmp/$basket -else - touch /tmp/$basket/iiab_lan_device_not_set -fi -if [ -f /etc/sysconfig/iiab_wan_device ];then - cp -p /etc/sysconfig/iiab_wan_device /tmp/$basket -else - touch /tmp/$basket/iiab_wan_device_not_set -fi -ls /etc/NetworkManager/system-connections > /dev/null -if [ $? -eq 0 ]; then - cp -rp /etc/NetworkManager/system-connections /tmp/$basket -fi -cp /etc/sysconfig/network-scripts/ifcfg-* /tmp/$basket -if [ -f /opt/schoolserver/iiab/iiab-network.log ]; then - cp -p /opt/schoolserver/iiab/iiab-network.log /tmp/$basket +if [ -f /opt/iiab/iiab/iiab-network.log ]; then + cp -p /opt/iiab/iiab/iiab-network.log /tmp/$basket fi mkdir -p /etc/iiab/diagnose/ @@ -119,19 +82,4 @@ else rm -rf /tmp/$basket fi -# clear out all the memory variables and let auto-configure start from scratch -rm -rf /etc/sysconfig/iiab_domain_name -rm -rf /etc/sysconfig/iiab_lan_device -rm -rf /etc/sysconfig/iiab_wan_device -rm -rf /etc/NetworkManager/system-connestions/* -if [ -f /etc/sysconfig/network-scripts/ifcfg-WAN ];then - mv /etc/sysconfig/network-scripts/ifcfg-WAN /root - echo -e "\n\nWAN setup file moved to /root for safekeeping.\n\n" -fi - -ls -1 /etc/sysconfig/network-scripts/ifcfg-*|grep -v -e ifcfg-lo -if [ $? -eq 0 ]; then - ls -1 /etc/sysconfig/network-scripts/ifcfg-*|grep -v -e ifcfg-lo|xargs rm -fi - -echo -e "\n\nAll Network variables erased. Now run 'iiab-network' to set up the new network configuration.\n\nPlease see /opt/schoolserver/iiab/docs/GETTING_HELP.rst for ways to get help or \nprovide the feedback which will improve XSCE\n\n" +echo -e "\n\nAll Network variables erased. Now run 'iiab-network' to set up the new network configuration.\n\nPlease see /opt/iiab/iiab/docs/GETTING_HELP.rst for ways to get help or \nprovide the feedback which will improve IIAB\n\n"