new pacman.conf new arcolinux-mirrolist

arcolinux · Oct 4, 2018 · de86874 · de86874
1 parent bafa283
commit de86874
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 20 deletions.
diff --git a/archiso/airootfs/etc/lsb-release b/archiso/airootfs/etc/lsb-release
@@ -1,5 +1,5 @@
 LSB_VERSION=1.4
 DISTRIB_ID=ArcoLinux
-DISTRIB_RELEASE=v18.10.2
+DISTRIB_RELEASE=v18.10.3
 DISTRIB_CODENAME=ArcoLinux
 DISTRIB_DESCRIPTION="ArcoLinux"
diff --git a/archiso/airootfs/etc/os-release b/archiso/airootfs/etc/os-release
@@ -1,7 +1,7 @@
 NAME="ArcoLinux"
 ID=ArcoLinux
 ID_LIKE="arch"
-VERSION_ID=v18.10.2
+VERSION_ID=v18.10.3
 ANSI_COLOR="0;36"
 HOME_URL="https://arcolinux.info"
 SUPPORT_URL="http://arcolinuxforum.com"
diff --git a/archiso/airootfs/etc/samba/smb.conf b/archiso/airootfs/etc/samba/smb.conf
@@ -24,6 +24,7 @@
 
 # workgroup = NT-Domain-Name or Workgroup-Name, eg: MIDEARTH
    workgroup = WORKGROUP
+   #client max protocol = NT1
 
 # server string is the equivalent of the NT Description field
    server string = Samba Server

diff --git a/archiso/airootfs/etc/skel/.bashrc b/archiso/airootfs/etc/skel/.bashrc
@@ -71,6 +71,12 @@ alias fc='sudo fc-cache -fv'
 #copy/paste all content of /etc/skel over to home folder - Beware
 alias skel='cp -rf /etc/skel/* ~'
 
+#quickly kill conkies
+alias kc='killall conky'
+
+#hardware info --short
+alias hw="hwinfo --short"
+
 #get fastest mirrors in your neighborhood 
 alias mirror="sudo reflector --protocol https --latest 50 --number 20 --sort rate --save /etc/pacman.d/mirrorlist"
 alias mirrors=mirror

diff --git a/archiso/airootfs/root/customize_airootfs.sh b/archiso/airootfs/root/customize_airootfs.sh
@@ -75,12 +75,6 @@ function enableServicesFunc() {
 }
 
 
-#function fontFix() {
-    # To disable scaling of bitmap fonts (which often makes them blurry)
-	# https://wiki.archlinux.org/index.php/font_configuration
-#    rm -rf /etc/fonts/conf.d/10-scale-bitmap-fonts.conf
-#}
-
 function fixWifiFunc() {
     #https://wiki.archlinux.org/index.php/NetworkManager#Configuring_MAC_Address_Randomization
     su -c 'echo "" >> /etc/NetworkManager/NetworkManager.conf'
@@ -102,7 +96,7 @@ function initkeysFunc() {
     #pacman-key --keyserver hkps://hkps.pool.sks-keyservers.net:443 -r 74F5DE85A506BF64
     #pacman-key --keyserver hkp://pool.sks-keyservers.net:80 -r 74F5DE85A506BF64
     pacman-key --lsign-key 74F5DE85A506BF64
-	#sudo pacman-key --refresh-keys
+	  #sudo pacman-key --refresh-keys
 }
 
 function getNewMirrorCleanAndUpgrade() {
@@ -127,8 +121,6 @@ setDefaultsFunc
 echo "#####   Function setDefaultsFunc done    #####"
 enableServicesFunc
 echo "#####   Function enableServicesFunc done    #####"
-#fontFix
-#echo "#####   Function fontFix done    #####"
 fixWifiFunc
 echo "#####   Function fixWifiFunc done    #####"
 fixHibernateFunc

diff --git a/archiso/build.sh b/archiso/build.sh
@@ -3,10 +3,10 @@
 set -e -u
 
 iso_name=arcolinux
-iso_label="arcolinux-v18.10.2-x86_64"
+iso_label="arcolinux-v18.10.3-x86_64"
 iso_publisher="ArcoLinux <http://www.arcolinux.info>"
 iso_application="ArcoLinux Live/Rescue CD"
-iso_version="v18.10.2"
+iso_version="v18.10.3"
 install_dir=arch
 work_dir=work
 out_dir=out

diff --git a/archiso/packages.x86_64 b/archiso/packages.x86_64
@@ -498,6 +498,7 @@ arcolinux-lightdm-gtk-greeter
 arcolinux-lightdm-gtk-greeter-settings
 arcolinux-local-git
 arcolinux-neofetch-git
+arcolinux-mirrorlist-git
 arcolinux-nitrogen-git
 arcolinux-oblogout
 #arcolinux-oblogout-awesome

diff --git a/archiso/pacman.conf b/archiso/pacman.conf
@@ -102,16 +102,20 @@ Include = /etc/pacman.d/mirrorlist
 
 #[arcolinux_repo_testing]
 #SigLevel = Required DatabaseOptional
-#Server = https://arcolinux.github.io/arcolinux_repo_testing/$arch
+#Include = /etc/pacman.d/arcolinux-mirrorlist
 
 [arcolinux_repo]
 SigLevel = Required DatabaseOptional
-Server = https://arcolinux.github.io/arcolinux_repo/$arch
+Include = /etc/pacman.d/arcolinux-mirrorlist
 
 [arcolinux_repo_3party]
 SigLevel = Required DatabaseOptional
-Server = https://arcolinux.github.io/arcolinux_repo_3party/$arch
+Include = /etc/pacman.d/arcolinux-mirrorlist
+
+[arcolinux_repo_submicron]
+SigLevel = Required DatabaseOptional
+Include = /etc/pacman.d/arcolinux-mirrorlist
 
 [arcolinux_repo_iso]
 SigLevel = Required DatabaseOptional
-Server = https://arcolinux.github.io/arcolinux_repo_iso/$arch
+Include = /etc/pacman.d/arcolinux-mirrorlist
diff --git a/archiso/pacman.conf.work_dir b/archiso/pacman.conf.work_dir
@@ -102,12 +102,16 @@ Include = /etc/pacman.d/mirrorlist
 
 #[arcolinux_repo_testing]
 #SigLevel = Required DatabaseOptional
-#Server = https://arcolinux.github.io/arcolinux_repo_testing/$arch
+#Include = /etc/pacman.d/arcolinux-mirrorlist
 
 [arcolinux_repo]
 SigLevel = Required DatabaseOptional
-Server = https://arcolinux.github.io/arcolinux_repo/$arch
+Include = /etc/pacman.d/arcolinux-mirrorlist
 
 [arcolinux_repo_3party]
 SigLevel = Required DatabaseOptional
-Server = https://arcolinux.github.io/arcolinux_repo_3party/$arch
+Include = /etc/pacman.d/arcolinux-mirrorlist
+
+[arcolinux_repo_submicron]
+SigLevel = Required DatabaseOptional
+Include = /etc/pacman.d/arcolinux-mirrorlist