summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD11
-rw-r--r--cros-dhcpcd-eth0.service13
3 files changed, 24 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8b8ca53f3123..f1e96e41fa47 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = cros-container-guest-tools-git
pkgdesc = Linux guest tools for the Crostini containers on ChromeOS
- pkgver = r237.ce9fd9f
+ pkgver = r238.5591412
pkgrel = 1
url = https://chromium.googlesource.com/chromiumos/containers/cros-container-guest-tools
install = cros-container-guest-tools.install
@@ -22,6 +22,7 @@ pkgbase = cros-container-guest-tools-git
source = cros-logind-override.conf
source = cros-nopasswd.rules
source = cros-resolved.conf
+ source = cros-dhcpcd-eth0.service
sha1sums = SKIP
sha1sums = 0827ce6d673949a995be2d69d4974ddd9bdf16f1
sha1sums = d326cd35dcf150f9f9c8c7d6336425ec08ad2433
@@ -30,6 +31,7 @@ pkgbase = cros-container-guest-tools-git
sha1sums = 0c21f6c85ecbe8f822c378c7e4d5b3165e56eb3a
sha1sums = 089ba58bc504146b29035a8efe70045eb2495fb5
sha1sums = 53624105b0890a5ad19bce6bfe4cdddf9651b149
+ sha1sums = 0373918febdcdff23acf22e2a0ac7bfe46873b4a
pkgname = cros-container-guest-tools-git
diff --git a/PKGBUILD b/PKGBUILD
index 8fc641e0ac83..de430b7b9171 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
_pkgname=cros-container-guest-tools
pkgname=${_pkgname}-git
-pkgver=r237.ce9fd9f
+pkgver=r238.5591412
pkgrel=1
pkgdesc="Linux guest tools for the Crostini containers on ChromeOS"
arch=('any')
@@ -15,7 +15,8 @@ source=("git+${url}"
'cros-garcon.hook'
'cros-logind-override.conf'
'cros-nopasswd.rules'
- 'cros-resolved.conf')
+ 'cros-resolved.conf'
+ 'cros-dhcpcd-eth0.service')
sha1sums=('SKIP'
'0827ce6d673949a995be2d69d4974ddd9bdf16f1'
'd326cd35dcf150f9f9c8c7d6336425ec08ad2433'
@@ -23,7 +24,8 @@ sha1sums=('SKIP'
'9a68893cadf9190e99cadc4c781ba43e45104b1e'
'0c21f6c85ecbe8f822c378c7e4d5b3165e56eb3a'
'089ba58bc504146b29035a8efe70045eb2495fb5'
- '53624105b0890a5ad19bce6bfe4cdddf9651b149')
+ '53624105b0890a5ad19bce6bfe4cdddf9651b149'
+ '0373918febdcdff23acf22e2a0ac7bfe46873b4a')
pkgver() {
cd ${srcdir}/${_pkgname}
@@ -45,6 +47,9 @@ package() {
# install configuration override for systemd-resolved to disable DNSSEC (causing name resolution delays)
install -m644 -D ${srcdir}/cros-resolved.conf ${pkgdir}/etc/systemd/resolved.conf.d/cros-resolved.conf
+ # install customized service for dhcpcd to be used instead of systemd-networkd (optionally)
+ install -m644 -D ${srcdir}/cros-dhcpcd-eth0.service ${pkgdir}/usr/lib/systemd/system/cros-dhcpcd-eth0.service
+
### cros-adapta -> included into cros-container-guest-tools.install
# Uncomment after https://bugs.archlinux.org/task/58701 is fixed
diff --git a/cros-dhcpcd-eth0.service b/cros-dhcpcd-eth0.service
new file mode 100644
index 000000000000..cc8f81d0308b
--- /dev/null
+++ b/cros-dhcpcd-eth0.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=dhcpcd on eth0
+Wants=network.target
+Before=network.target
+
+[Service]
+Type=forking
+PIDFile=/run/dhcpcd-eth0.pid
+ExecStart=/usr/bin/dhcpcd -q eth0
+ExecStop=/usr/bin/dhcpcd -x eth0
+
+[Install]
+WantedBy=multi-user.target