diff options
| author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2016-10-21 21:08:02 +0100 |
|---|---|---|
| committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2016-10-21 21:46:58 +0100 |
| commit | 8e693b2b50ab5058ea1da3e3072b4026685cb1d9 (patch) | |
| tree | 50d5ba91ae04c0224bda5b96d92eaa5b57528a9d | |
| parent | adfc59ec36d40eee412d1fa03fcad7cb84c2263a (diff) | |
| download | draklive-config-8e693b2b50ab5058ea1da3e3072b4026685cb1d9.tar draklive-config-8e693b2b50ab5058ea1da3e3072b4026685cb1d9.tar.gz draklive-config-8e693b2b50ab5058ea1da3e3072b4026685cb1d9.tar.bz2 draklive-config-8e693b2b50ab5058ea1da3e3072b4026685cb1d9.tar.xz draklive-config-8e693b2b50ab5058ea1da3e3072b4026685cb1d9.zip | |
auto_inst.cfg.pl: don't install grub2 or any proprietary drivers
| -rw-r--r-- | config/auto_inst.cfg.pl | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/config/auto_inst.cfg.pl b/config/auto_inst.cfg.pl index c9af040..2bff007 100644 --- a/config/auto_inst.cfg.pl +++ b/config/auto_inst.cfg.pl @@ -58,6 +58,9 @@ $o = { # so that rpmsrate flags are really used 'compssListLevel' => 5, # default from install_steps_interactive 'skipped_packages' => [ + # no grub2 + 'grub2-', 'os-prober', 'efibootmgr', 'efivar', 'libefivar0'. + #- do not allow source dkms to be installed 'dkms', 'aspell', @@ -197,10 +200,13 @@ $o = { 'mono', # block the kernels we dont want - if_($ENV{DRAKLIVE_ARCH} eq 'i586', '/^kernel-desktop-/', '/^fglrx-kernel-3\.19\.8-desktop-/', '/^nvidia-current-kernel-3\.19\.8-desktop-/', '/^nvidia340-kernel-3\.19\.8-desktop-', '/^nvidia304-kernel-3\.19\.8-desktop-', '/^vboxadditions-kernel-3\.19\.8-desktop-/'), - '/^kernel-server-/', '/^fglrx-kernel-3\.19\.8-server-/', '/^nvidia-current-kernel-3\.19\.8-server-/', '/^nvidia340-kernel-3\.19\.8-server-/', '/^nvidia304-kernel-3\.19\.8-server-/', '/^vboxadditions-kernel-3\.19\.8-server-/', - if_($has_gnome, '/^fglrx-kernel-3\.19\.8-desktop/', 'x11-driver-video-fglrx'), - '/^broadcom-wl-/', + if_($ENV{DRAKLIVE_ARCH} eq 'i586', '/^kernel-desktop-/', '/^vboxadditions-kernel-[0-9.]*-desktop-/'), + '/^kernel-server-/', '/^vboxadditions-kernel-[0-9.]*-server-/', + + # don't pre-install proprietary drivers + '/^broadcom-wl-/', '/^dkms-broadcom-wl-/', + '/^x11-driver-video-fglrx/', '/^dkms-fglrx/', + '/^x11-driver-video-nvidia/', '/^dkms-nvidia/', if_($ENV{DRAKLIVE_PRODUCT} =~ /LiveCD/i, 'libreoffice-core', '/^java-1.8.0-/'), @@ -235,17 +241,13 @@ $o = { if_($has_moblin, 'task-moblin'), - if_($ENV{DRAKLIVE_ARCH} eq 'i586', 'vboxadditions-kernel-desktop586-latest', 'nvidia-current-kernel-desktop586-latest', 'nvidia304-kernel-desktop586-latest'), - if_($ENV{DRAKLIVE_ARCH} eq 'x86_64', 'vboxadditions-kernel-desktop-latest', 'nvidia-current-kernel-desktop-latest', 'nvidia304-kernel-desktop-latest', 'gummiboot'), + if_($ENV{DRAKLIVE_ARCH} eq 'i586', 'vboxadditions-kernel-desktop586-latest'), + if_($ENV{DRAKLIVE_ARCH} eq 'x86_64', 'vboxadditions-kernel-desktop-latest', 'gummiboot'), - if_(!$has_gnome, - if_($ENV{DRAKLIVE_ARCH} eq 'i586', 'fglrx-kernel-desktop586-latest'), - if_($ENV{DRAKLIVE_ARCH} eq 'x86_64', 'fglrx-kernel-desktop-latest'), - 'x11-driver-video-fglrx', - ), + 'basesystem', 'x11-server-common', 'x11-driver-video', 'x11-driver-input', + 'x11-driver-video-vboxvideo', + 'dkms', - 'x11-server-common', 'x11-driver-video-vboxvideo', 'x11-driver-video-nvidia-current', 'x11-driver-video-nvidia340', 'x11-driver-video-nvidia304', - 'basesystem', 'x11-driver-video', 'x11-driver-input', 'bluez-firmware', 'mageiawelcome', 'usbutils', # we want lsusb 'shared-mime-info', # needed for .desktop files to work atleast in gnome |