From 0823457553f2fb3e60be436c10bc94ba9690beec Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Sat, 16 Feb 2019 12:39:44 +0000 Subject: Fix removal of live device from detected HDs. --- NEWS | 2 ++ draklive-install | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index a15c929..f9d30a9 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +- fix removal of live device from detected HDs + 2.20 - signal to the dracut shutdown script that the Live medium should be ejected diff --git a/draklive-install b/draklive-install index 7d36666..91e350e 100755 --- a/draklive-install +++ b/draklive-install @@ -152,7 +152,8 @@ 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 = cat_('/run/mgalive/basedev'); + my $live_device = basename(cat_('/run/mgalive/basedev')); + chomp($live_device); #- 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 -- cgit v1.2.1