search for: live_dev

...s | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/scripts/ovirt-functions b/scripts/ovirt-functions index e01ee0e..3f55656 100644 --- a/scripts/ovirt-functions +++ b/scripts/ovirt-functions @@ -249,11 +249,13 @@ mount_live() { return 0 fi local live_dev=/dev/live - if [ ! -e $live_dev ] && losetup /dev/loop0|grep -q '\.iso'; then - # PXE boot - live_dev=/dev/loop0 - else - return 1 + if [ ! -e $live_dev ] + if losetup /dev/loop0|grep -q '\.iso'; then + # PXE boot + live_d...

...nge 100755 => 100644 scripts/ovirt-functions diff --git a/scripts/ovirt-functions b/scripts/ovirt-functions old mode 100755 new mode 100644 index 81db36b..a536236 --- a/scripts/ovirt-functions +++ b/scripts/ovirt-functions @@ -249,9 +249,11 @@ mount_live() { return 0 fi local live_dev=/dev/live - if [ ! -e $live_dev ]; then + if [ ! -e $live_dev ] && losetup /dev/loop0|grep -q '\.iso'; then # PXE boot live_dev=/dev/loop0 + else + return 1 fi mkdir -p /live mount -r $live_dev /live || mount $live_dev /live -- 1.6.0.6

...ted -s $drive "rm 4" fi printf "Finished uninstalling node." else diff --git a/scripts/ovirt-functions b/scripts/ovirt-functions index f24cb07..6e76ce3 100644 --- a/scripts/ovirt-functions +++ b/scripts/ovirt-functions @@ -260,14 +260,14 @@ mount_live() { mount -r $live_dev /live || mount $live_dev /live } -# mount boot partition -# boot loader + kernel + initrd -mount_boot() { - if grep -q " /boot " /etc/mtab; then +# mount root partition +# boot loader + kernel + initrd + LiveOS +mount_liveos() { + if grep -q " /liveos " /etc/mtab; then...

...sr/bin/virsh console *\" >> /etc/sudoers") + +# mount livecd media +# e.g. CD /dev/sr0, USB /dev/sda1, +# PXE /dev/loop0 (loopback ISO) +# not available when booted from local disk installation +def mount_live(): + if os.path.ismount("/live"): + return + + live_dev="/dev/live" + if not os.path.exists(live_dev): + ret = os.system("losetup /dev/loop0|grep -q '\.iso'") + if ret == 0: + # PXE boot + live_dev="/dev/loop0" + else: + return False + os.system("mkdir...