summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2017-04-29 12:21:30 +0100
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2017-04-29 12:21:30 +0100
commit5a68d0d38aafb3c99bbf74b5437391f42051cf29 (patch)
treebef316dde6a4244792ae3bb147abb7cd99250608
parent3d5c99bfafed144515e451efb7c9d09a7f1ef748 (diff)
downloaddraklive-config-5a68d0d38aafb3c99bbf74b5437391f42051cf29.tar
draklive-config-5a68d0d38aafb3c99bbf74b5437391f42051cf29.tar.gz
draklive-config-5a68d0d38aafb3c99bbf74b5437391f42051cf29.tar.bz2
draklive-config-5a68d0d38aafb3c99bbf74b5437391f42051cf29.tar.xz
draklive-config-5a68d0d38aafb3c99bbf74b5437391f42051cf29.zip
Display a splash screen message when building/installing non-free drivers.
The dkms build/install can take a long time. This reassures the user that the boot is progressing.
-rw-r--r--config/live.cfg1
-rw-r--r--patches/dkms.patch36
2 files changed, 37 insertions, 0 deletions
diff --git a/config/live.cfg b/config/live.cfg
index bd804bf..7cf30e1 100644
--- a/config/live.cfg
+++ b/config/live.cfg
@@ -125,6 +125,7 @@ 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
new file mode 100644
index 0000000..d7f4af2
--- /dev/null
+++ b/patches/dkms.patch
@@ -0,0 +1,36 @@
+--- 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