diff --git a/test.bu b/test.bu index 1ecb709..e4f0b61 100644 --- a/test.bu +++ b/test.bu @@ -16,45 +16,45 @@ storage: mode: 0644 contents: inline: сos.itphx.loc - # - path: /etc/NetworkManager/system-connections/ens18.nmconnection - # mode: 0600 - # contents: - # inline: | - # [connection] - # id=ens18 - # type=ethernet - # interface-name=ens18 - # [ipv4] - # address1=10.0.0.13/24,10.0.0.254 - # dns=10.0.0.245; - # dns-search=itphx.loc - # may-fail=false - # method=manual - # - path: /etc/NetworkManager/system-connections/ens19.nmconnection - # mode: 0600 - # contents: - # inline: | - # [connection] - # id=ens19 - # type=ethernet - # interface-name=ens19 - # [ipv4] - # address1=10.0.0.16 - # address1=10.0.0.17 - # address1=10.0.0.18 - # dns= - # dns-search= - # may-fail=false - # method=manual - disks: - - device: /dev/sdb - wipe_table: false - partitions: - - size_mib: 0 - start_mib: 0 - label: data - filesystems: - - path: /data - device: /dev/disk/by-partlabel/data - format: xfs - with_mount_unit: true \ No newline at end of file + - path: /etc/NetworkManager/system-connections/ens18.nmconnection + mode: 0600 + contents: + inline: | + [connection] + id=ens18 + type=ethernet + interface-name=ens18 + [ipv4] + address1=10.0.0.13/24,10.0.0.254 + dns=10.0.0.245; + dns-search=itphx.loc + may-fail=false + method=manual + - path: /etc/NetworkManager/system-connections/ens19.nmconnection + mode: 0600 + contents: + inline: | + [connection] + id=ens19 + type=ethernet + interface-name=ens19 + [ipv4] + address1=10.0.0.16 + address1=10.0.0.17 + address1=10.0.0.18 + dns= + dns-search= + may-fail=false + method=manual + # disks: + # - device: /dev/sdb + # wipe_table: false + # partitions: + # - size_mib: 0 + # start_mib: 0 + # label: data + # filesystems: + # - path: /data + # device: /dev/disk/by-partlabel/data + # format: xfs + # with_mount_unit: true \ No newline at end of file diff --git a/test.ign b/test.ign index 07d8473..9083a3a 100644 --- a/test.ign +++ b/test.ign @@ -19,19 +19,6 @@ ] }, "storage": { - "disks": [ - { - "device": "/dev/sdb", - "partitions": [ - { - "label": "data", - "sizeMiB": 0, - "startMiB": 0 - } - ], - "wipeTable": false - } - ], "files": [ { "path": "/etc/hostname", @@ -39,22 +26,21 @@ "source": "data:,%D1%81os.itphx.loc" }, "mode": 420 - } - ], - "filesystems": [ + }, { - "device": "/dev/disk/by-partlabel/data", - "format": "xfs", - "path": "/data" - } - ] - }, - "systemd": { - "units": [ + "path": "/etc/NetworkManager/system-connections/ens18.nmconnection", + "contents": { + "source": "data:,%5Bconnection%5D%0Aid%3Dens18%0Atype%3Dethernet%0Ainterface-name%3Dens18%0A%5Bipv4%5D%0Aaddress1%3D10.0.0.13%2F24%2C10.0.0.254%0Adns%3D10.0.0.245%3B%0Adns-search%3Ditphx.loc%0Amay-fail%3Dfalse%0Amethod%3Dmanual%0A" + }, + "mode": 384 + }, { - "contents": "# Generated by Butane\n[Unit]\nBefore=local-fs.target\nRequires=systemd-fsck@dev-disk-by\\x2dpartlabel-data.service\nAfter=systemd-fsck@dev-disk-by\\x2dpartlabel-data.service\n\n[Mount]\nWhere=/data\nWhat=/dev/disk/by-partlabel/data\nType=xfs\n\n[Install]\nRequiredBy=local-fs.target", - "enabled": true, - "name": "data.mount" + "path": "/etc/NetworkManager/system-connections/ens19.nmconnection", + "contents": { + "compression": "gzip", + "source": "data:;base64,H4sIAAAAAAAC/2TKTarDMAzE8b3uksczlH4sdJKQhbDH2GDLwVILuX0JdBcGZvHjv8ahiuh16EY1MdTCi/zYwfCCqXCq6phZIhaVjl+y1v1z20hSmjALHP7/zoX7lR5XelJS4/MWg8xYmLocS5baOEszUIeXkbiLvqXRNwAA//8yszHqpwAAAA==" + }, + "mode": 384 } ] }