Skip to content

Commit 206f45b

Browse files
christoph-zededarouming
authored andcommitted
gitignore: ignore certain config and cert files
conf/{grub.cfg,authorized_keys,device.cert.{pem,key}} these are locally changed config files that should not be committed Signed-off-by: Christoph Ostarek <[email protected]>
1 parent 5c6c795 commit 206f45b

File tree

5 files changed

+10
-9
lines changed

5 files changed

+10
-9
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,7 @@ assets/
1616
pkg/kernel/build.yml
1717
pkg/new-kernel/build.yml
1818
pkg/kernel/certs/*.pem
19+
conf/authorized_keys
20+
conf/grub.cfg
21+
conf/device.cert.pem
22+
conf/device.key.pem

Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,9 @@ SWTPM:=SWTPM_$(TPM:%=Y)
456456
# patch /conf/grub.cfg for developer's builds to enable getty
457457
GETTY:
458458
echo "Enabling GETTY in grub.cfg"
459-
grep -qxF 'set_getty' $(CONF_DIR)/grub.cfg || echo 'set_getty' >> $(CONF_DIR)/grub.cfg
459+
if [ ! -f $(CONF_DIR)/grub.cfg ]; then\
460+
cp $(CONF_DIR)/grub.cfg.tmpl $(CONF_DIR)/grub.cfg;\
461+
fi
460462

461463
# run-installer
462464
#

conf/authorized_keys

Lines changed: 0 additions & 6 deletions
This file was deleted.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
# You can put your GRUB overrides here
1+
# You can put your GRUB overrides into conf/grub.cfg
22
# E.g. to force booting int KVM mode, uncomment the following:
33
# set_global eve_flavor kvm
44
# to force booting in Xen mode, uncomment:
55
# set_global eve_flavor xen
6+
set_getty

docs/CONFIG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ In general, EVE is trying to make sure that its controller always has the last w
1111
* `v2tlsbaseroot-certificates.pem` - contains the x509 root certificate to trust for the TLS to the controller when using the V2 API
1212
* `onboard.cert.pem` - onboarding certificate for the [initial registration](REGISTRATION.md) with the controller
1313
* `wpa_supplicant.conf` - a legacy way of configuring EVE's WiFi
14-
* `authorized_keys` - initial authorized SSH keys for accessing EVE's debug console
14+
* `authorized_keys` - initial authorized SSH keys for accessing EVE's debug console; DO NOT use options, we only accept 'keytype, base64-encoded key, comment' format
1515
* `bootstrap-config.pb`- initial device configuration used only until device is onboarded (see below for details)
1616

1717
The initial content of these configuration files is stored in the EVE's source tree under [config](../config) folder. From there, these configuration files are baked into the EVE installer images. For the read-write bootable disk installer image these files can further be tweaked by mounting the "EVE" partition and editing those files directly on the installer image. This gives you an ability to take the default installer image and tweak it for your needs without re-building EVE from scratch (obviously this is not an option for a read-only ISO installer image). A typical workflow is to take an installer image from the official EVE build, flash it onto a USB flash drive, insert that USB flash drive into your desktop and edit file on the partition called EVE.

0 commit comments

Comments
 (0)