Locate Live medium from /run/mgalive/basedev.

Previously we did this by searching for a matching disk label, but
that won't work if we are installed on a multi-boot USB stick.

1 files changed, 3 insertions, 4 deletions

diff --git a/draklive-install b/draklive-install
index 10c2e43..a2ae851 100755
--- a/draklive-install
+++ b/draklive-install
@@ -60,10 +60,9 @@ sub install_live() {
     my %settings = getVarsFromSh($system_file);
 
     my $copy_source = $settings{SOURCE} || '/';
-    my $live_media = 'Mageia*Live*'; # match disk label for all Mageia Live ISOS
 
     display_start_message();
-    init_hds($in, $all_hds, $fstab, $live_media);
+    init_hds($in, $all_hds, $fstab);
     ask_partitions_loop($in, $all_hds, $fstab, $copy_source);
     prepare_root($in);
     copy_root($in, $copy_source);
@@ -133,7 +132,7 @@ sub umount_first_pass() {
 }
 
 sub init_hds {
-    my ($in, $all_hds, $fstab, $live_media) = @_;
+    my ($in, $all_hds, $fstab) = @_;
     my $wait = $in->wait_message('', N("Please wait"));
     umount_first_pass();
     eval { fs::any::get_hds($all_hds, $fstab, [], {}, 'skip_mtab', $in) };
@@ -141,7 +140,7 @@ sub init_hds {
     #- fs::any::get_hds does not return mounts that are not in fstab
     my @mounted = fs::read_fstab('', '/proc/mounts');
 
-    my $live_device = basename(readlink(glob "/dev/disk/by-label/$live_media"));
+    my $live_device = cat_('/run/mgalive/basedev');
     #- remove live device from the detected hds, so that bootloader is not installed on it:
     #-  bootloader installation uses first device from detect_devices::get, which tries to list devices
     #-  by booting order, and our live system is likely to be here in first position