fix some merge conflict resolution damage
This commit is contained in:
parent
5d05511acf
commit
22d84fb4cc
|
@ -1,25 +1,30 @@
|
|||
version: 1
|
||||
early-commands:
|
||||
- echo a
|
||||
- sleep 1
|
||||
- echo a
|
||||
- echo a
|
||||
- sleep 1
|
||||
- echo a
|
||||
late-commands:
|
||||
- echo a
|
||||
- sleep 1
|
||||
- echo a
|
||||
- echo a
|
||||
- sleep 1
|
||||
- echo a
|
||||
keyboard:
|
||||
layout: gb
|
||||
layout: gb
|
||||
interactive-sections:
|
||||
- keyboard
|
||||
- snaps
|
||||
- keyboard
|
||||
- snaps
|
||||
snaps:
|
||||
- name: etcd
|
||||
channel: 3.2/stable
|
||||
- name: etcd
|
||||
channel: 3.2/stable
|
||||
identity:
|
||||
realname: ''
|
||||
username: ubuntu
|
||||
password: '$6$wdAcoXrU039hKYPd$508Qvbe7ObUnxoj15DRCkzC3qO7edjH0VV7BPNRDYK4QR8ofJaEEF2heacn0QgD.f8pO8SNp83XNdWG6tocBM1'
|
||||
hostname: ubuntu
|
||||
packages:
|
||||
- dns-server^
|
||||
- foo-bar=1.1
|
||||
- dns-server^
|
||||
- foo-bar=1.1
|
||||
snaps:
|
||||
- name: etcd
|
||||
channel: 3.2/stable
|
||||
- name: etcd
|
||||
channel: 3.2/stable
|
||||
debconf-selections: |
|
||||
wtf wtf
|
||||
wtf wtf
|
||||
|
|
Loading…
Reference in New Issue