search for: persist_it

...cedbb..c2ef94b 100644 --- a/scripts/ovirt-functions +++ b/scripts/ovirt-functions @@ -464,13 +464,14 @@ ovirt_store_config() { rc=0 if grep -q " /config ext3" /proc/mounts; then for p in "$@"; do + local filename=$(readlink -f $p) local persist_it=true # ensure that, if this is a directory # that it's not already persisted - if [ -d $p ]; then - if [ -d /config$p ]; then - printf "Directory already persisted: $p\n" + if [ -d $filename ]; then +...

...-a $f /config$f \ - && mount -n --bind /config$f $f - if [ $? -ne 0 ]; then - printf " Failed to persist\n" - rc=1 - else - printf " File persisted\n" + local persist_it=true + + # ensure that, if this is a directory + if [ -d $p ]; then + if [ -d /config$p ]; then + persist_it=false fi fi - # register in /config/files used by rc.sysinit - if ! grep -q "...

The first patch in this set was submitted in January but never ACK'd. The following three are follow on patches to fix other issues that have come up.

...scripts/ovirt-functions | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/ovirt-functions b/scripts/ovirt-functions index 482441a..cecb359 100644 --- a/scripts/ovirt-functions +++ b/scripts/ovirt-functions @@ -496,7 +496,7 @@ ovirt_store_config() { if $persist_it; then # skip if file does not exist or is empty - if [ ! -s "${filename}" ]; then + if [ ! -e "${filename}" ]; then printf " Skipping, file '${filename}' does not exist or is empty\n"...

...ons | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/ovirt-functions b/scripts/ovirt-functions index 482441a..1c3336d 100644 --- a/scripts/ovirt-functions +++ b/scripts/ovirt-functions @@ -495,9 +495,9 @@ ovirt_store_config() { fi if $persist_it; then - # skip if file does not exist or is empty - if [ ! -s "${filename}" ]; then - printf " Skipping, file '${filename}' does not exist or is empty\n" + # skip if file does not exist + if [...

...+ +# persist configuration to /config +# ovirt_store_config /etc/config /etc/config2 ... +# copy to /config and bind-mount back + +def ovirt_store_config(files): + if os.path.ismount("/config"): + for p in files: + filename = os.path.abspath(filename) + persist_it=true + + # ensure that, if this is a directory + # that it's not already persisted + if os.path.isdir(filename): + if os.path.isdir("/config/" + filename): + log("Directory already persisted: ${filename}\n")...