summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2017-01-28 17:31:42 +0000
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2017-01-28 17:33:55 +0000
commit3a2b220bf8338ed5b6cec6b4db11a353c8f715a2 (patch)
treebd7abdf0307ded02473cf57afaf367833c0218f0
parentdc4de5741ad3b5c2edfd1d21af25424197aac71c (diff)
downloaddraklive-config-3a2b220bf8338ed5b6cec6b4db11a353c8f715a2.tar
draklive-config-3a2b220bf8338ed5b6cec6b4db11a353c8f715a2.tar.gz
draklive-config-3a2b220bf8338ed5b6cec6b4db11a353c8f715a2.tar.bz2
draklive-config-3a2b220bf8338ed5b6cec6b4db11a353c8f715a2.tar.xz
draklive-config-3a2b220bf8338ed5b6cec6b4db11a353c8f715a2.zip
Drop obsolete patch (fix has been released in drakxtools).
-rw-r--r--config/live.cfg2
-rw-r--r--patches/do_pkgs.patch11
2 files changed, 0 insertions, 13 deletions
diff --git a/config/live.cfg b/config/live.cfg
index 8967799..d8ecdf9 100644
--- a/config/live.cfg
+++ b/config/live.cfg
@@ -126,8 +126,6 @@ my $_l = {
'patches/prefdm.patch',
# mga#19520
'patches/dkms.patch',
- # mga#19517
- 'patches/do_pkgs.patch',
],
erase_rpms => [
],
diff --git a/patches/do_pkgs.patch b/patches/do_pkgs.patch
deleted file mode 100644
index f507a97..0000000
--- a/patches/do_pkgs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- usr/lib/libDrakX/do_pkgs.pm.orig 2016-09-24 00:52:03.106222180 +0100
-+++ usr/lib/libDrakX/do_pkgs.pm 2016-09-24 00:52:30.872813374 +0100
-@@ -333,7 +333,7 @@
- return 1;
- }
-
-- my @wrapper = is_mgalive() ? qw(chroot /mnt/install) : ();
-+ my @wrapper = is_mgalive() && -e '/mnt/install' ? qw(chroot /mnt/install) : ();
- my @options = ('--allow-medium-change', '--auto', '--no-verify-rpm', '--expect-install', @l);
- my $ret;
- if (check_for_xserver() && -x '/usr/bin/gurpmi') {