projects / openwrt / staging / blocktrron.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 51f9627) | patch
base-files: fix merge of passwd/shadow/group lines with trailing colons
authorMatthias Schiffer <mschiffer@universe-factory.net>
Thu, 29 Aug 2024 18:24:02 +0000 (20:24 +0200)
committerMatthias Schiffer <mschiffer@universe-factory.net>
Thu, 29 Aug 2024 19:07:15 +0000 (21:07 +0200)
commit9bbaa6f2c0419739fb85d48d0f527cb1622946ee
treec1e55f5aef4839f80f70602ac9f9ff3104b152e8tree | snapshot
parent51f96278ed121546fa5788d717fd8a9635a56158commit | diff
base-files: fix merge of passwd/shadow/group lines with trailing colons

Empty trailing fields get lost when the lines are split and merged again
at colons, resulting in unparsable entries. Only use the split fields for
matching against the other file, but emit the original line unchanged
to fix the issue.

Fixes: de7ca7dafadf ("base-files: merge /etc/passwd et al at sysupgrade config restore")
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
package/base-files/files/lib/preinit/80_mount_root diff | blob | history
Staging tree of David Bauer