diff options
| author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2018-10-01 23:29:31 +0200 |
|---|---|---|
| committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2018-10-01 23:29:31 +0200 |
| commit | 0731cc581ae18d820b3808c82c0214b51d4adcb7 (patch) | |
| tree | a46d4ea37842c9dfaea53c1f59bbd65f3441dad0 | |
| parent | e712ef10af7e26bff5cac719a6474f8b1c7cc200 (diff) | |
| download | draklive-config-0731cc581ae18d820b3808c82c0214b51d4adcb7.tar draklive-config-0731cc581ae18d820b3808c82c0214b51d4adcb7.tar.gz draklive-config-0731cc581ae18d820b3808c82c0214b51d4adcb7.tar.bz2 draklive-config-0731cc581ae18d820b3808c82c0214b51d4adcb7.tar.xz draklive-config-0731cc581ae18d820b3808c82c0214b51d4adcb7.zip | |
| -rw-r--r-- | config/live.cfg | 2 | ||||
| -rw-r--r-- | patches/draklive-install.patch | 14 |
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; + } + } + |