Просмотр исходного кода

do not configure packages in this role anymore

main
Markus Katharina Brechtel 2 лет назад
Родитель
Сommit
997ebc628e
6 измененных файлов: 17 добавлений и 65 удалений
  1. +5
    -0
      defaults/main.yml
  2. +12
    -6
      tasks/config.yaml
  3. +0
    -3
      templates/config/package-lists/common.list.chroot.j2
  4. +0
    -3
      templates/config/package-lists/custom.list.chroot.j2
  5. +0
    -3
      templates/config/package-lists/desktop.list.chroot.j2
  6. +0
    -50
      vars/main.yml

+ 5
- 0
defaults/main.yml Просмотреть файл

@@ -25,3 +25,8 @@ live_build_iso_publisher: custom
live_build_nice_level: 14

live_build_linux_surface: false

live_build_common_packages:
- openssh-server
- python
- console-setup

+ 12
- 6
tasks/config.yaml Просмотреть файл

@@ -63,19 +63,25 @@
root_target_directory: "{{ live_build_directory }}/config/includes.chroot/"

- name: include common packages
template:
src: config/package-lists/common.list.chroot.j2
copy: "{{ live_build_common_packages | unique | join('\n') }}"
content: config/package-lists/common.list.chroot.j2
dest: "{{ live_build_directory }}/config/package-lists/common.list.chroot"

- name: include desktop packages
template:
src: config/package-lists/desktop.list.chroot.j2
copy:
content: "{{ live_build_desktop_packages | unique | join('\n') }}"
dest: "{{ live_build_directory }}/config/package-lists/desktop.list.chroot"
when: live_build_desktop

- name: include debian-installer-launcher package
copy:
content: debian-installer-launcher
dest: "{{ live_build_directory }}/config/package-lists/debian-installer-launcher.list.chroot"
when: live_build_desktop

- name: include custom packages
template:
src: config/package-lists/custom.list.chroot.j2
copy:
content: "{{ live_build_custom_packages | unique | join('\n') }}"
dest: "{{ live_build_directory }}/config/package-lists/custom.list.chroot"
when: live_build_custom_packages is defined



+ 0
- 3
templates/config/package-lists/common.list.chroot.j2 Просмотреть файл

@@ -1,3 +0,0 @@
{% for package in live_build_common_packages | unique %}
{{ package }}
{% endfor %}

+ 0
- 3
templates/config/package-lists/custom.list.chroot.j2 Просмотреть файл

@@ -1,3 +0,0 @@
{% for package in live_build_custom_packages | unique %}
{{ package }}
{% endfor %}

+ 0
- 3
templates/config/package-lists/desktop.list.chroot.j2 Просмотреть файл

@@ -1,3 +0,0 @@
{% for package in live_build_desktop_packages | unique %}
{{ package }}
{% endfor %}

+ 0
- 50
vars/main.yml Просмотреть файл

@@ -1,50 +0,0 @@
live_build_common_packages:
- openssh-server
- python
- console-setup

# shells
- fish

# admin tools
- tmux
- rsync
- lsof
- vim
- pv
- less

# network tools
- iputils-ping
- whois
- nmap
- tcpdump
- dnsutils
- resolvconf

# hardware utils
- pciutils
- usbutils
- acpi

# hard disk utils
- parted
- mdadm
- cryptsetup
- lvm2

# filesystem tools
- btrfs-progs
- dosfstools

# installation utils
- debootstrap

live_build_desktop_packages:
- xfce4
- i3
- firefox-esr
- task-xfce-desktop
- task-german
- task-german-desktop
- debian-installer-launcher

Загрузка…
Отмена
Сохранить