diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-04-23 13:33:09 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-04-23 13:33:09 +0200 |
| commit | 030f6f489fe9544f35ebaf95135acd1dd67ce63f (patch) | |
| tree | f1d5d1f1b68de81daec6f05d032a0410a475d960 /gnu/system | |
| parent | 95c14929a7fbd3c55c5e8756953c2f257625e2b7 (diff) | |
| parent | 938df0de739aa13c2fb483f440ec1db281a52aaa (diff) | |
| download | patches-030f6f489fe9544f35ebaf95135acd1dd67ce63f.tar patches-030f6f489fe9544f35ebaf95135acd1dd67ce63f.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
etc/news.scm
gnu/local.mk
gnu/packages/bootloaders.scm
gnu/packages/linphone.scm
gnu/packages/linux.scm
gnu/packages/tls.scm
gnu/system.scm
Diffstat (limited to 'gnu/system')
| -rw-r--r-- | gnu/system/install.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/system/install.scm b/gnu/system/install.scm index c1481d13e2..822c4e3cfa 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -296,8 +296,8 @@ the user's target storage device rather than on the RAM disk." ;; support Kernel Mode Setting. Otherwise kmscon is missing /dev/fb0. (define (uvesafb-shepherd-service _) (list (shepherd-service - (documentation "Load the uvesafb kernel module.") - (provision '(uvesafb)) + (documentation "Load the uvesafb kernel module if needed.") + (provision '(maybe-uvesafb)) (requirement '(file-systems)) (start #~(lambda () ;; uvesafb is only supported on x86 and x86_64. |