Bläddra i källkod

Merge branch 'master' of git.devops.thengo.intranet:chaotika/ansible-role-live-build

master
förälder
incheckning
c32200ce80
2 ändrade filer med 5 tillägg och 11 borttagningar
  1. +1
    -0
      tasks/config.yaml
  2. +4
    -11
      templates/config/includes.installer/preseed.cfg.j2

+ 1
- 0
tasks/config.yaml Visa fil

@@ -39,6 +39,7 @@

{% if debian_live_debian_installer is defined %}
--debian-installer "{{ debian_live_debian_installer }}"
--debian-installer-gui "{{ live_build_debian_installer_gui | default(false) }}"
{% if debian_nonfree_firmware %}
--firmware-binary true
{% endif %}


+ 4
- 11
templates/config/includes.installer/preseed.cfg.j2 Visa fil

@@ -14,9 +14,7 @@ d-i keyboard-configuration/toggle select No toggling
### Network console

### Hostname
{#
d-i netcfg/hostname string {{inventory_hostname}}
#}
{# d-i netcfg/hostname string {{inventory_hostname}} #}

### Mirror settings
d-i mirror/country string manual
@@ -25,13 +23,8 @@ d-i mirror/http/directory string /debian
d-i mirror/http/proxy string

### Account setup
# Skip creation of a root account (normal user account will be able to
# use sudo).
d-i passwd/root-login boolean true
# Alternatively, to skip creation of a normal user account.
d-i passwd/make-user boolean false

# Root password
{% if root_password is defined %}
d-i passwd/root-password-crypted password {{ root_password }}
{% endif %}
@@ -53,9 +46,9 @@ d-i partman/mount_style select uuid
d-i partman/default_filesystem string btrfs

### Apt setup
# You can choose to install non-free and contrib software.
d-i apt-setup/non-free boolean {{ debian_nonfree_firmware }}
d-i apt-setup/contrib boolean {{ debian_nonfree_firmware }}
d-i apt-setup/use_mirror boolean true
d-i apt-setup/non-free boolean {{ debian_nonfree_firmware | default(false) }}
d-i apt-setup/contrib boolean {{ debian_nonfree_firmware | default(false) }}
d-i apt-setup/services-select multiselect security,updates
d-i apt-setup/security_host string security.debian.org



Laddar…
Avbryt
Spara