Skip to content

Commit

Permalink
Merge pull request #2 from Fourdee/testing
Browse files Browse the repository at this point in the history
Synch Testing
  • Loading branch information
userdeveloper98 authored Jul 4, 2018
2 parents 6bca14c + cd63367 commit ace3183
Show file tree
Hide file tree
Showing 18 changed files with 255 additions and 185 deletions.
28 changes: 22 additions & 6 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,19 @@

v6.11
(xx/07/18)

Changes / Improvements / Optimizations:
DietPi-Software | Gogs: Installation optimizations, no gen homefolder as not required. For new installations only. Many thanks to @userdeveloper98 for this contribution.: https://github.com/Fourdee/DietPi/pull/1890

Bug Fixes:

AlloGUI v10:
- Updates: To ensure stability and control of updates, they must now be completed outside the web interface, using either local or remote (SSH) terminal: https://dietpi.com/phpbb/viewtopic.php?f=8&t=2317&p=9218#p9218

-----------------------------------------------------------------------------------------------------------

v6.10
(01/07/18)
(03/07/18)

Changes / Improvements / Optimizations:
General | ASUS TB: GLES GPU and VPU support now enabled, once Xserver is installed.
Expand All @@ -14,11 +27,13 @@ DietPi-Backup | Rewritten. Userdata option removed, included by default backup.
DietPi-Config | Soundcards (RPi): Allo Katana, now available for selection. https://github.com/Fourdee/DietPi/issues/1849
DietPi-Config | IntelGPU Driver: Installation code added: https://github.com/Fourdee/DietPi/issues/1855#issue-333150262
DietPi-Config | Networking: You can now view the sent and recieved totals for both network devices. NB: 32bit devices will reset the values after 32bit int limit is reached (roughly 4.3GB~), this is a kernel/arch limitation: https://github.com/Fourdee/DietPi/issues/1666#issuecomment-401546728
DietPi-Drive_Manager | Now supports ROM devices (eg: DVD). NB: compatibility for DVD/CD devices relies on kernel support. Not all devices will support DVD/CD devices, and/or their filesystem format: https://github.com/Fourdee/DietPi/issues/1858
DietPi-Drive_Manager | Resize ext4 options added: https://github.com/Fourdee/DietPi/issues/1821
DietPi-Drive_Manager | You can now benchmark read/write for all available mounted drives: https://github.com/Fourdee/DietPi/issues/1858
DietPi-Drive_Manager | Now supports mounting, viewing, removal of network drives on system (nfs4, cifs). This replaces the previous options in 'dietpi-config': https://github.com/Fourdee/DietPi/issues/1858
DietPi-Drive_Manager | Moving of DietPi user data to filesystems that do not support permission (FAT), is no longer supported and disabled: https://github.com/Fourdee/DietPi/issues/1846
DietPi-Drive_Manager | Rewrite and improvements:
- Now supports ROM devices (eg: DVD). NB: compatibility for DVD/CD devices relies on kernel support. Not all devices will support DVD/CD devices, and/or their filesystem format: https://github.com/Fourdee/DietPi/issues/1858
- Resize ext4 options added: https://github.com/Fourdee/DietPi/issues/1821
- Support for detecting and formatting non-partitioned drives
- You can now benchmark read/write for all available mounted drives: https://github.com/Fourdee/DietPi/issues/1858
- Now supports mounting, viewing, removal of network drives on system (nfs4, cifs). This replaces the previous options in 'dietpi-config': https://github.com/Fourdee/DietPi/issues/1858
- Moving of DietPi user data to filesystems that do not support permission (FAT), is no longer supported and disabled: https://github.com/Fourdee/DietPi/issues/1846
DietPi-Globals | G_BACKUP: Added to globals. This will be gradually rolled out in DietPi scripts, allowing the user to create a system backup, prior to significant system changes: https://github.com/Fourdee/DietPi/issues/1871#issuecomment-400443401
DietPi-Globals | G_CHECK_USERDATA: Added to DietPi scripts: https://github.com/Fourdee/DietPi/issues/1850#issuecomment-401407996
DietPi-Services | Rsync: Added to service control. This will prevent errors if rsync is running in daemon mode, when 'dietpi-backup' is run: https://github.com/Fourdee/DietPi/issues/1869#issuecomment-399890771
Expand All @@ -28,6 +43,7 @@ DietPi-Software | Mosquitto: Now uses Debian APT installation: https://github.co
DietPi-Software | Gogs: Now runs under its own user. For new installations only: https://github.com/Fourdee/DietPi/issues/1877
DietPi-Software | Xserver: 'mesa-utils-extra' now also installed by default, useful for GLES testing 'es2_info es2gears' etc.
DietPi-Software | Moode: Removed from our software lineup: https://github.com/Fourdee/DietPi/issues/1223#issuecomment-401549371
DietPi-Software | Radarr, Sonarr and Jackett: Services optimized and no longer run in debugging mode. Should improve runtime performance. Many thanks to @userdeveloper98 for this contribution! https://github.com/Fourdee/DietPi/pull/1889
DietPi-Survey | Simplified available options. You can now either Opt In, or, Opt Out and automatically have any existing data cleared. Interactive installations will be prompted to Opt In or Out during 1st run. Automated installations are Opted In by default, you can change this once setup is completed. More information on DietPi-Survey and how to change the options: https://dietpi.com/phpbb/viewtopic.php?f=8&t=20 https://github.com/Fourdee/DietPi/issues/1827#issuecomment-396005575
PREP | 'os-prober' installed by default for x86_64 devices. Ensures dual boot OSs are detected by grub. Also added a 3 second timeout to grub boot prompt, allowing OS selection: https://github.com/Fourdee/DietPi/issues/1855

Expand Down
2 changes: 1 addition & 1 deletion dietpi/.version
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
6
10
11
6 changes: 3 additions & 3 deletions dietpi/dietpi-bugreport
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@
# Bug report removal via empty file upload
if (( $UPLOAD_FILESIZE == 0 )); then

G_DIETPI-NOTIFY 0 "Bug report successfully purged"
G_DIETPI-NOTIFY 0 'Bug report successfully purged'

else

Expand Down Expand Up @@ -229,11 +229,11 @@ Would you like to send a bug report archive or remove an already uploaded one?"

G_WHIP_SCROLLBOX "The upload will contain the following command outputs:
$(printf "%s\n\t- " "${aCOMMAND_LIST[@]}")
$(printf "\t- %s\n" "${aCOMMAND_LIST[@]}")
It will contain as well the following file locations:
$(printf "%s\n\t- " "${aFILE_LIST[@]}")"
$(printf "\t- %s\n" "${aFILE_LIST[@]}")"

fi

Expand Down
58 changes: 28 additions & 30 deletions dietpi/dietpi-cpuinfo
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#Exit path for VM
if (( $G_HW_MODEL == 20 )); then

echo -e "\nNotice: CPU information is not available for VM.\n"
echo -e '\nNotice: CPU information is not available for VM.\n'
exit

fi
Expand All @@ -53,29 +53,29 @@
for ((i=0; i<$(nproc --all); i++))
do

if [ -f /sys/devices/system/cpu/cpu$i/cpufreq/scaling_cur_freq ]; then
if [[ -f /sys/devices/system/cpu/cpu$i/cpufreq/scaling_cur_freq ]]; then

aCPU_CURRENT_FREQ[$i]=$(cat /sys/devices/system/cpu/cpu$i/cpufreq/scaling_cur_freq)
aCPU_CURRENT_FREQ[$i]=$(</sys/devices/system/cpu/cpu$i/cpufreq/scaling_cur_freq)

fi

if [ -f /sys/devices/system/cpu/cpu$i/cpufreq/scaling_min_freq ]; then
if [[ -f /sys/devices/system/cpu/cpu$i/cpufreq/scaling_min_freq ]]; then

aCPU_MIN_FREQ[$i]=$(cat /sys/devices/system/cpu/cpu$i/cpufreq/scaling_min_freq)
aCPU_MIN_FREQ[$i]=$(</sys/devices/system/cpu/cpu$i/cpufreq/scaling_min_freq)

fi

if [ -f /sys/devices/system/cpu/cpu$i/cpufreq/scaling_max_freq ]; then
if [[ -f /sys/devices/system/cpu/cpu$i/cpufreq/scaling_max_freq ]]; then

aCPU_MAX_FREQ[$i]=$(cat /sys/devices/system/cpu/cpu$i/cpufreq/scaling_max_freq)
aCPU_MAX_FREQ[$i]=$(</sys/devices/system/cpu/cpu$i/cpufreq/scaling_max_freq)

fi

done

#Obtain available scaling freqs:
# - Standard
if [ -f /sys/devices/system/cpu/cpu0/cpufreq/scaling_available_frequencies ]; then
if [[ -f /sys/devices/system/cpu/cpu0/cpufreq/scaling_available_frequencies ]]; then

for ((i=0; i<$(nproc --all); i++))
do
Expand All @@ -85,7 +85,7 @@
done

# - XU4 3.x
elif [ -f /sys/devices/system/cpu/cpufreq/mp-cpufreq/cpu_freq_table ]; then
elif [[ -f /sys/devices/system/cpu/cpufreq/mp-cpufreq/cpu_freq_table ]]; then

aCPU_SCALINGAVAILABLE_FREQ[0]=$(cat /sys/devices/system/cpu/cpufreq/mp-cpufreq/cpu_freq_table | tr ' ' '\n' | sed -e 's/[^0-9]//g' | sed '/^$/d')

Expand All @@ -111,80 +111,78 @@
cpu_temp_current_f=$(( ( $CPU_TEMP_CURRENT * 9 / 5 ) + 32 ))
if (( $CPU_TEMP_CURRENT >= 70 )); then

CPU_TEMP_PRINT="\e[91mWarning: $CPU_TEMP_CURRENT'c : $cpu_temp_current_f'f | Reducing the life of your device.\e[0m"
CPU_TEMP_PRINT="\e[1;31mWarning: $CPU_TEMP_CURRENT'c : $cpu_temp_current_f'f | Reducing the life of your device.\e[0m"

elif (( $CPU_TEMP_CURRENT >= 60 )); then

CPU_TEMP_PRINT="\e[38;5;202m$CPU_TEMP_CURRENT'c : $cpu_temp_current_f'f\e[90m | Running hot, not recommended.\e[0m"
CPU_TEMP_PRINT="\e[38;5;202m$CPU_TEMP_CURRENT'c : $cpu_temp_current_f'f\e[1;30m | Running hot, not recommended.\e[0m"

elif (( $CPU_TEMP_CURRENT >= 50 )); then

CPU_TEMP_PRINT="\e[93m$CPU_TEMP_CURRENT'c : $cpu_temp_current_f'f\e[0m \e[90m | Running warm, but safe.\e[0m"
CPU_TEMP_PRINT="\e[1;33m$CPU_TEMP_CURRENT'c : $cpu_temp_current_f'f\e[0m \e[1;30m | Running warm, but safe.\e[0m"

elif (( $CPU_TEMP_CURRENT >= 40 )); then

CPU_TEMP_PRINT="\e[92m$CPU_TEMP_CURRENT'c : $cpu_temp_current_f'f\e[0m\e[90m | Optimal temperature.\e[0m"
CPU_TEMP_PRINT="\e[1;32m$CPU_TEMP_CURRENT'c : $cpu_temp_current_f'f\e[0m\e[1;30m | Optimal temperature.\e[0m"

elif (( $CPU_TEMP_CURRENT >= 30 )); then

CPU_TEMP_PRINT="\e[96m$CPU_TEMP_CURRENT'c : $cpu_temp_current_f'f\e[0m\e[90m | Cool runnings.\e[0m"
CPU_TEMP_PRINT="\e[1;36m$CPU_TEMP_CURRENT'c : $cpu_temp_current_f'f\e[0m\e[1;30m | Cool runnings.\e[0m"

else

CPU_TEMP_PRINT="\e[96m$CPU_TEMP_CURRENT'c : $cpu_temp_current_f'f \e[0m \e[90m| Who put me in the freezer!\e[0m"
CPU_TEMP_PRINT="\e[1;36m$CPU_TEMP_CURRENT'c : $cpu_temp_current_f'f \e[0m \e[1;30m| Who put me in the freezer!\e[0m"

fi

else

CPU_TEMP_PRINT="\e[91mKERNELERR: $CPU_TEMP_CURRENT'c\e[0m"
CPU_TEMP_PRINT="\e[1;31mKERNELERR: $CPU_TEMP_CURRENT'c\e[0m"

fi

}

Obtain_Cpu_Gov(){

if [ -f /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor ]; then
if [[ -f /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor ]]; then

CPU_GOV_CURRENT=$(cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor)
CPU_GOV_CURRENT=$(</sys/devices/system/cpu/cpu0/cpufreq/scaling_governor)

fi

}

Print_Stats(){

echo -e ""
echo -e " \e[38;5;154m─────────────────────────────────────────────────────\e[0m\n \e[1mDietPi CPU Info\e[0m\n\e[90m Use dietpi-config to change CPU / performance options\e[0m\n \e[38;5;154m─────────────────────────────────────────────────────\e[0m"
echo -e "\n \e[38;5;154m─────────────────────────────────────────────────────\e[0m\n \e[1mDietPi CPU Info\n\e[30m Use dietpi-config to change CPU / performance options\e[0m\n \e[38;5;154m─────────────────────────────────────────────────────\e[0m"

#Processor Type
echo -e " Architecture \e[90m|\e[0m $(uname -m)"
echo -e " Architecture \e[1;30m|\e[0m $(uname -m)"

#Current Temp
echo -e " Temp \e[90m|\e[0m $CPU_TEMP_PRINT"
echo -e " Temp \e[1;30m|\e[0m $CPU_TEMP_PRINT"

#Current Gov
echo -e " Governor \e[90m|\e[0m $CPU_GOV_CURRENT"
echo -e " Governor \e[1;30m|\e[0m $CPU_GOV_CURRENT"

if [ "$CPU_GOV_CURRENT" = "ondemand" ] ||
[ "$CPU_GOV_CURRENT" = "conservative" ]; then
if [[ $CPU_GOV_CURRENT == ondemand ]] ||
[[ $CPU_GOV_CURRENT == conservative ]]; then

echo -e " Throttle up \e[90m|\e[0m $(grep -m1 '^CONFIG_CPU_USAGE_THROTTLE_UP=' /DietPi/dietpi.txt | sed 's/.*=//')% CPU usage"
echo -e " Throttle up \e[1;30m|\e[0m $(grep -m1 '^CONFIG_CPU_USAGE_THROTTLE_UP=' /DietPi/dietpi.txt | sed 's/.*=//')% CPU usage"

fi

#Current Frequency
echo -e ""
echo -e " \e[90m Current Freq Min Freq Max Freq\e[0m"
echo -e '\n \e[1;30m Current Freq Min Freq Max Freq\e[0m'
for ((i=0; i<${#aCPU_CURRENT_FREQ[@]}; i++))
do

echo -e " \e[90mCPU$i\e[0m \e[90m|\e[0m $(( ${aCPU_CURRENT_FREQ[$i]} / 1000 )) MHz \e[90m$(( ${aCPU_MIN_FREQ[$i]} / 1000 )) MHz $(( ${aCPU_MAX_FREQ[$i]} / 1000 )) MHz\e[0m"
echo -e " \e[1;30mCPU$i |\e[0m $(( ${aCPU_CURRENT_FREQ[$i]} / 1000 )) MHz \e[1;30m$(( ${aCPU_MIN_FREQ[$i]} / 1000 )) MHz $(( ${aCPU_MAX_FREQ[$i]} / 1000 )) MHz\e[0m"

done

echo -e ""
echo ''

#CPU scaling may bump up with script
G_DIETPI-NOTIFY 2 'CPU current frequency, may be affected by this script, due to the processing required to run it.\n'
Expand Down
Loading

0 comments on commit ace3183

Please sign in to comment.