diff --git a/roles/network/tasks/enable_services.yml b/roles/network/tasks/enable_services.yml index 2991a0c58..4566c00bb 100644 --- a/roles/network/tasks/enable_services.yml +++ b/roles/network/tasks/enable_services.yml @@ -202,17 +202,6 @@ # group: root mode: 0755 -- name: Install /usr/bin/iiab-internet-on|off from template (root:root by default) - template: - src: "{{ item }}" - dest: /usr/bin/ - # owner: root - # group: root - mode: 0755 - with_items: - - gateway/iiab-internet-on - - gateway/iiab-internet-off - - name: Add 'squid' variable values to {{ iiab_ini_file }} - if squid_installed is defined ini_file: diff --git a/roles/network/tasks/install.yml b/roles/network/tasks/install.yml index 08ddb9113..2a76b10c2 100644 --- a/roles/network/tasks/install.yml +++ b/roles/network/tasks/install.yml @@ -76,6 +76,26 @@ include_tasks: roles/network/tasks/squid.yml when: squid_install and squid_installed is undefined +- name: Link /usr/local/sbin/netwarn to {{ iiab_dir }}/scripts/netwarn + file: + src: "{{ iiab_dir }}/scripts/netwarn.sh" + dest: /usr/local/sbin/netwarn + mode: '0755' + state: link + +- name: Install /usr/bin/iiab-internet-on|off from template (root:root by default) + template: + src: "{{ item }}" + dest: /usr/bin/ + # owner: root + # group: root + mode: 0755 + with_items: + - gateway/iiab-internet-on + - gateway/iiab-internet-off + +# mate desktop detection based on 'register: nd_dir' + - name: "Set 'network_installed: True'" set_fact: diff --git a/scripts/netwarn.sh b/scripts/netwarn.sh new file mode 100644 index 000000000..8524c22f8 --- /dev/null +++ b/scripts/netwarn.sh @@ -0,0 +1,8 @@ +if ! [ -f /etc/iiab/install-flags/iiab-network-complete ]; then + zenity --question --text="You need to provision the network. Ensure you have your upstream internet active first if needed. You will be prompted for your password. You should REBOOT afterwards, do you want to Proceed?" + rc=$? + if [ $rc == "1" ]; then + exit 1 + fi + x-terminal-emulator -e /usr/local/bin/iiab-network +fi