diff options
author | David P <megver83@openmailbox.org> | 2017-10-01 17:19:40 -0300 |
---|---|---|
committer | David P <megver83@openmailbox.org> | 2017-10-01 17:19:40 -0300 |
commit | 1bf80f77f7a8bb4ffdd203c60662421e3f8f589b (patch) | |
tree | e7b444e2dd20ffb0b5905942dd853bf4d2c0da8a /configs/mate-openrc | |
parent | f5d62fdcd4a6d351fa25af3b3e443ba4de67a802 (diff) |
Added configs/mate-openrc
Other changes:
- Updated talkingparabola-X11 packages.both (xorg pkgs)
- Updated pacman-init service for profile-openrc
Diffstat (limited to 'configs/mate-openrc')
-rw-r--r-- | configs/mate-openrc/mkinitcpio.conf | 1 | ||||
-rw-r--r-- | configs/mate-openrc/packages.both | 19 | ||||
-rw-r--r-- | configs/mate-openrc/root-image/etc/conf.d/agetty.tty1 (renamed from configs/mate-openrc/root-image/etc/conf.d/agetty) | 5 | ||||
-rw-r--r-- | configs/mate-openrc/root-image/etc/hostname | 1 | ||||
-rwxr-xr-x | configs/mate-openrc/root-image/etc/init.d/pacman-init | 31 | ||||
-rw-r--r-- | configs/mate-openrc/root-image/etc/wallpaper.png | bin | 831159 -> 842326 bytes | |||
-rw-r--r-- | configs/mate-openrc/root-image/root/.config/autostart/.language.sh.desktop | 9 | ||||
-rw-r--r-- | configs/mate-openrc/root-image/root/.config/caja/accels | 70 | ||||
-rwxr-xr-x | configs/mate-openrc/root-image/root/.keymap.sh | 202 | ||||
-rwxr-xr-x | configs/mate-openrc/root-image/root/.language.sh | 25 | ||||
-rw-r--r-- | configs/mate-openrc/root-image/root/.zlogin | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | configs/mate-openrc/root-image/root/Desktop/Parabola Installation CLI.desktop | 0 | ||||
-rwxr-xr-x | configs/mate-openrc/root-image/root/customize_root_image.sh | 22 |
13 files changed, 235 insertions, 152 deletions
diff --git a/configs/mate-openrc/mkinitcpio.conf b/configs/mate-openrc/mkinitcpio.conf index 1006d1d..fc2572b 100644 --- a/configs/mate-openrc/mkinitcpio.conf +++ b/configs/mate-openrc/mkinitcpio.conf @@ -1,2 +1,3 @@ +MODULES="loop" HOOKS="base udev memdisk parabolaiso_shutdown parabolaiso parabolaiso_loop_mnt parabolaiso_pxe_common parabolaiso_pxe_nbd parabolaiso_pxe_http parabolaiso_pxe_nfs parabolaiso_kms block pcmcia filesystems keyboard" COMPRESSION="xz" diff --git a/configs/mate-openrc/packages.both b/configs/mate-openrc/packages.both index 84d5f6e..5887141 100644 --- a/configs/mate-openrc/packages.both +++ b/configs/mate-openrc/packages.both @@ -14,12 +14,12 @@ ethtool f2fs-tools fsarchiver gnu-netcat -gpm +gpm-openrc gptfdisk grml-zsh-config grub -haveged -hdparm +haveged-openrc +hdparm-openrc irssi lftp linux-atm @@ -30,10 +30,10 @@ nfs-utils nilfs-utils nmap ntfs-3g -ntp +ntp-openrc openconnect -openssh -openvpn +openssh-openrc +openvpn-openrc partclone parted partimage @@ -41,7 +41,7 @@ pptpclient ppp rfkill rp-pppoe -rsync +rsync-openrc smartmontools sudo tcpdump @@ -51,7 +51,7 @@ vpnc wget wireless_tools wpa_actiond -wpa_supplicant +wpa_supplicant-openrc zile wvdial xl2tpd @@ -95,7 +95,7 @@ pulseaudio-alsa alsa-utils #Network -networkmanager +networkmanager-elogind network-manager-applet ath9k-htc-firmware gnome-keyring @@ -135,6 +135,5 @@ iceweasel-l10n-pt-br icedove-l10n-pt-br #OpenRC -base-openrc openrc-desktop polkit-elogind diff --git a/configs/mate-openrc/root-image/etc/conf.d/agetty b/configs/mate-openrc/root-image/etc/conf.d/agetty.tty1 index 5e9b663..b7ff06d 100644 --- a/configs/mate-openrc/root-image/etc/conf.d/agetty +++ b/configs/mate-openrc/root-image/etc/conf.d/agetty.tty1 @@ -5,4 +5,7 @@ baud="38400" term_type="linux" # extra options to pass to agetty for this port -agetty_options="--autologin root --noclear %I" +agetty_options="--autologin root --noclear" + +# make agetty quiet +#quiet="no" diff --git a/configs/mate-openrc/root-image/etc/hostname b/configs/mate-openrc/root-image/etc/hostname deleted file mode 100644 index 8aaf41b..0000000 --- a/configs/mate-openrc/root-image/etc/hostname +++ /dev/null @@ -1 +0,0 @@ -parabolaiso diff --git a/configs/mate-openrc/root-image/etc/init.d/pacman-init b/configs/mate-openrc/root-image/etc/init.d/pacman-init new file mode 100755 index 0000000..b610683 --- /dev/null +++ b/configs/mate-openrc/root-image/etc/init.d/pacman-init @@ -0,0 +1,31 @@ +#!/usr/bin/openrc-run +# Copyright (C) 2017 Parabola Project +# Copyright (C) Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +description="Initializes Pacman keyring" + +depend() { + use haveged + after haveged +} + +start() { + # Check that there's no keyring, if there isn't, create one + # in the background for a faster boot + if [ ! -d /etc/pacman.d/gnupg ]; then + ebegin "Starting Pacman keyring" + pacman-key --init &> /dev/null && + pacman-key --populate archlinux parabola &> /dev/null + else + ebegin "Pacman keyring already started" + fi +} + +stop() { + # If there's a keyring, delete it + if [ -d /etc/pacman.d/gnupg ]; then + ebegin "Stoping Pacman keyring" + rm -rf /etc/pacman.d/gnupg + fi +} diff --git a/configs/mate-openrc/root-image/etc/wallpaper.png b/configs/mate-openrc/root-image/etc/wallpaper.png Binary files differindex 16b906a..d74092f 100644 --- a/configs/mate-openrc/root-image/etc/wallpaper.png +++ b/configs/mate-openrc/root-image/etc/wallpaper.png diff --git a/configs/mate-openrc/root-image/root/.config/autostart/.language.sh.desktop b/configs/mate-openrc/root-image/root/.config/autostart/.language.sh.desktop deleted file mode 100644 index 1fb65f8..0000000 --- a/configs/mate-openrc/root-image/root/.config/autostart/.language.sh.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Type=Application -Exec=/root/.language.sh -Hidden=false -X-MATE-Autostart-enabled=true -Name[en_US]=/root/.language.sh -Name=/root/.language.sh -Comment[en_US]= -Comment= diff --git a/configs/mate-openrc/root-image/root/.config/caja/accels b/configs/mate-openrc/root-image/root/.config/caja/accels index 9464f0d..18bc53a 100644 --- a/configs/mate-openrc/root-image/root/.config/caja/accels +++ b/configs/mate-openrc/root-image/root/.config/caja/accels @@ -5,6 +5,7 @@ ; (gtk_accel_path "<Actions>/DirViewActions/Save Search" "") ; (gtk_accel_path "<Actions>/IconViewActions/Sort by Emblems" "") ; (gtk_accel_path "<Actions>/DirViewActions/Start Volume" "") +; (gtk_accel_path "<Actions>/NavigationActions/TabsNext" "<Primary>Page_Down") ; (gtk_accel_path "<Actions>/DirViewActions/Location Poll" "") ; (gtk_accel_path "<Actions>/ShellActions/Go to Trash" "") ; (gtk_accel_path "<Actions>/SpatialActions/Go to Location" "<Primary>l") @@ -13,65 +14,96 @@ ; (gtk_accel_path "<Actions>/ShellActions/ZoomInAccel" "<Primary>equal") ; (gtk_accel_path "<Actions>/DirViewActions/LocationTrash" "") ; (gtk_accel_path "<Actions>/DirViewActions/RenameSelectAll" "<Shift>F2") +; (gtk_accel_path "<Actions>/ShellActions/About Caja" "") ; (gtk_accel_path "<Actions>/DirViewActions/Undo" "<Primary>z") +; (gtk_accel_path "<Actions>/NavigationActions/Back" "<Alt>Left") ; (gtk_accel_path "<Actions>/DirViewActions/Location Start Volume" "") ; (gtk_accel_path "<Actions>/DirViewActions/CopyToMenu" "") +; (gtk_accel_path "<Actions>/NavigationActions/Tab2" "<Alt>3") +; (gtk_accel_path "<Actions>/DirViewActions/LocationRestoreFromTrash" "") ; (gtk_accel_path "<Actions>/DirViewActions/Empty Trash" "") ; (gtk_accel_path "<Actions>/ShellActions/Close" "<Primary>w") -; (gtk_accel_path "<Actions>/DirViewActions/LocationRestoreFromTrash" "") +; (gtk_accel_path "<Actions>/NavigationActions/Add Bookmark" "<Primary>d") ; (gtk_accel_path "<Actions>/IconViewActions/Manual Layout" "") +; (gtk_accel_path "<Actions>/ExtensionsMenuGroup/CajaOpenTerminal::open_terminal" "") ; (gtk_accel_path "<Actions>/ShellActions/Zoom Normal" "<Primary>0") +; (gtk_accel_path "<Actions>/NavigationActions/Tab1" "<Alt>2") +; (gtk_accel_path "<Actions>/NavigationActions/Show Hide Extra Pane" "F3") ; (gtk_accel_path "<Actions>/DirViewActions/Create Link" "<Primary>m") ; (gtk_accel_path "<Actions>/DirViewActions/LocationDelete" "") +; (gtk_accel_path "<Actions>/DirViewActions/Format Volume" "") ; (gtk_accel_path "<Actions>/IconViewActions/Sort by Trash Time" "") -; (gtk_accel_path "<Actions>/DirViewActions/OtherApplication2" "") ; (gtk_accel_path "<Actions>/DirViewActions/OpenInNewTab" "<Primary><Shift>o") +; (gtk_accel_path "<Actions>/DirViewActions/OtherApplication2" "") ; (gtk_accel_path "<Actions>/DirViewActions/OtherApplication1" "") +; (gtk_accel_path "<Actions>/DirViewActions/Mount Volume" "") +; (gtk_accel_path "<Actions>/NavigationActions/Folder Window" "") +; (gtk_accel_path "<Actions>/NavigationActions/Show Hide Statusbar" "") ; (gtk_accel_path "<Actions>/ShellActions/Connect to Server" "") ; (gtk_accel_path "<Actions>/ShellActions/Help" "") +; (gtk_accel_path "<Actions>/NavigationActions/Tab6" "<Alt>7") +; (gtk_accel_path "<Actions>/NavigationActions/Clear History" "") ; (gtk_accel_path "<Actions>/ShellActions/ZoomInAccel2" "<Primary>KP_Add") +; (gtk_accel_path "<Actions>/IconViewActions/Sort by Type" "") +; (gtk_accel_path "<Actions>/NavigationActions/Tab7" "<Alt>8") +; (gtk_accel_path "<Actions>/NavigationActions/ShowSearch" "<Primary>f") +; (gtk_accel_path "<Actions>/NavigationActions/Tab9" "<Alt>0") +; (gtk_accel_path "<Actions>/NavigationActions/Tab8" "<Alt>9") ; (gtk_accel_path "<Actions>/SpatialActions/Close All Folders" "<Primary>q") ; (gtk_accel_path "<Actions>/ShellActions/File" "") -; (gtk_accel_path "<Actions>/DirViewActions/Format Volume" "") -; (gtk_accel_path "<Actions>/ShellActions/Caja Manual" "F1") +; (gtk_accel_path "<Actions>/NavigationActions/Tab5" "<Alt>6") +; (gtk_accel_path "<Actions>/NavigationActions/Tab4" "<Alt>5") +; (gtk_accel_path "<Actions>/NavigationActions/Tab3" "<Alt>4") +; (gtk_accel_path "<Actions>/NavigationActions/TabsMoveRight" "<Primary><Shift>Page_Down") +; (gtk_accel_path "<Actions>/NavigationActions/TabsPrevious" "<Primary>Page_Up") ; (gtk_accel_path "<Actions>/ShellActions/Go to Network" "") -; (gtk_accel_path "<Actions>/DirViewActions/Mount Volume" "") +; (gtk_accel_path "<Actions>/ShellActions/Caja Manual" "F1") +; (gtk_accel_path "<Actions>/ClipboardActions/Paste" "<Primary>v") ; (gtk_accel_path "<Actions>/DirViewActions/Copy" "<Primary>c") -; (gtk_accel_path "<Actions>/IconViewActions/Sort by Type" "") ; (gtk_accel_path "<Actions>/ShellActions/View" "") ; (gtk_accel_path "<Actions>/DirViewActions/New Empty File" "") -; (gtk_accel_path "<Actions>/ShellActions/About Caja" "") +; (gtk_accel_path "<Actions>/NavigationActions/Tab0" "<Alt>1") ; (gtk_accel_path "<Actions>/DirViewActions/Location Eject Volume" "") ; (gtk_accel_path "<Actions>/IconViewActions/Unstretch" "") ; (gtk_accel_path "<Actions>/ShellActions/Zoom Out" "<Primary>minus") +; (gtk_accel_path "<Actions>/NavigationActions/Show Hide Location Bar" "") ; (gtk_accel_path "<Actions>/DirViewActions/OpenCloseParent" "<Shift><Alt>Down") ; (gtk_accel_path "<Actions>/SpatialActions/Close Parent Folders" "<Primary><Shift>w") ; (gtk_accel_path "<Actions>/DirViewActions/Open" "<Primary>o") ; (gtk_accel_path "<Actions>/DirViewActions/Self Format Volume" "") +; (gtk_accel_path "<Actions>/NavigationActions/Bookmarks" "") ; (gtk_accel_path "<Actions>/DirViewActions/Unmount Volume" "") ; (gtk_accel_path "<Actions>/DirViewActions/Connect To Server Link" "") +; (gtk_accel_path "<Actions>/DirViewActions/Location Mount Volume" "") ; (gtk_accel_path "<Actions>/DirViewActions/Location Unmount Volume" "") ; (gtk_accel_path "<Actions>/DirViewActions/Reset to Defaults" "") -; (gtk_accel_path "<Actions>/DirViewActions/Location Mount Volume" "") +; (gtk_accel_path "<Actions>/DirViewActions/LocationOpenFolderWindow" "") +; (gtk_accel_path "<Actions>/DirViewActions/Paste Files Into" "") ; (gtk_accel_path "<Actions>/DirViewActions/LocationCut" "") ; (gtk_accel_path "<Actions>/ShellActions/Zoom In" "<Primary>plus") -; (gtk_accel_path "<Actions>/DirViewActions/LocationOpenFolderWindow" "") ; (gtk_accel_path "<Actions>/DirViewActions/Self Eject Volume" "") +; (gtk_accel_path "<Actions>/NavigationActions/SplitViewNextPane" "F6") +; (gtk_accel_path "<Actions>/ClipboardActions/Select All" "<Primary>a") ; (gtk_accel_path "<Actions>/IconViewActions/Tighter Layout" "") -; (gtk_accel_path "<Actions>/DirViewActions/Paste Files Into" "") +; (gtk_accel_path "<Actions>/NavigationActions/Edit Bookmarks" "<Primary>b") ; (gtk_accel_path "<Actions>/DirViewActions/LocationCopy" "") +; (gtk_accel_path "<Actions>/ClipboardActions/Copy" "<Primary>c") ; (gtk_accel_path "<Actions>/DirViewActions/OpenAccel" "<Alt>Down") ; (gtk_accel_path "<Actions>/DirViewActions/Open With" "") ; (gtk_accel_path "<Actions>/ShellActions/Edit" "") ; (gtk_accel_path "<Actions>/ShellActions/Up" "<Alt>Up") ; (gtk_accel_path "<Actions>/DirViewActions/Open Scripts Folder" "") +; (gtk_accel_path "<Actions>/ClipboardActions/Cut" "<Primary>x") +; (gtk_accel_path "<Actions>/NavigationActions/Forward" "<Alt>Right") ; (gtk_accel_path "<Actions>/DirViewActions/New Documents" "") +; (gtk_accel_path "<Actions>/NavigationActions/Go to Location" "<Primary>l") ; (gtk_accel_path "<Actions>/ShellActions/Reload" "<Primary>r") ; (gtk_accel_path "<Actions>/DirViewActions/Move to Home" "") ; (gtk_accel_path "<Actions>/ShellActions/Backgrounds and Emblems" "") ; (gtk_accel_path "<Actions>/DirViewActions/No Templates" "") ; (gtk_accel_path "<Actions>/DirViewActions/Location Format Volume" "") ; (gtk_accel_path "<Actions>/ShellActions/ZoomOutAccel" "<Primary>KP_Subtract") +; (gtk_accel_path "<Actions>/NavigationActions/SplitViewSameLocation" "") ; (gtk_accel_path "<Actions>/DirViewActions/LocationPasteFilesInto" "") ; (gtk_accel_path "<Actions>/IconViewActions/Sort by Size" "") ; (gtk_accel_path "<Actions>/DirViewActions/Select All" "<Primary>a") @@ -82,29 +114,34 @@ ; (gtk_accel_path "<Actions>/DesktopViewActions/Change Background" "") ; (gtk_accel_path "<Actions>/IconViewActions/Reversed Order" "") ; (gtk_accel_path "<Actions>/ShellActions/Go to Computer" "") +; (gtk_accel_path "<Actions>/NavigationActions/Go" "") ; (gtk_accel_path "<Actions>/DirViewActions/Restore From Trash" "") ; (gtk_accel_path "<Actions>/DirViewActions/Location Stop Volume" "") ; (gtk_accel_path "<Actions>/DirViewActions/LocationProperties" "") ; (gtk_accel_path "<Actions>/DirViewActions/Rename" "F2") ; (gtk_accel_path "<Actions>/DirViewActions/Redo" "<Primary>y") ; (gtk_accel_path "<Actions>/ShellActions/Go to Templates" "") -; (gtk_accel_path "<Actions>/ShellActions/Show Hidden Files" "<Primary>h") +; (gtk_accel_path "<Actions>/DirViewActions/LocationOpenInNewTab" "") ; (gtk_accel_path "<Actions>/DirViewActions/Self Start Volume" "") ; (gtk_accel_path "<Actions>/DirViewActions/Move to next pane" "") ; (gtk_accel_path "<Actions>/DirViewActions/OpenFolderWindow" "") -; (gtk_accel_path "<Actions>/DirViewActions/LocationOpenInNewTab" "") +; (gtk_accel_path "<Actions>/ShellActions/Show Hidden Files" "<Primary>h") +; (gtk_accel_path "<Actions>/DirViewActions/Stop Volume" "") ; (gtk_accel_path "<Actions>/DirViewActions/Duplicate" "") ; (gtk_accel_path "<Actions>/DirViewActions/Eject Volume" "") -; (gtk_accel_path "<Actions>/DirViewActions/Stop Volume" "") -; (gtk_accel_path "<Actions>/DirViewActions/PropertiesAccel" "<Primary>i") -; (gtk_accel_path "<Actions>/ShellActions/Home" "<Alt>Home") ; (gtk_accel_path "<Actions>/IconViewActions/Clean Up" "") +; (gtk_accel_path "<Actions>/NavigationActions/New Tab" "<Primary>t") +; (gtk_accel_path "<Actions>/ShellActions/Home" "<Alt>Home") +; (gtk_accel_path "<Actions>/NavigationActions/New Window" "<Primary>n") +; (gtk_accel_path "<Actions>/DirViewActions/PropertiesAccel" "<Primary>i") ; (gtk_accel_path "<Actions>/IconViewActions/Sort by Modification Date" "") ; (gtk_accel_path "<Actions>/DirViewActions/Save Search As" "") ; (gtk_accel_path "<Actions>/IconViewActions/Keep Aligned" "") ; (gtk_accel_path "<Actions>/DirViewActions/New Launcher" "") +; (gtk_accel_path "<Actions>/NavigationActions/Search" "") ; (gtk_accel_path "<Actions>/DirViewActions/Properties" "<Alt>Return") ; (gtk_accel_path "<Actions>/SpatialActions/Add Bookmark" "<Primary>d") +; (gtk_accel_path "<Actions>/NavigationActions/TabsMoveLeft" "<Primary><Shift>Page_Up") ; (gtk_accel_path "<Actions>/DirViewActions/Copy to Desktop" "") ; (gtk_accel_path "<Actions>/ShellActions/Stop" "") ; (gtk_accel_path "<Actions>/DirViewActions/New Folder" "<Primary><Shift>n") @@ -121,10 +158,13 @@ ; (gtk_accel_path "<Actions>/DirViewActions/Invert Selection" "<Primary><Shift>i") ; (gtk_accel_path "<Caja-Window>/view_as_1" "<Primary>1") ; (gtk_accel_path "<Actions>/DesktopViewActions/Empty Trash Conditional" "") +; (gtk_accel_path "<Actions>/NavigationActions/Close All Windows" "<Primary>q") ; (gtk_accel_path "<Actions>/IconViewActions/Arrange Items" "") +; (gtk_accel_path "<Actions>/NavigationActions/Show Hide Sidebar" "F9") ; (gtk_accel_path "<Actions>/DirViewActions/Self Stop Volume" "") ; (gtk_accel_path "<Actions>/SpatialActions/Places" "") ; (gtk_accel_path "<Actions>/SpatialActions/Edit Bookmarks" "<Primary>b") +; (gtk_accel_path "<Actions>/NavigationActions/Show Hide Toolbar" "") ; (gtk_accel_path "<Actions>/DirViewActions/Copy to Home" "") ; (gtk_accel_path "<Actions>/DirViewActions/Self Mount Volume" "") ; (gtk_accel_path "<Actions>/SpatialActions/Search" "<Primary>f") diff --git a/configs/mate-openrc/root-image/root/.keymap.sh b/configs/mate-openrc/root-image/root/.keymap.sh index ddd5c62..f844af6 100755 --- a/configs/mate-openrc/root-image/root/.keymap.sh +++ b/configs/mate-openrc/root-image/root/.keymap.sh @@ -2,115 +2,117 @@ list_keymaps() { cat <<EOM -af -al -am -ara -at -au -az -ba -be -bg -bn -br -brai -bt -bw -by -ca -cd -ch -cm -cn -cz -de -dk -dz -ee -epo -es -et -fi -fo -fr -gb -ge -gh -gn -gr -hr -hu -id -ie -il -in -iq -ir -is -it -jp -ke -kg -kh -kr -kz -la -latam -lk -lt -lv -ma -mao -md -me -mk -ml -mm -mn -mt -mv -my -nec_vndr/jp -ng -nl -no -np -ph -pk -pl -pt -ro -rs -ru -se -si -sk -sn -sy -tg -th -tj -tm -tr -tw -tz -ua -us -uz -vn -za +af Afrikaans +al Albanian +am Amharic +ara Arabic +at at +au au +az Azerbaijani +ba Bashkir +be Belarusian +bg Bulgarian +bn Bihari-languages +br Breton +brai brai +bt bt +bw bw +by by +ca Catalan +cd cd +ch Chamorro +cm cm +cn cn +cz Czech +de German +dk dk +dz Dzongkha +ee Ewe +epo Esperanto +es Spanish +et Estonian +fi Finnish +fo Faroese +fr French +gb gb +ge ge +gh gh +gn GuaranĂ +gr gr +hr Croatian +hu Hungarian +id Indonesian +ie Interlingue +il il +in in +iq iq +ir ir +is Icelandic +it Italian +jp Japanese +ke ke +kg Kongo +kh kh +kr Kanuri +kz kz +la Latin +latam Latin-American +lk lk +lt Lithuanian +lv Latvian +ma ma +mao Maori +md md +me me +mk Macedonian +ml Malayalam +mm mm +mn Mongolian +mt Maltese +mv mv +my Burmese +nec_vndr/jp nec_vndr/jp +ng Ndonga +nl Dutch +no Norwegian +np np +ph ph +pk pk +pl Polish +pt Portuguese +ro Romanian +rs rs +ru Russian +se Northern-Sami +si Sinhala +sk Slovak +sn Shona +sy sy +tg Tajik +th Thai +tj tj +tm tm +tr Turkish +tw Twi +tz tz +ua ua +us English +uz Uzbek +vn vn +za Zhuang EOM } #Comprobe if X11 keymap was selected code=$(cat .codecheck | grep XKBMAP= | cut -d '=' -f 2) -if [ $code = "us" ]; then - keymap=$(zenity --list --title="Select your keymap" --column="Keymap" $(list_keymaps)) +if [[ $code = "us" ]]; then + keymap=$(zenity --list --title="Select your keymap" --column="Code Name" --column="Keymap" --hide-column=1 $(list_keymaps)) setxkbmap $keymap #Save XKBMAP in .codecheck to use in other time. For example if you install X11 with scripts sed -i '/XKBMAP=./d' ~/.codecheck echo "XKBMAP=$keymap" >> ~/.codecheck +elif [[ $code != "" ]]; then + setxkbmap $code fi diff --git a/configs/mate-openrc/root-image/root/.language.sh b/configs/mate-openrc/root-image/root/.language.sh index d12cb61..782d198 100755 --- a/configs/mate-openrc/root-image/root/.language.sh +++ b/configs/mate-openrc/root-image/root/.language.sh @@ -5,11 +5,15 @@ finish=0 #If change locale the system need restart session to see the changes #Comprobe if language was selected code=$(cat ~/.codecheck | grep LANG= | tail --bytes 2) if [ $code = "0" ]; then - lang=$(zenity --list --title="Select your locale" --column="Locale" --column="Language" \ - "en_US.UTF-8" "English" \ - "gl_ES.UTF-8" "Galego" \ - "es_ES.UTF-8" "Spanish" \ - "pt_BR.UTF-8" "Brazilian Portuguese") + lang=$(dialog --stdout --backtitle "System language selection" --menu "Choose your language:" 15 40 10 \ + "en_US.UTF-8" "English" \ + "gl_ES.UTF-8" "Galego" \ + "es_ES.UTF-8" "Spanish" \ + "pt_BR.UTF-8" "Brazilian Portuguese" \ + "pl_PL.UTF-8" "Polish" \ + "it_IT.UTF-8" "Italian" \ + "fr_FR.UTF-8" "French" \ + "eo" "Esperanto") #Copy locale in locale.conf echo "LANG=$lang" > /etc/locale.conf @@ -17,19 +21,10 @@ if [ $code = "0" ]; then #Put a new line confirm that language was selected sed -i '/LANG=./d' ~/.codecheck echo "LANG=1" >> ~/.codecheck - + #Copy icewm menu in that language and scripts to install cp -a ~/.icewm/menuLanguages/menu_${lang/_*/} ~/.icewm/menu cp -a ~/.scriptsInstallation/language/${lang/_*/}/* ~/.scriptsInstallation/ finish=1 fi - -# Save keymap as "us" so it starts next login -sed -i '/XKBMAP=./d' ~/.codecheck -echo "XKBMAP=us" >> ~/.codecheck - -if [ $finish -eq 1 ]; then - #Restart session - pkill -KILL -u root -fi diff --git a/configs/mate-openrc/root-image/root/.zlogin b/configs/mate-openrc/root-image/root/.zlogin index 7cdfca9..b24dba9 100644 --- a/configs/mate-openrc/root-image/root/.zlogin +++ b/configs/mate-openrc/root-image/root/.zlogin @@ -1,2 +1,4 @@ ~/.automated_script.sh +~/.language.sh +export $(cat /etc/locale.conf) startx diff --git a/configs/mate-openrc/root-image/root/Desktop/Parabola Installation CLI.desktop b/configs/mate-openrc/root-image/root/Desktop/Parabola Installation CLI.desktop index 9a2d871..9a2d871 100644..100755 --- a/configs/mate-openrc/root-image/root/Desktop/Parabola Installation CLI.desktop +++ b/configs/mate-openrc/root-image/root/Desktop/Parabola Installation CLI.desktop diff --git a/configs/mate-openrc/root-image/root/customize_root_image.sh b/configs/mate-openrc/root-image/root/customize_root_image.sh index 88b43b3..24318a5 100755 --- a/configs/mate-openrc/root-image/root/customize_root_image.sh +++ b/configs/mate-openrc/root-image/root/customize_root_image.sh @@ -2,10 +2,18 @@ set -e -u +check_dbus() { + cat /etc/$1|grep dbus +} + sed -i 's/#\(en_US\.UTF-8\)/\1/' /etc/locale.gen sed -i 's/#\(es_ES\.UTF-8\)/\1/' /etc/locale.gen sed -i 's/#\(gl_ES\.UTF-8\)/\1/' /etc/locale.gen sed -i 's/#\(pt_BR\.UTF-8\)/\1/' /etc/locale.gen +sed -i 's/#\(pl_PL\.UTF-8\)/\1/' /etc/locale.gen +sed -i 's/#\(it_IT\.UTF-8\)/\1/' /etc/locale.gen +sed -i 's/#\(fr_FR\.UTF-8\)/\1/' /etc/locale.gen +sed -i 's/#\(eo\)/\1/' /etc/locale.gen locale-gen ln -sf /usr/share/zoneinfo/UTC /etc/localtime @@ -15,14 +23,26 @@ cp -aT /etc/skel/ /root/ useradd -m -p "" -g users -G "adm,audio,floppy,log,network,rfkill,scanner,storage,optical,power,wheel,disk,sys" -s /usr/bin/zsh parabola +# Create the dbus user if it doesn't exist +if [[ $(check_dbus group) = "" ]]; then + echo "Creating dbus group" + groupadd -g 81 dbus +fi +if [[ $(check_dbus passwd) = "" ]]; then + echo "Creating dbus user" + useradd -r -s /sbin/nologin -g 81 -u 81 dbus +fi + chmod 750 /etc/sudoers.d chmod 440 /etc/sudoers.d/g_wheel sed -i "s/#Server/Server/g" /etc/pacman.d/mirrorlist rc-update add NetworkManager default -rc-update add consolekit default +rc-update add elogind default rc-update add alsasound default rc-update add dbus default +rc-update add haveged default +rc-update add pacman-init default sed -i "s/_DATE_/${iso_version}/" /etc/motd |