Skip to contentSkip to conversation

resolvconf: do not install dhclient hooks

PATCH In review Yi Zhao 2 participants 3 messages Oct 30, 2020 – Nov 2, 2020

lore
Share & tools
lore

Yi Zhao

author
#0 lore raw

PATCH 1/1 resolvconf: do not install dhclient hooks

Do not install the dhclient hooks /etc/dhcp/dhclient-enter-hooks.d/resolvconf because the dhclient has been removed from oe-core.

---
 meta/recipes-connectivity/resolvconf/resolvconf_1.83.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-connectivity/resolvconf/resolvconf_1.83.bb +1 -1
index f0ffc82241..33ee553d19 100644
@@ -43,7 +43,7 @@ do_install () {
 	ln -snf ${localstatedir}/run/${BPN} ${D}${sysconfdir}/${BPN}/run
 	install -d ${D}${sysconfdir} ${D}${base_sbindir}
 	install -d ${D}${mandir}/man8 ${D}${docdir}/${P}
-	cp -pPR etc/* ${D}${sysconfdir}/
+	cp -pPR etc/resolvconf ${D}${sysconfdir}/
 	chown -R root:root ${D}${sysconfdir}/
 	install -m 0755 bin/resolvconf ${D}${base_sbindir}/
 	install -m 0755 bin/list-records ${D}${base_libdir}/${BPN}
Signature · 1 line
2.17.1
#1 lore raw
Quoted 14 lines · Yi Zhao

Do not install the dhclient hooks /etc/dhcp/dhclient-enter-hooks.d/resolvconf because the dhclient has been removed from oe-core.

---
 meta/recipes-connectivity/resolvconf/resolvconf_1.83.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-connectivity/resolvconf/resolvconf_1.83.bb +0 -0
index f0ffc82241..33ee553d19 100644

meta/recipes-connectivity/resolvconf/resolvconf_1.83.bb do_install () { · line 46

Quoted 5 lines
meta/recipes-connectivity/resolvconf/resolvconf_1.83.bb +1 -1
@@ -43,7 +43,7 @@ do_install () {
 	ln -snf ${localstatedir}/run/${BPN} ${D}${sysconfdir}/${BPN}/run
 	install -d ${D}${sysconfdir} ${D}${base_sbindir}
 	install -d ${D}${mandir}/man8 ${D}${docdir}/${P}
-	cp -pPR etc/* ${D}${sysconfdir}/
+	cp -pPR etc/resolvconf ${D}${sysconfdir}/

is this the only dir left to copy if we ignore dhcp/dhclient-enter-hooks.d ?

Quoted 8 lines
meta/recipes-connectivity/resolvconf/resolvconf_1.83.bb +0 -0
 	chown -R root:root ${D}${sysconfdir}/
 	install -m 0755 bin/resolvconf ${D}${base_sbindir}/
 	install -m 0755 bin/list-records ${D}${base_libdir}/${BPN}
author
#2 lore raw
Quoted 11 lines · Khem Raj
Quoted 9 lines · Yi Zhao

Do not install the dhclient hooks /etc/dhcp/dhclient-enter-hooks.d/resolvconf because the dhclient has been removed from oe-core.

---
  meta/recipes-connectivity/resolvconf/resolvconf_1.83.bb | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 11 lines

meta/recipes-connectivity/resolvconf/resolvconf_1.83.bb do_install () { · line 46

Quoted 10 lines
meta/recipes-connectivity/resolvconf/resolvconf_1.83.bb +1 -1
index f0ffc82241..33ee553d19 100644
@@ -43,7 +43,7 @@ do_install () {
  	ln -snf ${localstatedir}/run/${BPN} ${D}${sysconfdir}/${BPN}/run
  	install -d ${D}${sysconfdir} ${D}${base_sbindir}
  	install -d ${D}${mandir}/man8 ${D}${docdir}/${P}
-	cp -pPR etc/* ${D}${sysconfdir}/
+	cp -pPR etc/resolvconf ${D}${sysconfdir}/

is this the only dir left to copy if we ignore dhcp/dhclient-enter-hooks.d ?

yes, there are only dhcp/ and resolvconf/ directories under /etc/.

//Yi

Quoted 9 lines
Quoted 9 lines
meta/recipes-connectivity/resolvconf/resolvconf_1.83.bb +0 -0
  	chown -R root:root ${D}${sysconfdir}/
  	install -m 0755 bin/resolvconf ${D}${base_sbindir}/
  	install -m 0755 bin/list-records ${D}${base_libdir}/${BPN}