diff --git a/data/translations/danish.trans b/data/translations/danish.trans index 350bea5..c0cc0be 100644 --- a/data/translations/danish.trans +++ b/data/translations/danish.trans @@ -358,6 +358,7 @@ _InstDrvBody="Some network and graphics cards\nmay need special drivers.\nOption _InstFree="Auto-install free drivers" # translate me ! _InstProp="Auto-install proprietary drivers" # translate me ! _SelDDrv="Select Display Driver" # translate me ! +_InstAllDrv="Install all free drivers" # translate me ! # Configure Base Menu _ConfBseMenuTitle="Opsætning af Manjaro Base" diff --git a/data/translations/dutch.trans b/data/translations/dutch.trans index c62115b..2913b47 100644 --- a/data/translations/dutch.trans +++ b/data/translations/dutch.trans @@ -357,6 +357,7 @@ _InstDrvBody="Some network and graphics cards\nmay need special drivers.\nOption _InstFree="Auto-install free drivers" # translate me ! _InstProp="Auto-install proprietary drivers" # translate me ! _SelDDrv="Select Display Driver" # translate me ! +_InstAllDrv="Install all free drivers" # translate me ! # Configureer het basissysteem _ConfBseMenuTitle="Configureer het Basissysteem" diff --git a/data/translations/english.trans b/data/translations/english.trans index 0688b48..4497c7a 100644 --- a/data/translations/english.trans +++ b/data/translations/english.trans @@ -357,6 +357,7 @@ _InstDrvBody="Some network and graphics cards \nmay need special drivers. \nOpti _InstFree="Auto-install free drivers" _InstProp="Auto-install proprietary drivers" _SelDDrv="Select Display Driver" +_InstAllDrv="Install all free drivers" # Configure Base Menu _ConfBseMenuTitle="Configure Base" diff --git a/data/translations/french.trans b/data/translations/french.trans index 04a56a2..55219af 100644 --- a/data/translations/french.trans +++ b/data/translations/french.trans @@ -358,6 +358,7 @@ _InstDrvBody="Quelques cartes réseau et graphiques\npeuvent nécessiter un pilo _InstFree="Installation automatique du pilote libre" _InstProp="Installation automatique du pilote propriétaire" _SelDDrv="Selectionner un pilote graphique" +_InstAllDrv="Install all free drivers" # translate me ! # Configurer le menu de Base _ConfBseMenuTitle="Configurer la base" diff --git a/data/translations/german.trans b/data/translations/german.trans index e3afdd1..3570eb6 100644 --- a/data/translations/german.trans +++ b/data/translations/german.trans @@ -356,6 +356,7 @@ _InstDrvBody="Manche Netzwerk- und Grafikkarten\nbenötigen spezielle Treiber.\n _InstFree="Auto-Installation freie Treiber" _InstProp="Auto-Installation proprietäre Treiber" _SelDDrv="Grafiktreiber auswählen" +_InstAllDrv="Install all free drivers" # translate me ! # Configure Base Menu _ConfBseMenuTitle="Basis konfigurieren" diff --git a/data/translations/hungarian.trans b/data/translations/hungarian.trans index 502237c..3081e82 100644 --- a/data/translations/hungarian.trans +++ b/data/translations/hungarian.trans @@ -354,6 +354,7 @@ _InstDrvBody="Some network and graphics cards\nmay need special drivers.\nOption _InstFree="Auto-install free drivers" # translate me ! _InstProp="Auto-install proprietary drivers" # translate me ! _SelDDrv="Select Display Driver" # translate me ! +_InstAllDrv="Install all free drivers" # translate me ! # Alapbeállítás menü _ConfBseMenuTitle="Alaprendszer beállítása" diff --git a/data/translations/italian.trans b/data/translations/italian.trans index de86f18..265340e 100644 --- a/data/translations/italian.trans +++ b/data/translations/italian.trans @@ -357,6 +357,7 @@ _InstDrvBody="Some network and graphics cards \nmay need special drivers. \nOpti _InstFree="Auto-install free drivers" # translate me ! _InstProp="Auto-install proprietary drivers" # translate me ! _SelDDrv="Select Display Driver" # translate me ! +_InstAllDrv="Install all free drivers" # translate me ! # Configure Base Menu _ConfBseMenuTitle="Configurazione di base" diff --git a/data/translations/polish.trans b/data/translations/polish.trans index 45de0ac..60e1d0c 100644 --- a/data/translations/polish.trans +++ b/data/translations/polish.trans @@ -357,6 +357,7 @@ _InstDrvBody="Niektóre karty sieciowe i graficzne \nmogą wymagać specjalnych _InstFree="Zainstaluj automatycznie otwarte sterowniki" _InstProp="Zainstaluj automatycznie sterowniki własnościowe" _SelDDrv="Wybierz sterownik wyświetlania" +_InstAllDrv="Install all free drivers" # translate me ! # Configure Base Menu _ConfBseMenuTitle="Konfiguracja systemu podstawowego" diff --git a/data/translations/portuguese.trans b/data/translations/portuguese.trans index 1a4b38b..7132a32 100644 --- a/data/translations/portuguese.trans +++ b/data/translations/portuguese.trans @@ -356,6 +356,7 @@ _InstDrvBody="Some network and graphics cards \nmay need special drivers. \nOpti _InstFree="Auto-install free drivers" # translate me ! _InstProp="Auto-install proprietary drivers" # translate me ! _SelDDrv="Select Display Driver" # translate me ! +_InstAllDrv="Install all free drivers" # translate me ! # Configurar Menu Base _ConfBseMenuTitle="Configurar Base" diff --git a/data/translations/portuguese_brasil.trans b/data/translations/portuguese_brasil.trans index 76219f9..e47e029 100644 --- a/data/translations/portuguese_brasil.trans +++ b/data/translations/portuguese_brasil.trans @@ -357,6 +357,7 @@ _InstDrvBody="Some network and graphics cards \nmay need special drivers. \nOpti _InstFree="Auto-install free drivers" # translate me ! _InstProp="Auto-install proprietary drivers" # translate me ! _SelDDrv="Select Display Driver" # translate me ! +_InstAllDrv="Install all free drivers" # translate me ! # Configurar Menu Base _ConfBseMenuTitle="Configurar Base" diff --git a/data/translations/russian.trans b/data/translations/russian.trans index 6509f22..f84d9b6 100644 --- a/data/translations/russian.trans +++ b/data/translations/russian.trans @@ -357,6 +357,7 @@ _InstDrvBody="Некоторым сетевым и графическим кар _InstFree="Auto-install free drivers" # translate me ! _InstProp="Auto-install proprietary drivers" # translate me ! _SelDDrv="Select Display Driver" # translate me ! +_InstAllDrv="Install all free drivers" # translate me ! # Configure Base Menu _ConfBseMenuTitle="Настройка базовой системы" diff --git a/data/translations/spanish.trans b/data/translations/spanish.trans index 05c1960..fc3f54d 100644 --- a/data/translations/spanish.trans +++ b/data/translations/spanish.trans @@ -356,6 +356,7 @@ _InstDrvBody="Some network and graphics cards \nmay need special drivers. \nOpti _InstFree="Auto-install free drivers" # translate me ! _InstProp="Auto-install proprietary drivers" # translate me ! _SelDDrv="Select Display Driver" # translate me ! +_InstAllDrv="Install all free drivers" # translate me ! # Menú de configuración del sistema base _ConfBseMenuTitle="Configurar sistema base" diff --git a/lib/util-desktop.sh b/lib/util-desktop.sh index 4e8f2e0..993b91e 100644 --- a/lib/util-desktop.sh +++ b/lib/util-desktop.sh @@ -103,6 +103,30 @@ install_intel() { fi } +install_all_drivers() { + + cat $PROFILES/shared/Packages-Mhwd > /tmp/.all_drivers + grep "KERNEL-" /tmp/.all_drivers > /tmp/.kernel_dependent + for kernel in $(cat /tmp/.chosen_kernels); do + cat /tmp/.kernel_dependent | sed "s/KERNEL/\n$kernel/g" >> /mnt/.all_drivers + echo "" >> /mnt/.all_drivers + done + + if [[ -e /mnt/.openrc ]]; then + # Remove any packages tagged with >systemd and remove >openrc tags + sed -i '/>systemd/d' /mnt/.all_drivers + sed -i 's/>openrc //g' /mnt/.all_drivers + else + # Remove any packages tagged with >openrc and remove >systemd tags + sed -i '/>openrc/d' /mnt/.all_drivers + sed -i 's/>systemd //g' /mnt/.all_drivers + fi + sed -i '/>multilib/d' /mnt/.all_drivers + sed -i '/>nonfree_multilib/d' /mnt/.all_drivers + sed -i '/>nonfree_default/d' /mnt/.all_drivers + basestrap ${MOUNTPOINT} /mnt/.all_drivers + +} install_ati() { sed -i 's/MODULES=""/MODULES="radeon"/' ${MOUNTPOINT}/etc/mkinitcpio.conf } diff --git a/lib/util-menu.sh b/lib/util-menu.sh index 3535751..197bd54 100644 --- a/lib/util-menu.sh +++ b/lib/util-menu.sh @@ -206,7 +206,8 @@ install_graphics_menu() { DIALOG " $_InstGrMenuDD " --menu "\n " 0 0 3 \ "1" "$_InstFree" \ "2" "$_InstProp" \ - "3" "$_SelDDrv" 2>${ANSWER} || return 0 + "3" "$_SelDDrv" \ + "4" "$_InstAllDrv" 2>${ANSWER} || return 0 case $(cat ${ANSWER}) in "1") clear @@ -221,5 +222,7 @@ install_graphics_menu() { ;; "3") setup_graphics_card ;; + "4") install_all_drivers + ;; esac }