Updated to address current issues/errors

5 files changed, 15 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f1e96e41fa47..1344ce8b9290 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -14,6 +14,7 @@ pkgbase = cros-container-guest-tools-git
 	depends = packagekit
 	depends = dbus
 	depends = xorg-xdpyinfo
+	depends = mailcap
 	source = git+https://chromium.googlesource.com/chromiumos/containers/cros-container-guest-tools
 	source = cros-sftp-conditions.conf
 	source = cros-garcon-conditions.conf
@@ -22,7 +23,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
+	source = mimeapps.list
 	sha1sums = SKIP
 	sha1sums = 0827ce6d673949a995be2d69d4974ddd9bdf16f1
 	sha1sums = d326cd35dcf150f9f9c8c7d6336425ec08ad2433
@@ -31,7 +32,7 @@ pkgbase = cros-container-guest-tools-git
 	sha1sums = 0c21f6c85ecbe8f822c378c7e4d5b3165e56eb3a
 	sha1sums = 089ba58bc504146b29035a8efe70045eb2495fb5
 	sha1sums = 53624105b0890a5ad19bce6bfe4cdddf9651b149
-	sha1sums = 0373918febdcdff23acf22e2a0ac7bfe46873b4a
+	sha1sums = f05da51a3913c5815d320c8ed536f2a7ac1fdcd5
 
 pkgname = cros-container-guest-tools-git
 
diff --git a/PKGBUILD b/PKGBUILD
index de430b7b9171..8028b5eeb04d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ pkgrel=1
 pkgdesc="Linux guest tools for the Crostini containers on ChromeOS"
 arch=('any')
 license=('custom')
-depends=('openssh' 'xdg-utils' 'xkeyboard-config' 'pulseaudio' 'xxd' 'packagekit' 'dbus' 'xorg-xdpyinfo')
+depends=('openssh' 'xdg-utils' 'xkeyboard-config' 'pulseaudio' 'xxd' 'packagekit' 'dbus' 'xorg-xdpyinfo' 'mailcap')
 install=cros-container-guest-tools.install
 url="https://chromium.googlesource.com/chromiumos/containers/cros-container-guest-tools"
 source=("git+${url}"
@@ -16,7 +16,7 @@ source=("git+${url}"
         'cros-logind-override.conf'
         'cros-nopasswd.rules'
         'cros-resolved.conf'
-        'cros-dhcpcd-eth0.service')
+        'mimeapps.list')
 sha1sums=('SKIP'
           '0827ce6d673949a995be2d69d4974ddd9bdf16f1'
           'd326cd35dcf150f9f9c8c7d6336425ec08ad2433'
@@ -25,7 +25,7 @@ sha1sums=('SKIP'
           '0c21f6c85ecbe8f822c378c7e4d5b3165e56eb3a'
           '089ba58bc504146b29035a8efe70045eb2495fb5'
           '53624105b0890a5ad19bce6bfe4cdddf9651b149'
-          '0373918febdcdff23acf22e2a0ac7bfe46873b4a')
+          'f05da51a3913c5815d320c8ed536f2a7ac1fdcd5')
 
 pkgver() {
 	cd ${srcdir}/${_pkgname}
@@ -47,14 +47,14 @@ 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
+	# install default browser associations
+	install -m644 -D ${srcdir}/mimeapps.list ${pkgdir}/etc/xdg/mimeapps.list
 
 	### cros-adapta -> included into cros-container-guest-tools.install
+	mkdir -p ${pkgdir}/usr/share/themes
 
 #	Uncomment after https://bugs.archlinux.org/task/58701 is fixed
 #
-#	mkdir -p ${pkgdir}/usr/share/themes
 #	ln -sf /opt/google/cros-containers/cros-adapta ${pkgdir}/usr/share/themes/CrosAdapta
 
 	### cros-apt-config -> not applicable
diff --git a/cros-container-guest-tools.install b/cros-container-guest-tools.install
index b89ccd7ee4fd..4dadadd058a3 100644
--- a/cros-container-guest-tools.install
+++ b/cros-container-guest-tools.install
@@ -14,11 +14,6 @@ post_install() {
 	# workaround for https://bugs.archlinux.org/task/58701 - remove after fix
 	ln -sf /opt/google/cros-containers/cros-adapta /usr/share/themes/CrosAdapta
 
-	# set default browser to the garcon_host_browser handler
-	if hash xdg-settings; then
-		xdg-settings set default-web-browser garcon_host_browser.desktop
-	fi
-
 	post_upgrade
 }
 
diff --git a/cros-dhcpcd-eth0.service b/cros-dhcpcd-eth0.service
deleted file mode 100644
index cc8f81d0308b..000000000000
--- a/cros-dhcpcd-eth0.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[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
diff --git a/mimeapps.list b/mimeapps.list
new file mode 100644
index 000000000000..bde718596ac4
--- /dev/null
+++ b/mimeapps.list
@@ -0,0 +1,6 @@
+[Default Applications]
+text/html=garcon_host_browser.desktop
+x-scheme-handler/http=garcon_host_browser.desktop
+x-scheme-handler/https=garcon_host_browser.desktop
+x-scheme-handler/about=garcon_host_browser.desktop
+x-scheme-handler/unknown=garcon_host_browser.desktop