summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/live.cfg2
-rw-r--r--patches/draklive-install.patch14
2 files changed, 16 insertions, 0 deletions
diff --git a/config/live.cfg b/config/live.cfg
index b0f35eb..9c5accf 100644
--- a/config/live.cfg
+++ b/config/live.cfg
@@ -130,6 +130,8 @@ my $_l = {
# [ "files/pkgs.pm", "/usr/lib/libDrakX/install/pkgs.pm" ],
],
patches => [
+ # Fix mga#23394 and mga#23603
+ 'patches/draklive-install.patch',
],
erase_rpms => [
],
diff --git a/patches/draklive-install.patch b/patches/draklive-install.patch
new file mode 100644
index 0000000..04843df
--- /dev/null
+++ b/patches/draklive-install.patch
@@ -0,0 +1,14 @@
+--- sbin/draklive-install
++++ sbin/draklive-install
+@@ -87,8 +87,9 @@ sub umount_all {
+ eval { fs::mount::swapoff($_->{device}) };
+ }
+ }
+- foreach (map { $_->{isMounted} && !isSwap($_) ? "/dev/$_->{device}" : () } @$fstab) {
+- system('umount', $_);
++ foreach (grep { $_->{isMounted} && !isSwap($_) } @$fstab) {
++ system('umount', "/dev/$_->{device}");
++ $_->{isMounted} = 0;
+ }
+ }
+