diff --git a/iiab-network b/iiab-network index 6ff4b5cd3..9ac41f986 100755 --- a/iiab-network +++ b/iiab-network @@ -94,3 +94,4 @@ echo "iiab-network run start: $Start" echo "iiab-network run end: $End" echo echo "Please REBOOT to fully verify your network -- graphical desktops MUST reboot!" +exit 0 diff --git a/roles/1-prep/tasks/main.yml b/roles/1-prep/tasks/main.yml index 96ff6779d..929dd04da 100644 --- a/roles/1-prep/tasks/main.yml +++ b/roles/1-prep/tasks/main.yml @@ -23,12 +23,18 @@ name: iiab-admin #when: iiab_admin_install # Flag might be created in future? -- name: Copy iiab-apps-to-be-installed from {{ iiab_dir }} to /usr/bin/ +- name: Copy iiab-apps-to-be-installed from {{ iiab_dir }}/scripts to /usr/bin/ copy: src: "{{ iiab_dir }}/scripts/iiab-apps-to-be-installed" # /opt/iiab/iiab dest: /usr/bin/ mode: '0755' +- name: Copy iiab-network from {{ iiab_dir }}/scripts to /usr/local/bin/ + copy: + src: "{{ iiab_dir }}/scripts/iiab-network" + dest: /usr/local/bin/ + mode: '0755' + - name: Install ~12 network/wifi/related packages + Squid if necessary + configure /etc/sysctl.conf -- full configuration LATER in 'network', after Stage 9 include_tasks: roles/network/tasks/install.yml when: network_install and network_installed is undefined diff --git a/scripts/iiab-network b/scripts/iiab-network new file mode 100644 index 000000000..03d1cee87 --- /dev/null +++ b/scripts/iiab-network @@ -0,0 +1,7 @@ +#!/bin/bash -e +cd /opt/iiab/iiab +sudo ./iiab-network +rc=$? +if [ “${rc}” == “0” ]; then + sudo touch /etc/iiab/install-flags/iiab-network-complete +fi