Skip to content

Commit d15a7db

Browse files
t-lochewi
andauthored
overlaybd ebuild: rework tmpfiles conf generation
Co-authored-by: James Le Cuirot <[email protected]>
1 parent 90a47bb commit d15a7db

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

sdk_container/src/third_party/coreos-overlay/sys-fs/overlaybd/overlaybd-9999.ebuild

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -88,14 +88,12 @@ src_install() {
8888
mv "${ED}"/opt/${PN}/* "${ED}"/usr/local/${PN}/ || die
8989
mv "${ED}"/etc/${PN}/* "${ED}"/usr/local/${PN}/etc/ || die
9090

91-
# Handle /etc (overlaybd.json), create /opt/opverlaybd and symlink
91+
# Handle /etc (overlaybd.json), create /opt/overlaybd and symlink
9292
# all contents of /usr/local/overlaybd to /opt/overlaybd.
93-
elog "Scanning '${ED}/usr/local/${PN}/' and generating tmpfiles symlink entries..."
94-
cp "${FILESDIR}"/10-${PN}.conf "${T}"
95-
local entry
96-
for entry in $(ls -1 "${ED}/usr/local/${PN}/") ; do
97-
echo "L /opt/overlaybd/${entry} - - - - /usr/local/${PN}/${entry}" \
98-
| tee -a "${T}/10-${PN}.conf"
99-
done
100-
dotmpfiles "${T}"/10-${PN}.conf
93+
elog "Scanning '${ED}/usr/local/${PN}/' and generating tmpfiles symlink entries..."
94+
cat "${FILESDIR}"/10-${PN}.conf <(
95+
for entry in "${ED}"/usr/local/${PN}/*; do
96+
echo "L /opt/overlaybd/${entry##*/} - - - - /usr/local/${PN}/${entry##*/}"
97+
done
98+
) | tee /dev/stderr | newtmpfiles - 10-${PN}.conf
10199
}

0 commit comments

Comments
 (0)