diff options
| author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2016-11-01 08:52:57 +0000 |
|---|---|---|
| committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2016-11-06 11:59:56 +0000 |
| commit | e61963d811173bb572bb1ffe0d3ad1a8c265801d (patch) | |
| tree | d1f7458e808b5a52f5c1b8f78567c9ff02bbc3fe | |
| parent | c5dd608caa03d368e7d721cf291530b43410f73c (diff) | |
| download | draklive-config-e61963d811173bb572bb1ffe0d3ad1a8c265801d.tar draklive-config-e61963d811173bb572bb1ffe0d3ad1a8c265801d.tar.gz draklive-config-e61963d811173bb572bb1ffe0d3ad1a8c265801d.tar.bz2 draklive-config-e61963d811173bb572bb1ffe0d3ad1a8c265801d.tar.xz draklive-config-e61963d811173bb572bb1ffe0d3ad1a8c265801d.zip | |
| -rw-r--r-- | config/live.cfg | 2 | ||||
| -rw-r--r-- | patches/dkms.patch | 19 | ||||
| -rw-r--r-- | patches/do_pkgs.patch | 11 |
3 files changed, 32 insertions, 0 deletions
diff --git a/config/live.cfg b/config/live.cfg index cb61f5f..fbad02e 100644 --- a/config/live.cfg +++ b/config/live.cfg @@ -132,6 +132,8 @@ my $_l = { # [ "files/pkgs.pm", "/usr/lib/libDrakX/install/pkgs.pm" ], ], patches => [ + 'patches/dkms.patch', + 'patches/do_pkgs.patch', ], erase_rpms => [ ], diff --git a/patches/dkms.patch b/patches/dkms.patch new file mode 100644 index 0000000..0263516 --- /dev/null +++ b/patches/dkms.patch @@ -0,0 +1,19 @@ +--- sbin/dkms.orig 2016-09-24 00:49:50.300155014 +0100 ++++ sbin/dkms 2016-09-24 00:51:15.442929416 +0100 +@@ -1294,10 +1294,12 @@ + fi + + # Load installed modules +- current_arch=`uname -m` +- [[ $current_arch = i?86 ]] && current_arch=i586 +- if [ "${kernelver_array[0]}" == "$(uname -r)" -a "${arch_array[0]}" == "$current_arch" ]; then +- /usr/sbin/dkms_autoload ${dest_module_name[@]} ++ if [ -e /etc/X11/xorg.conf -o ! -e /run/mgalive ]; then ++ current_arch=`uname -m` ++ [[ $current_arch = i?86 ]] && current_arch=i586 ++ if [ "${kernelver_array[0]}" == "$(uname -r)" -a "${arch_array[0]}" == "$current_arch" ]; then ++ /usr/sbin/dkms_autoload ${dest_module_name[@]} ++ fi + fi + + echo $"" diff --git a/patches/do_pkgs.patch b/patches/do_pkgs.patch new file mode 100644 index 0000000..f507a97 --- /dev/null +++ b/patches/do_pkgs.patch @@ -0,0 +1,11 @@ +--- 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') { |