diff options
| author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2016-11-12 19:06:31 +0000 |
|---|---|---|
| committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2016-11-12 19:06:31 +0000 |
| commit | b6a40abe0a9f4127a1def0ac5b5667e963eebd80 (patch) | |
| tree | 54f460623f385ae9163491649ddccc58131dd703 | |
| parent | 05625dbf3ab9345db60dd1a5c9ca76e4f545ac36 (diff) | |
| download | draklive-config-b6a40abe0a9f4127a1def0ac5b5667e963eebd80.tar draklive-config-b6a40abe0a9f4127a1def0ac5b5667e963eebd80.tar.gz draklive-config-b6a40abe0a9f4127a1def0ac5b5667e963eebd80.tar.bz2 draklive-config-b6a40abe0a9f4127a1def0ac5b5667e963eebd80.tar.xz draklive-config-b6a40abe0a9f4127a1def0ac5b5667e963eebd80.zip | |
| -rw-r--r-- | config/live.cfg | 7 | ||||
| -rw-r--r-- | patches/dkms.patch | 19 | ||||
| -rw-r--r-- | patches/do_pkgs.patch | 11 | ||||
| -rw-r--r-- | patches/prefdm.patch | 24 |
4 files changed, 61 insertions, 0 deletions
diff --git a/config/live.cfg b/config/live.cfg index 92ddcfb..22471c8 100644 --- a/config/live.cfg +++ b/config/live.cfg @@ -125,6 +125,13 @@ my $_l = { # [ "files/pkgs.pm", "/usr/lib/libDrakX/install/pkgs.pm" ], ], patches => [ + # Temporary patches waiting to be applied to mga packages + # mga#17223 + 'patches/prefdm.patch', + # mga#19520 + 'patches/dkms.patch', + # mga#19517 + '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') { diff --git a/patches/prefdm.patch b/patches/prefdm.patch new file mode 100644 index 0000000..4bf61ad --- /dev/null +++ b/patches/prefdm.patch @@ -0,0 +1,24 @@ +--- etc/X11/prefdm.orig 2016-06-28 19:43:36.527681311 +0100 ++++ etc/X11/prefdm 2016-06-28 19:48:32.634631468 +0100 +@@ -62,8 +62,19 @@ + fi + fi + +-# shut down boot splash +-[ -x /bin/plymouth ] && [ "x$plymouth_quit" = "xyes" ] && /bin/plymouth quit ++[ -f /etc/sysconfig/firstboot ] && . /etc/sysconfig/firstboot ++[ -f /etc/sysconfig/finish-install ] && . /etc/sysconfig/finish-install ++grep -q '\binstall\b' /proc/cmdline ++RETVAL=$? ++if [ \( "x$FINISH_INSTALL" = "xyes" -a -x /usr/sbin/finish-install \) -o \( "x$FIRSTBOOT" = "xyes" -a -x /usr/bin/mozilla-firefox \) -o \( $RETVAL = 0 \) ]; then ++ # unconditionally shut down boot splash ++ [ -x /bin/plymouth ] && /bin/plymouth quit ++ # and run first-time actions ++ /usr/bin/xinit /etc/X11/xdm/Xsetup_0 ++else ++ # shut down boot splash for DMs that don't handle it themselves ++ [ -x /bin/plymouth ] && [ "x$plymouth_quit" = "xyes" ] && /bin/plymouth quit ++fi + + shopt -s execfail + |