diff options
| author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2019-01-12 22:12:07 +0000 |
|---|---|---|
| committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2019-01-12 22:15:28 +0000 |
| commit | ff93539eb42bf9f7cc4ac701f3d0afe62141f397 (patch) | |
| tree | 023a72376b19af1bbca499ca8b0cae6f9a9d3ecf | |
| parent | d0bc05b2885c064d0ef0ed531167933c4bd6df60 (diff) | |
| download | drakiso-ff93539eb42bf9f7cc4ac701f3d0afe62141f397.tar drakiso-ff93539eb42bf9f7cc4ac701f3d0afe62141f397.tar.gz drakiso-ff93539eb42bf9f7cc4ac701f3d0afe62141f397.tar.bz2 drakiso-ff93539eb42bf9f7cc4ac701f3d0afe62141f397.tar.xz drakiso-ff93539eb42bf9f7cc4ac701f3d0afe62141f397.zip | |
examples: backport a couple of fixes from the official ISOs.
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | examples/gui/config/build.cfg | 9 | ||||
| -rw-r--r-- | examples/minimal/config/build.cfg | 5 | ||||
| -rw-r--r-- | examples/xfce/config/build.cfg | 11 |
4 files changed, 23 insertions, 3 deletions
@@ -1,4 +1,5 @@ - fix linux16/linuxefi inclusion in bootloader images +- minor improvements to examples 1.7: diff --git a/examples/gui/config/build.cfg b/examples/gui/config/build.cfg index 3aa0372..8b3c999 100644 --- a/examples/gui/config/build.cfg +++ b/examples/gui/config/build.cfg @@ -72,7 +72,9 @@ my $config = { 'dkms-broadcom-wl', 'dkms-nvidia340', 'x11-driver-video-nvidia340', 'dkms-nvidia390', 'x11-driver-video-nvidia390', - 'dkms-nvidia-current', 'x11-driver-video-nvidia-current', + if_($arch eq 'x86_64', + 'dkms-nvidia-current', 'x11-driver-video-nvidia-current', + ), ], langs_always => [ 'en_US' ], @@ -148,6 +150,11 @@ my $config = { # Now update the cache for the new timestamps. "fc-cache -rf", + # The man-db transfiletriggerin scriplet requires systemd, so will + # have silently failed when run in a chroot. So the man-db cache + # will not have been updated. Do it now. + "mandb -q", + # Set the initial wireless regulatory domain to "world", enabling # all possible wireless channels to be used. "sed -i -r 's/CRDA_DOMAIN=.*/CRDA_DOMAIN=00/' /etc/sysconfig/network", diff --git a/examples/minimal/config/build.cfg b/examples/minimal/config/build.cfg index d7fa2e2..0627bd6 100644 --- a/examples/minimal/config/build.cfg +++ b/examples/minimal/config/build.cfg @@ -130,6 +130,11 @@ my $config = { # Enable the set-lang-kbd service. "systemctl enable set-lang-kbd.service", + # The man-db transfiletriggerin scriplet requires systemd, so will + # have silently failed when run in a chroot. So the man-db cache + # will not have been updated. Do it now. + "mandb -q", + # Set the initial wireless regulatory domain to "world", enabling # all possible wireless channels to be used. "sed -i -r 's/CRDA_DOMAIN=.*/CRDA_DOMAIN=00/' /etc/sysconfig/network", diff --git a/examples/xfce/config/build.cfg b/examples/xfce/config/build.cfg index 2749350..1a0e9fc 100644 --- a/examples/xfce/config/build.cfg +++ b/examples/xfce/config/build.cfg @@ -101,9 +101,11 @@ my $config = { # nonfree 'dkms-broadcom-wl', - 'dkms-nvidia390', 'x11-driver-video-nvidia390', 'dkms-nvidia340', 'x11-driver-video-nvidia340', - 'dkms-nvidia-current', 'x11-driver-video-nvidia-current', + 'dkms-nvidia390', 'x11-driver-video-nvidia390', + if_($arch eq 'x86_64', + 'dkms-nvidia-current', 'x11-driver-video-nvidia-current', + ), ], langs_always => [ 'en_US' ], @@ -197,6 +199,11 @@ my $config = { # Now update the cache for the new timestamps. "fc-cache -rf", + # The man-db transfiletriggerin scriplet requires systemd, so will + # have silently failed when run in a chroot. So the man-db cache + # will not have been updated. Do it now. + "mandb -q", + # Set the initial wireless regulatory domain to "world", enabling # all possible wireless channels to be used. "sed -i -r 's/CRDA_DOMAIN=.*/CRDA_DOMAIN=00/' /etc/sysconfig/network", |