Date: Tuesday, September 3, 2019 @ 10:14:00 Author: eworm Revision: 361520
upgpkg: systemd 243.0-1 fix conflicting file with package filesystem Modified: systemd/trunk/PKGBUILD ----------+ PKGBUILD | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-09-03 10:01:03 UTC (rev 361519) +++ PKGBUILD 2019-09-03 10:14:00 UTC (rev 361520) @@ -194,8 +194,9 @@ rm "$pkgdir"/usr/{bin/resolvconf,share/man/man1/resolvconf.1} # avoid a potential conflict with [core]/filesystem - rm "$pkgdir"/usr/share/factory/etc/nsswitch.conf - sed -i '/^C \/etc\/nsswitch\.conf/d' "$pkgdir"/usr/lib/tmpfiles.d/etc.conf + rm "$pkgdir"/usr/share/factory/etc/{issue,nsswitch.conf} + sed -i -e '/^C \/etc\/nsswitch\.conf/d' \ + -e '/^C \/etc\/issue/d' "$pkgdir"/usr/lib/tmpfiles.d/etc.conf # add back tmpfiles.d/legacy.conf, normally omitted without sysv-compat install -m0644 $pkgbase-stable/tmpfiles.d/legacy.conf "$pkgdir"/usr/lib/tmpfiles.d