Skip to contentSkip to conversation

lxc: Fix postinstall script for read-only rootfs

PATCH New Daniel Dragomir 2 participants 4 messages Jan 7, 2021 – Jan 11, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 lxc: Fix postinstall script for read-only rootfs

Ensure postinstall script for lxc-networking package can run at build time for a read-only rootfs (with sysvinit).

---
 recipes-containers/lxc/lxc_3.1.0.bb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
recipes-containers/lxc/lxc_3.1.0.bb +4 -4
index 977583f..235a429 100644
@@ -167,9 +167,9 @@ pkg_postinst_${PN}() {
 	fi
 }
 
-pkg_postinst_ontarget_${PN}-networking() {
+pkg_postinst_${PN}-networking() {
 if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
-cat >> /etc/network/interfaces << EOF
+cat >> $D/etc/network/interfaces << EOF
 
 auto lxcbr0
 iface lxcbr0 inet dhcp
@@ -178,7 +178,7 @@ iface lxcbr0 inet dhcp
 	bridge_maxwait 0
 EOF
 
-cat<<EOF>/etc/network/if-pre-up.d/lxcbr0
+cat<<EOF>$D/etc/network/if-pre-up.d/lxcbr0
 #! /bin/sh
 
 if test "x\$IFACE" = xlxcbr0 ; then
@@ -191,6 +191,6 @@ if test "x\$IFACE" = xlxcbr0 ; then
         fi
 fi
 EOF
-chmod 755 /etc/network/if-pre-up.d/lxcbr0
+chmod 755 $D/etc/network/if-pre-up.d/lxcbr0
 fi
 }
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/1 lxc: Fix postinstall script for read-only rootfs

Ensure postinstall script for lxc-networking package can run at build time for a read-only rootfs (with sysvinit).

---
 recipes-containers/lxc/lxc_4.0.1.bb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
recipes-containers/lxc/lxc_4.0.1.bb +4 -4
index bfe003c..807232e 100644
@@ -171,9 +171,9 @@ pkg_postinst_${PN}() {
 	fi
 }
 
-pkg_postinst_ontarget_${PN}-networking() {
+pkg_postinst_${PN}-networking() {
 if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
-cat >> /etc/network/interfaces << EOF
+cat >> $D/etc/network/interfaces << EOF
 
 auto lxcbr0
 iface lxcbr0 inet dhcp
@@ -182,7 +182,7 @@ iface lxcbr0 inet dhcp
 	bridge_maxwait 0
 EOF
 
-cat<<EOF>/etc/network/if-pre-up.d/lxcbr0
+cat<<EOF>$D/etc/network/if-pre-up.d/lxcbr0
 #! /bin/sh
 
 if test "x\$IFACE" = xlxcbr0 ; then
@@ -195,6 +195,6 @@ if test "x\$IFACE" = xlxcbr0 ; then
         fi
 fi
 EOF
-chmod 755 /etc/network/if-pre-up.d/lxcbr0
+chmod 755 $D/etc/network/if-pre-up.d/lxcbr0
 fi
 }
Signature · 1 line
2.17.1
#2 lore raw

merged to all branches.

I honestly can't remember why we ever had those as on-target, so I'm good with the change.

If someone has a problem, I'm sure I'll hear about it :D

Bruce

In message: [meta-virtualization] [thud] [PATCH] lxc: Fix postinstall script for read-only rootfs

Quoted 48 lines · on 07/01/2021 Daniel Dragomir wrote:

Ensure postinstall script for lxc-networking package can run at build time for a read-only rootfs (with sysvinit).

---
 recipes-containers/lxc/lxc_3.1.0.bb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
recipes-containers/lxc/lxc_3.1.0.bb +4 -4
index 977583f..235a429 100644
@@ -167,9 +167,9 @@ pkg_postinst_${PN}() {
 	fi
 }
 
-pkg_postinst_ontarget_${PN}-networking() {
+pkg_postinst_${PN}-networking() {
 if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
-cat >> /etc/network/interfaces << EOF
+cat >> $D/etc/network/interfaces << EOF
 
 auto lxcbr0
 iface lxcbr0 inet dhcp
@@ -178,7 +178,7 @@ iface lxcbr0 inet dhcp
 	bridge_maxwait 0
 EOF
 
-cat<<EOF>/etc/network/if-pre-up.d/lxcbr0
+cat<<EOF>$D/etc/network/if-pre-up.d/lxcbr0
 #! /bin/sh
 
 if test "x\$IFACE" = xlxcbr0 ; then
@@ -191,6 +191,6 @@ if test "x\$IFACE" = xlxcbr0 ; then
         fi
 fi
 EOF
-chmod 755 /etc/network/if-pre-up.d/lxcbr0
+chmod 755 $D/etc/network/if-pre-up.d/lxcbr0
 fi
 }
Signature · 1 line
2.17.1
#3 lore raw

PATCH 1/1 lxc: Fix postinstall script for read-only rootfs

In reply to Daniel Dragomir

Ensure postinstall script for lxc-networking package can run at build time for a read-only rootfs (with sysvinit).

---
 recipes-containers/lxc/lxc_4.0.4.bb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
recipes-containers/lxc/lxc_4.0.4.bb +4 -4
index 4ef5fc0..19b40f6 100644
@@ -173,9 +173,9 @@ pkg_postinst_${PN}() {
 	fi
 }
 
-pkg_postinst_ontarget_${PN}-networking() {
+pkg_postinst_${PN}-networking() {
 if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
-cat >> /etc/network/interfaces << EOF
+cat >> $D/etc/network/interfaces << EOF
 
 auto lxcbr0
 iface lxcbr0 inet dhcp
@@ -184,7 +184,7 @@ iface lxcbr0 inet dhcp
 	bridge_maxwait 0
 EOF
 
-cat<<EOF>/etc/network/if-pre-up.d/lxcbr0
+cat<<EOF>$D/etc/network/if-pre-up.d/lxcbr0
 #! /bin/sh
 
 if test "x\$IFACE" = xlxcbr0 ; then
@@ -197,6 +197,6 @@ if test "x\$IFACE" = xlxcbr0 ; then
         fi
 fi
 EOF
-chmod 755 /etc/network/if-pre-up.d/lxcbr0
+chmod 755 $D/etc/network/if-pre-up.d/lxcbr0
 fi
 }
Signature · 1 line
2.17.1