search for: remove_config

As they iterate through their list of arguments, both ovirt_storage_config and remove_config first convert each of them into a fully qualified path before processing. Related: rhbz#576239 Signed-off-by: Darryl L. Pierce <dpierce at redhat.com> --- scripts/ovirt-functions | 80 +++++++++++++++++++++++------------------------ 1 files changed, 39 insertions(+), 41 deletions(-) dif...

--- scripts/ovirt-functions | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/scripts/ovirt-functions b/scripts/ovirt-functions index 404c366..7657bae 100644 --- a/scripts/ovirt-functions +++ b/scripts/ovirt-functions @@ -508,8 +508,16 @@ remove_config() { if [ -f /config$f ]; then # refresh the file in rootfs if it was mounted over cp -a /config$f $f + if [ $? -ne 0 ]; then + printf " Failed to unpersist %s\n" $f +...

...files 2> /dev/null ; then + printf "$f\n" >> /config/files + fi + else + printf "Could not persist $p: it contains an already persisted file.\n" fi done echo @@ -522,13 +535,24 @@ remove_config() { f=$(readlink -f $p) if grep -q " $f ext3" /proc/mounts ; then if umount -n $f; then - if [ -f /config$f ]; then - # refresh the file in rootfs if it was mounted over - cp -a /co...

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.

...onfiguration...\n") - os.system("cp -a /etc/sysconfig/network-scripts/ifcfg-lo /etc/sysconfig/network-scripts/backup.lo") - for file in os.listdir("/etc/sysconfig/network-scripts/"): - if "ifcfg-" in file: - remove_config("/etc/sysconfig/network-scripts/" + file) - os.system("rm -rf /etc/sysconfig/network-scripts/ifcfg-* &>/dev/null") - os.system("cp -a /etc/sysconfig/network-scripts/backup.lo /etc/sysconfig/network-scripts/ifcfg-lo") - else: +...

...C = OVIRT_VARS["OVIRT_BOOTIF"] + if not self.CONFIGURED_NIC is None: + log("\nDeleting existing network configuration...\n") + os.system("cp -a /etc/sysconfig/network-scripts/ifcfg-lo /etc/sysconfig/network-scripts/backup.lo") + remove_config("/etc/sysconfig/network-scripts/ifcfg-*") + os.system("rm -rf /etc/sysconfig/network-scripts/ifcfg-*") + os.system("cp -a /etc/sysconfig/network-scripts/backup.lo /etc/sysconfig/network-scripts/ifcfg-lo") + else: + log("\nA...

...-n %s" % f) + if ret == 0: + if os.path.exists("/config%s" % f): + # refresh the file in rootfs if it was mounted over + shutil.copy("/config%s %s" % (f,f)) + +# remove persistent config files +# remove_config /etc/config /etc/config2 ... +# +def remove_config(config_file): + # if there are no persisted files then just exit + if os.path.exists("/config/files"): + if os.path.getsize('/config/files') == 0: + print "There are currently no persisted files."...