X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=ansible%2Froles%2Fopenwrt-image%2Ftasks%2Fprepare.yml;h=f403cadaec65794230877bafa21456e4b48af819;hb=c1ccbb1f8bc0b4e5cb5b777718be934728aab7d2;hp=b697e39e5b74a34ef62fe1a3e92b14ed5a7cc579;hpb=f29883b753432c86653691a4e2131dd963633ae6;p=noc.git

diff --git a/ansible/roles/openwrt-image/tasks/prepare.yml b/ansible/roles/openwrt-image/tasks/prepare.yml
index b697e39..f403cad 100644
--- a/ansible/roles/openwrt-image/tasks/prepare.yml
+++ b/ansible/roles/openwrt-image/tasks/prepare.yml
@@ -11,31 +11,50 @@
   file:
     path: "{{ item }}"
     state: directory
+    mode: '0755'
   with_items:
+    - "{{ openwrt_download_dir }}/dl"
     - "{{ openwrt_imgbuilder_files }}/etc/config"
     - "{{ openwrt_mixin | map('dirname') | map('regex_replace', '^', openwrt_imgbuilder_files) | unique | list }}"
 
 
 - name: Copy mixins in place [1/2]
   copy:
-    src: "{{ item.file }}"
+    src: "{{ item.value.file }}"
     dest: "{{ openwrt_imgbuilder_files }}/{{ item.key }}"
-    mode: "{{ item.mode | default(0644) }}"
+    mode: "{{ item.value.mode | default('0644') }}"
   with_dict: "{{ openwrt_mixin }}"
-  when: '"file" in item'
+  when: '"file" in item.value'
   loop_control:
     label: "{{ item.key }}"
 
 - name: Copy mixins in place [2/2]
   copy:
-    content: "{{ item.value }}"
+    content: "{{ item.value.content }}"
     dest: "{{ openwrt_imgbuilder_files }}/{{ item.key }}"
-    mode: "{{ item.mode | default(0644) }}"
+    mode: "{{ item.value.mode | default('0644') }}"
   with_dict: "{{ openwrt_mixin }}"
-  when: '"content" in item'
+  when: '"content" in item.value'
   loop_control:
     label: "{{ item.key }}"
 
+- name: Generate /etc/fstab
+  mount:
+    fstab: "{{ openwrt_imgbuilder_files }}/etc/fstab"
+    state: present
+    src: "{{ item.src | default(omit) }}"
+    path: "{{ item.path | default(omit) }}"
+    fstype: "{{ item.fstype | default(omit) }}"
+    opts: "{{ item.opts | default(omit) }}"
+    boot: "{{ item.boot | default(omit) }}"
+    dump: "{{ item.dump | default(omit) }}"
+    passno: "{{ item.passno | default(omit) }}"
+  when: openwrt_mounts is defined
+  with_items: "{{ openwrt_mounts }}"
+  loop_control:
+    label: "{{ item.path }}"
+
+
 - name: Create UCI configuration files
   template:
     src: uci.j2
@@ -47,14 +66,29 @@
   loop_control:
     label: "{{ item.key }}"
 
+- name: Create /etc/passwd
+  template:
+    src: passwd.j2
+    dest: "{{ openwrt_imgbuilder_files }}/etc/passwd"
+    mode: 0644
+    trim_blocks: yes
+  when: openwrt_users is defined
 
-### TODO: this just hangs?
-# - unarchive:
-#     copy: False
-#     src:  "{{ openwrt_download_dir }}/{{ openwrt_tarball_name }}"
-#     dest: "{{ openwrt_imgbuilder_dir }}"
+- name: Create /etc/group
+  template:
+    src: group.j2
+    dest: "{{ openwrt_imgbuilder_files }}/etc/group"
+    mode: 0644
+    trim_blocks: yes
+  when: openwrt_groups is defined or openwrt_users is defined
 
-- name: Decompress the OpenWrt image builder
-  command: >-
-    tar -xf  "{{ openwrt_download_dir }}/{{ openwrt_tarball_name }}"
-    -C   "{{ openwrt_imgbuilder_dir     }}"
+- unarchive:
+    copy: False
+    src:  "{{ openwrt_download_dir }}/{{ openwrt_tarball_name }}"
+    dest: "{{ openwrt_imgbuilder_dir }}"
+
+- name: Symlink the cache repository
+  file:
+    state: link
+    src: "{{ openwrt_download_dir }}/dl"
+    path: "{{ openwrt_imgbuilder_dir }}/{{ openwrt_tarball_basename }}/dl"