search for: mount_boot

...+ local found_boot=false + if findfs LABEL=Boot 2>&1 >/dev/null ; then + found_boot=true + grub_dev_label=Boot + elif findfs LABEL=Root 2>&1 >/dev/null ; then + found_boot=true + grub_dev_label=Root + fi + if $found_boot; then mount_boot mountpoint /boot if [ $? -ne 0 ] ; then log "Boot partition not available" return 1 fi - grub_dev_label="Boot" # Grab OVIRT_ISCSI VARIABLES from boot partition for upgrading # file created only if OVIR...

Previous implementation had staticly defined partitions to remove. This would break in the case of split Root and HostVG devices. Signed-off-by: Mike Burns <mburns at redhat.com> --- scripts/ovirt-config-boot | 11 +-------- scripts/ovirt-config-uninstall | 48 ++++++++++++++++++++++++--------------- scripts/ovirt-functions | 33 +++++++++++++++++++++++++++ 3 files

...oot b/scripts/ovirt-config-boot index 470f57b..4c4e3d7 100755 --- a/scripts/ovirt-config-boot +++ b/scripts/ovirt-config-boot @@ -29,9 +29,28 @@ ovirt_boot_setup() { local disk2 local partN=-1 log "installing the image." + if [ -h /dev/disk/by-label/Boot ]; then + mount_boot + mountpoint /boot + if [ $? -ne 0 ] ; then + log "Boot partition not available" + return 1 + fi + grub_dev_label="Boot" + # Grab OVIRT_ISCSI VARIABLES from boot partition for upgrading + # file created only if OVIR...

...deletions(-) diff --git a/scripts/ovirt-config-boot b/scripts/ovirt-config-boot index dd53988..9ab06bd 100755 --- a/scripts/ovirt-config-boot +++ b/scripts/ovirt-config-boot @@ -29,9 +29,9 @@ ovirt_boot_setup() { local disk2 local partN=-1 log "installing the image." - mount_boot + mount_liveos # check that /boot mounted ok and find partition number for GRUB - eval $(readlink -f /dev/disk/by-label/BOOT|awk {' + eval $(readlink -f /dev/disk/by-label/RootBackup|awk {' print "disk=" substr($1,1,length($1)-1); print "disk2=...

...Password\"" printf "\nPress Enter to leave option blank or Q to quit (default Target Port is 3260)\n" diff --git a/scripts/ovirt-functions b/scripts/ovirt-functions index b0255ce..73deaa2 100644 --- a/scripts/ovirt-functions +++ b/scripts/ovirt-functions @@ -326,7 +326,7 @@ mount_boot() { return 0 fi mkdir -p /boot - mount LABEL=Root /boot + mount LABEL=Boot /boot } # stop any service which keeps /var/log busy # keep the list of services @@ -865,23 +865,32 @@ get_part_info() { local drive_in="$1" local dev_var=$2 local part_var...

...1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/ovirt-config-boot b/scripts/ovirt-config-boot index 5e7b9f0..d5c6abb 100755 --- a/scripts/ovirt-config-boot +++ b/scripts/ovirt-config-boot @@ -31,12 +31,12 @@ ovirt_boot_setup() { log "installing the image." mount_boot # check that /boot mounted ok and find partition number for GRUB - eval $(mount|awk '$3 == "/boot" { - print "disk=" substr($1,1,length($1)-1); - print "disk2=" substr($1,1,length($1)-2); - partN=substr($1,length($1),1); partN--; -...

...Password\"" printf "\nPress Enter to leave option blank or Q to quit (default Target Port is 3260)\n" diff --git a/scripts/ovirt-functions b/scripts/ovirt-functions index 1d4463b..34ad8df 100644 --- a/scripts/ovirt-functions +++ b/scripts/ovirt-functions @@ -326,7 +326,7 @@ mount_boot() { return 0 fi mkdir -p /boot - mount LABEL=Root /boot + mount LABEL=Boot /boot } # stop any service which keeps /var/log busy # keep the list of services @@ -865,23 +865,32 @@ get_part_info() { local drive_in="$1" local dev_var=$2 local part_var...

...t;/dev/null") + if rc == 0: + found_boot = True + grub_dev_label = "Boot" + rc = os.system("findfs LABEL=Root 2>&1 >/dev/null") + if rc == 0: + found_boot = False + grub_dev_label = "Root" + if found_boot: + mount_boot() + if not os.path.ismount("/boot"): + log("Boot partition not available") + sys.exit(1) + # Grab OVIRT_ISCSI VARIABLES from boot partition for upgrading + # file created only if OVIRT_ISCSI_ENABLED=y + if os.path.exists("/b...

...if not os.path.exists(target): + os.open(target, 'w').close() + os.system("mount -n --bind %s %s" % (f,target)) + return True + else: + # /config is not available + return False + +def mount_boot(): + if os.path.ismount("/boot"): + return + else: + os.system("mkdir -p /boot") + os.system("mount LABEL=Boot /boot") + +# stop any service which keeps /var/log busy +# keep the list of services +def unmount_logging_services(): + # mapping...