summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Dechesne <nicolas.dechesne@linaro.org>2016-05-17 18:32:11 +0200
committerNicolas Dechesne <nicolas.dechesne@linaro.org>2016-05-17 18:32:11 +0200
commit572ca664a5737c2b1abab19150e48e10cd0bab5f (patch)
tree3024514a2289bd18a2b6d65b4ff292a3155b9d6f
parentbdf83c1701cc77461599ae03df01d72684d28802 (diff)
jessie-arm*: fixup resolv.conf link
In c672856b2931691fb6622e8270bd60a4dc6e1ddc we changed how we manage resolv.conf link but it was only done for alip images. Implement the same changes in other images. Change-Id: If37fdb1759aa56a2c3b1ef2bd18b7510503fd330 Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
-rwxr-xr-xjessie-arm64-developer/customization/hooks/52-remove_etc_parts.binary6
-rwxr-xr-xjessie-arm64-developer/customization/hooks/98-resolvconf.binary4
-rwxr-xr-xjessie-arm64-ros/customization/hooks/52-remove_etc_parts.binary6
-rwxr-xr-xjessie-arm64-ros/customization/hooks/98-resolvconf.binary4
-rwxr-xr-xjessie-armhf-developer/customization/hooks/52-remove_etc_parts.binary6
-rwxr-xr-xjessie-armhf-developer/customization/hooks/98-resolvconf.binary4
6 files changed, 12 insertions, 18 deletions
diff --git a/jessie-arm64-developer/customization/hooks/52-remove_etc_parts.binary b/jessie-arm64-developer/customization/hooks/52-remove_etc_parts.binary
deleted file mode 100755
index 3e34efd..0000000
--- a/jessie-arm64-developer/customization/hooks/52-remove_etc_parts.binary
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-cd binary
-
-echo "I: rm /etc/resolv.conf"
-rm -f ./etc/resolv.conf
diff --git a/jessie-arm64-developer/customization/hooks/98-resolvconf.binary b/jessie-arm64-developer/customization/hooks/98-resolvconf.binary
new file mode 100755
index 0000000..c9f162e
--- /dev/null
+++ b/jessie-arm64-developer/customization/hooks/98-resolvconf.binary
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+echo "I: Create /etc/resolv.conf link"
+ln -sf /etc/resolvconf/run/resolv.conf binary/etc/resolv.conf
diff --git a/jessie-arm64-ros/customization/hooks/52-remove_etc_parts.binary b/jessie-arm64-ros/customization/hooks/52-remove_etc_parts.binary
deleted file mode 100755
index 3e34efd..0000000
--- a/jessie-arm64-ros/customization/hooks/52-remove_etc_parts.binary
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-cd binary
-
-echo "I: rm /etc/resolv.conf"
-rm -f ./etc/resolv.conf
diff --git a/jessie-arm64-ros/customization/hooks/98-resolvconf.binary b/jessie-arm64-ros/customization/hooks/98-resolvconf.binary
new file mode 100755
index 0000000..c9f162e
--- /dev/null
+++ b/jessie-arm64-ros/customization/hooks/98-resolvconf.binary
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+echo "I: Create /etc/resolv.conf link"
+ln -sf /etc/resolvconf/run/resolv.conf binary/etc/resolv.conf
diff --git a/jessie-armhf-developer/customization/hooks/52-remove_etc_parts.binary b/jessie-armhf-developer/customization/hooks/52-remove_etc_parts.binary
deleted file mode 100755
index 3e34efd..0000000
--- a/jessie-armhf-developer/customization/hooks/52-remove_etc_parts.binary
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-cd binary
-
-echo "I: rm /etc/resolv.conf"
-rm -f ./etc/resolv.conf
diff --git a/jessie-armhf-developer/customization/hooks/98-resolvconf.binary b/jessie-armhf-developer/customization/hooks/98-resolvconf.binary
new file mode 100755
index 0000000..c9f162e
--- /dev/null
+++ b/jessie-armhf-developer/customization/hooks/98-resolvconf.binary
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+echo "I: Create /etc/resolv.conf link"
+ln -sf /etc/resolvconf/run/resolv.conf binary/etc/resolv.conf