Fixed: [Duplicate config files in configdir causes merge problems -> set ? = NULL](https://github.com/clicon/clixon/issues/510)
Made file-dir match more exact, eg .cli not ?cli Added -1 as any arg to xml_rm_children()
This commit is contained in:
parent
e55e05353f
commit
344786a971
12 changed files with 76 additions and 28 deletions
|
|
@ -35,7 +35,7 @@ cat <<EOF > $cfg
|
|||
</clixon-config>
|
||||
EOF
|
||||
|
||||
cat <<EOF > $cfdir/extra
|
||||
cat <<EOF > $cfdir/extra.xml
|
||||
<clixon-config xmlns="http://clicon.org/config">
|
||||
<CLICON_FEATURE>extradir</CLICON_FEATURE>
|
||||
</clixon-config>
|
||||
|
|
@ -55,6 +55,7 @@ module example {
|
|||
}
|
||||
EOF
|
||||
|
||||
new "test params: -f $cfg"
|
||||
if [ $BE -ne 0 ]; then
|
||||
# kill old backend (if any)
|
||||
new "kill old backend"
|
||||
|
|
@ -64,7 +65,6 @@ if [ $BE -ne 0 ]; then
|
|||
fi
|
||||
fi
|
||||
|
||||
|
||||
# Extra cmdline opts, first is overwritten, second appended
|
||||
CMDOPTS='-o CLICON_MODULE_SET=42 -o CLICON_FEATURE="cmdline"'
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue