LVM-activate: fix drop-in check to avoid re-creating drop-in file when it already exists #1652
Conversation
…n it already exists
| systemd_drop_in "99-LVM-activate" "After" \ | ||
| systemctl show resource-agents-deps.target \ | ||
| --property=After | cut -d'=' -f2 | \ | ||
| grep -qE "(^|\s)blk-availability.service(\s|$)" |
There was a problem hiding this comment.
\s may or may not be supported as shorthand for [[:space:]], depending on the version of grep.
Why not use an actual space? Or even use the same shell "case" logic as before, but like this:
case " $after " in *" ... "*) (note the extra space around $after)
There was a problem hiding this comment.
The shell logic before only matched if you got 3 or more hits (and blk... wasnt first or last). We use \s (and the combination with beginning/end of line) with grep in other agents, and noone has complained about it.
There was a problem hiding this comment.
Yeah, I had used the case idiom in 79fb4b2 as an attempt at portability -- I don't remember the details, but I think I had found something less than ideal about grep at the time. -q is also not as portable as >/dev/null 2>&1.
But none of that mattered, since my two typos ("$after" instead of " $after ", and target.d instead of target) broke the whole thing anyway :)
Fixes #1647