Skip to content

Commit 119c18a

Browse files
committed
chore: tidy-up
(move snippets around to the right places)
1 parent 29504ab commit 119c18a

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

l2/mkosi.build

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ make_git_package \
5656
"out/libexec:/opt/google-cloud-ops-agent/libexec" \
5757
"systemd/google-cloud-ops-agent-fluent-bit.service:/usr/lib/systemd/system/google-cloud-ops-agent-fluent-bit.service" \
5858
"systemd/google-cloud-ops-agent.service:/usr/lib/systemd/system/google-cloud-ops-agent.service"
59-
6059
mkdir -p "$DESTDIR/opt/google-cloud-ops-agent/subagents"
6160
ln -s /opt/fluent-bit/bin/fluent-bit "$DESTDIR/opt/google-cloud-ops-agent/subagents/fluent-bit"
6261
sed -i 's|@PREFIX@|/opt/google-cloud-ops-agent|g; s|@SYSCONFDIR@|/etc|g' "$DESTDIR/usr/lib/systemd/system/google-cloud-ops-agent"*.service

l2/mkosi.conf

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
[Include]
22
Include=base/mkosi.conf
33

4+
[Distribution]
5+
Mirror=https://snapshot.debian.org/archive/debian/20251030T205030Z/
6+
47
[Config]
58
Profiles=gcp
69

710
[Build]
811
Environment=KERNEL_CONFIG_SNIPPETS_L2=kernel/snippets/ubuntu.config,l2/kernel.config
12+
ToolsTreeMirror=https://snapshot.debian.org/archive/debian/20251030T205030Z/
913
WithNetwork=true
1014

1115
[Content]
@@ -15,10 +19,10 @@ PostInstallationScripts=l2/mkosi.postinst
1519
SyncScripts=l2/mkosi.sync
1620

1721
Packages=prometheus-node-exporter
22+
fluent-bit
1823
prometheus-process-exporter
1924
usrmerge
2025
xfsprogs
21-
fluent-bit
2226

2327
BuildPackages=golang
2428
libssl-dev

l2/op-rbuilder.conf

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
11
[Include]
22
Include=l2/mkosi.conf
33
Include=l2/_op_rbuilder/mkosi.conf
4-
5-
[Distribution]
6-
Mirror=https://snapshot.debian.org/archive/debian/20251030T205030Z/
7-
8-
[Build]
9-
ToolsTreeMirror=https://snapshot.debian.org/archive/debian/20251030T205030Z/
10-

0 commit comments

Comments
 (0)