diff options
| author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2017-05-19 19:45:52 +0100 |
|---|---|---|
| committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2017-05-19 19:45:52 +0100 |
| commit | 58ec3e57b6de49a0b1de46e27eb522bcbe36bdc0 (patch) | |
| tree | 126ca837c114af90e0bda98244246d32d78e7a2e | |
| parent | caddf8c48ccd1ecde1168400f9f08e1c2bc5cbdb (diff) | |
| download | draklive-config-58ec3e57b6de49a0b1de46e27eb522bcbe36bdc0.tar draklive-config-58ec3e57b6de49a0b1de46e27eb522bcbe36bdc0.tar.gz draklive-config-58ec3e57b6de49a0b1de46e27eb522bcbe36bdc0.tar.bz2 draklive-config-58ec3e57b6de49a0b1de46e27eb522bcbe36bdc0.tar.xz draklive-config-58ec3e57b6de49a0b1de46e27eb522bcbe36bdc0.zip | |
Revert "Display a splash screen message when building/installing non-free drivers."
This reverts commit 5a68d0d38aafb3c99bbf74b5437391f42051cf29.
This is now done in the dkms package.
| -rw-r--r-- | config/live.cfg | 1 | ||||
| -rw-r--r-- | patches/dkms.patch | 36 |
2 files changed, 0 insertions, 37 deletions
diff --git a/config/live.cfg b/config/live.cfg index 7cf30e1..bd804bf 100644 --- a/config/live.cfg +++ b/config/live.cfg @@ -125,7 +125,6 @@ my $_l = { # [ "files/pkgs.pm", "/usr/lib/libDrakX/install/pkgs.pm" ], ], patches => [ - 'patches/dkms.patch', ], erase_rpms => [ ], diff --git a/patches/dkms.patch b/patches/dkms.patch deleted file mode 100644 index d7f4af2..0000000 --- a/patches/dkms.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- sbin/dkms 2016-06-15 11:57:24.000000000 +0100 -+++ sbin/dkms 2017-04-14 11:09:12.851156596 +0100 -@@ -3308,6 +3308,13 @@ - fi - } - -+function display_plymouth_message() -+{ -+ if [ -x /bin/plymouth ] && /bin/plymouth --ping; then -+ /bin/plymouth display-message --text="$1" -+ fi -+} -+ - ############################# - #### #### - #### Program Starts Here #### -@@ -3600,7 +3607,9 @@ - build) - delayed_xz=1 - delayed_gzip=1 -+ display_plymouth_message "Building $module driver - this may take some time" - build_module -+ display_plymouth_message "" - ;; - install) - # Make sure they're root -@@ -3608,7 +3617,9 @@ - echo $"You must be root to use this command." >&2 - exit 1 - fi -+ display_plymouth_message "Installing $module driver - this may take some time" - install_module -+ display_plymouth_message "" - ;; - match) - # Make sure they're root |