Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Beta v6.31.0 #3621

Merged
merged 151 commits into from
Jun 28, 2020
Merged
Changes from 1 commit
Commits
Show all changes
151 commits
Select commit Hold shift + click to select a range
5e8a44f
META | DietPi-Survey_report: Add v6.30 and v6.31 support
MichaIng May 10, 2020
5bf266e
v6.31
MichaIng May 10, 2020
57ef2a9
v6.31
MichaIng May 10, 2020
7fb8b09
v6.31
MichaIng May 11, 2020
e5fc3bb
v6.31
MichaIng May 11, 2020
9633e71
v6.31
MichaIng May 11, 2020
d3231a2
v6.31
MichaIng May 11, 2020
66039a2
v6.31
MichaIng May 11, 2020
16ec16e
v6.31
MichaIng May 11, 2020
20a9d33
v6.31
MichaIng May 11, 2020
b793f20
v6.31
MichaIng May 11, 2020
6ad6f8a
v6.31
MichaIng May 11, 2020
e5db997
v6.31
MichaIng May 11, 2020
3ce5678
v6.31
MichaIng May 11, 2020
b1f44ac
v6.31
MichaIng May 11, 2020
957a933
v6.31
MichaIng May 11, 2020
a2bfe60
v6.31
MichaIng May 11, 2020
3640909
v6.31
MichaIng May 11, 2020
848784d
v6.31
MichaIng May 11, 2020
1d541ee
v6.31
MichaIng May 11, 2020
338e689
v6.31
MichaIng May 11, 2020
c202885
v6.31
MichaIng May 11, 2020
2eefa96
v6.31
MichaIng May 11, 2020
dc062f0
v6.31
MichaIng May 11, 2020
ea0e202
META | Add CodeFactor to DietPi source section and bash to 3rd party …
MichaIng May 11, 2020
e8a5148
v6.31
MichaIng May 11, 2020
51089c8
v6.31
MichaIng May 11, 2020
d02d7e4
v6.31
MichaIng May 12, 2020
89ae778
v6.31 (#3471)
CedArctic May 13, 2020
8aa7af2
v6.31 (#3531)
MichaIng May 13, 2020
16a1e9f
v6.31
MichaIng May 14, 2020
30db40a
v6.31
MichaIng May 14, 2020
d89c43c
v6.31
MichaIng May 14, 2020
795ac9c
v6.31
MichaIng May 14, 2020
f6f34c0
v6.31
MichaIng May 14, 2020
96b11b0
v6.31 (#3536)
MichaIng May 14, 2020
27ab738
v6.31
MichaIng May 15, 2020
25a2978
v6.31
MichaIng May 15, 2020
0dce3dd
v6.31
MichaIng May 15, 2020
d54eaee
v6.31
MichaIng May 15, 2020
f0f4983
v6.31
MichaIng May 15, 2020
ba45d24
v6.31
MichaIng May 15, 2020
aa033a5
v6.31
MichaIng May 17, 2020
16324ca
v6.31
MichaIng May 17, 2020
510de23
v6.31
MichaIng May 17, 2020
6aa59bb
v6.31
MichaIng May 17, 2020
1c2437f
v6.31
MichaIng May 17, 2020
5996c9d
v6.31 (#3545)
MichaIng May 17, 2020
bff5112
v6.31
MichaIng May 18, 2020
0b4a4d4
v6.31
MichaIng May 18, 2020
95497ce
v6.31
MichaIng May 18, 2020
edcce06
v6.31
MichaIng May 18, 2020
10eabd9
v6.31
MichaIng May 18, 2020
c39e0e0
v6.31
MichaIng May 18, 2020
e9ae410
v6.31
MichaIng May 18, 2020
6d6e3d3
v6.31 (#3546)
MichaIng May 19, 2020
99caec8
v6.31
MichaIng May 20, 2020
b0c23fb
v6.31
MichaIng May 20, 2020
5e8144b
v6.31
MichaIng May 21, 2020
6cd00ba
v6.31
MichaIng May 21, 2020
4ee75d8
v6.31
MichaIng May 24, 2020
16d105e
v6.31
MichaIng May 25, 2020
7a4350f
v6.31
MichaIng May 25, 2020
274434d
v6.31 (#3565)
MichaIng May 26, 2020
6106bd9
v6.31
MichaIng May 27, 2020
525d168
v6.31
MichaIng May 27, 2020
b2be77c
v6.31
MichaIng May 28, 2020
8c07e28
v6.31
MichaIng May 28, 2020
2c95ce9
v6.31
MichaIng May 31, 2020
ae27afc
v6.31
MichaIng May 31, 2020
44d1e5b
v6.31
MichaIng May 31, 2020
e3297f8
v6.31
MichaIng May 31, 2020
b7998cf
v6.31
MichaIng May 31, 2020
6b07d8c
v6.31
MichaIng May 31, 2020
d51514a
v6.31
MichaIng May 31, 2020
caec92e
v6.31
MichaIng May 31, 2020
e6c504d
v6.31
MichaIng May 31, 2020
e16e82d
v6.31
MichaIng May 31, 2020
02896ef
v6.31
MichaIng Jun 1, 2020
d9daf32
v6.31
MichaIng Jun 3, 2020
7c4284b
v6.31
MichaIng Jun 3, 2020
98a43e5
v6.31
MichaIng Jun 3, 2020
2b8ab91
v6.31
MichaIng Jun 3, 2020
46fca0a
v6,31
MichaIng Jun 3, 2020
5f348ce
v6.31
MichaIng Jun 4, 2020
0f556d3
v6.31
MichaIng Jun 4, 2020
b6b15d5
v6.31
MichaIng Jun 5, 2020
92b24a0
v6.31
MichaIng Jun 5, 2020
689e152
v6.31
MichaIng Jun 7, 2020
35fadc4
v6.31
MichaIng Jun 8, 2020
998c564
v6.31
MichaIng Jun 8, 2020
6a0d80e
v6.31
MichaIng Jun 8, 2020
fe170d5
v6.31
MichaIng Jun 8, 2020
f68580a
v6.31
MichaIng Jun 8, 2020
e962936
v6.31
MichaIng Jun 9, 2020
a9d2ea3
v6.31
MichaIng Jun 14, 2020
4efb301
v6.31
MichaIng Jun 14, 2020
40ad8d3
v6.31
MichaIng Jun 14, 2020
4224ad6
v6.31
MichaIng Jun 14, 2020
7b3633e
v6.31
MichaIng Jun 14, 2020
d56c027
v6.31
MichaIng Jun 14, 2020
8c33bba
v6.31
MichaIng Jun 14, 2020
aeb8b5e
v6.31
MichaIng Jun 14, 2020
be14aff
v6.31
MichaIng Jun 16, 2020
60d5296
v6.31
MichaIng Jun 16, 2020
81753f4
v6.31
MichaIng Jun 16, 2020
926cdf0
v6.31
MichaIng Jun 16, 2020
3969369
v6.31
MichaIng Jun 16, 2020
a8626ad
v6.31
MichaIng Jun 16, 2020
590ee87
v6.31
MichaIng Jun 16, 2020
8cc5ae3
v6.31
MichaIng Jun 16, 2020
b64e9d6
v6.31
MichaIng Jun 17, 2020
21e93ba
v6.31
MichaIng Jun 17, 2020
8ab237f
v6.31
MichaIng Jun 17, 2020
8c0279c
v6.31 (#3605)
MichaIng Jun 17, 2020
13f88e7
v6.31
MichaIng Jun 18, 2020
95b8e7e
v6.31
MichaIng Jun 19, 2020
3b7712d
v6.31
MichaIng Jun 19, 2020
f22831b
v6.31
MichaIng Jun 20, 2020
b105a4e
v6.31
MichaIng Jun 20, 2020
a1367a0
v6.31
MichaIng Jun 20, 2020
824917b
v6.31 (#3617)
MichaIng Jun 23, 2020
772936d
v6.31
MichaIng Jun 24, 2020
3f4cc7b
v6.31
MichaIng Jun 24, 2020
4924679
v6.31
MichaIng Jun 24, 2020
4e10fbb
v6.31
MichaIng Jun 24, 2020
66f937a
v6.31
MichaIng Jun 24, 2020
dd45e90
v6.31
MichaIng Jun 24, 2020
a1033d3
v6.31
MichaIng Jun 25, 2020
1a3dcac
v6.31
MichaIng Jun 25, 2020
adf1409
v6.31
MichaIng Jun 25, 2020
dfbc502
v6.31
MichaIng Jun 25, 2020
3d3dcfd
v6.31
MichaIng Jun 25, 2020
49f960a
v6.31
MichaIng Jun 25, 2020
bc21cfb
v6.31
MichaIng Jun 25, 2020
59b2ccf
v6.31
MichaIng Jun 25, 2020
938e537
v6.31
MichaIng Jun 25, 2020
22d929b
v6.31
MichaIng Jun 25, 2020
ca8ec0e
v6.31 (#3620)
MichaIng Jun 25, 2020
2039bcf
v6.31
MichaIng Jun 26, 2020
5aa2cac
v6.31
MichaIng Jun 26, 2020
62bbaad
v6.31
MichaIng Jun 27, 2020
f96ad09
v6.31
MichaIng Jun 27, 2020
c8d20a1
v6.31
MichaIng Jun 27, 2020
e09fc03
v6.31
MichaIng Jun 28, 2020
c4a1dc3
v6.31
MichaIng Jun 28, 2020
a688920
v6.31
MichaIng Jun 28, 2020
7f5c40c
v6.31
MichaIng Jun 28, 2020
d0b33bc
v6.31
MichaIng Jun 28, 2020
01dafdd
v6.31
MichaIng Jun 28, 2020
e1c88c3
v6.31
MichaIng Jun 28, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
v6.31
+ DietPi-Software | TigerVNC: Apply libunwind workaround via binary patch, which fixes calls from other origins like XRDP
+ DietPi-Software | RealVNC: Do not enable enterprise subscription service vncserver-virtuald. If users have enterprise subscription, they should disable our vncserver.service and enable vncserver-virtuald.service to switch from static VNC session on screen 1 to ondemand RealVNC session spawn.
+ DietPi-Software | RealVNC: Integrate vncserver-x11-serviced.service start into vncserver.service in shared mode. Having it running concurrently to a virtual VNC session makes it attaching to the virtual VNC session, which allows connecting to it on port 5900 (no screen :1 required) but the overhead overhead of ~20 MiB + possible confusion is not worth it.
+ DietPi-Software | VNC Servers: Apply vncpasswd only on TigerVNC since RealVNC by default uses UNIX user authentication and does not support the "-f" option at all.
+ DietPi-Software | VNC Servers: Minor uninstall enhancements
MichaIng authored Jun 27, 2020
commit f96ad0909a2f93bb6c26d4850eb17757e26a0f5c
87 changes: 49 additions & 38 deletions dietpi/dietpi-software
Original file line number Diff line number Diff line change
@@ -440,11 +440,11 @@ DietPi-Software will decrypt and use it for software installs. You can change it

aSOFTWARE_NAME[$software_id]='RealVNC Server'
aSOFTWARE_DESC[$software_id]='desktop for remote connection'
aSOFTWARE_CATEGORY_INDEX[$software_id]=1
aSOFTWARE_TYPE[$software_id]=0
aSOFTWARE_CATEGORY_INDEX[$software_id]=1
aSOFTWARE_REQUIRES_DESKTOP[$software_id]=1
aSOFTWARE_ONLINEDOC_URL[$software_id]='p=4149#p4149'
# RPi only (archive.raspberrypi.org repo)
# RPi only (archive.raspberrypi.org repo, libraspberrypi dependency, license)
for ((i=10; i<=$MAX_G_HW_MODEL; i++))
do

@@ -4376,6 +4376,19 @@ amvdec_vp9' > /etc/modules-load.d/dietpi-c4-kodi.conf
(( $G_DISTRO < 6 )) && netbase='netbase'
G_AGI tigervnc-standalone-server tigervnc-common x11vnc $netbase

# Patch binary on Buster + ARM due to external bug: https://github.com/MichaIng/DietPi/issues/3615
if (( $G_DISTRO == 5 && $G_HW_ARCH < 4 )) && [[ $(ldd /usr/bin/Xtigervnc | grep -m1 'libgcc_s\|libunwind') =~ ^[[:blank:]]*'libunwind' ]]; then

G_DIETPI-NOTIFY 2 'Patching Xtigervnc binary: https://github.com/MichaIng/DietPi/issues/3615'
local patchelf_installed=0
dpkg-query -s patchelf && patchelf_installed=1
(( $patchelf_installed )) || G_AGI patchelf
# Removing and re-adding libgcc_s will place it at the top of the list, as does LD_PRELOAD when executing X(tiger)vnc.
patchelf --remove-needed libgcc_s.so.1 /usr/bin/Xtigervnc
patchelf --add-needed libgcc_s.so.1 /usr/bin/Xtigervnc

fi

fi

software_id=120 # RealVNC Server
@@ -9125,7 +9138,8 @@ _EOF_
[Unit]
Description=Manage VNC Server (DietPi)
Before=xrdp.service xrdp-sesman.service
After=dietpi-boot.service
Wants=network-online.target
After=network-online.target dietpi-boot.service

[Service]
RemainAfterExit=yes
@@ -9141,19 +9155,6 @@ _EOF_
systemctl daemon-reload
systemctl enable vncserver

# Workaround external bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=932499
local ld_preload=
# - Be failsafe on Raspbian (armhf!) if 64-bit kernel mode has been enabled.
if (( $G_HW_ARCH < 3 )) || [[ $G_RASPBIAN == 1 ]]; then

ld_preload='/lib/arm-linux-gnueabihf/libgcc_s.so.1'

elif (( $G_HW_ARCH == 3 )); then

ld_preload='/lib/aarch64-linux-gnu/libgcc_s.so.1'

fi

cat << _EOF_ > /usr/local/bin/vncserver
#!/bin/bash

@@ -9190,14 +9191,13 @@ case "\$1" in
HEIGHT=\$(sed -n '/^[[:blank:]]*SOFTWARE_VNCSERVER_HEIGHT=/{s/^[^=]*=//p;q}' /boot/dietpi.txt)
DEPTH=\$(sed -n '/^[[:blank:]]*SOFTWARE_VNCSERVER_DEPTH=/{s/^[^=]*=//p;q}' /boot/dietpi.txt)
DISPLAY=\$(sed -n '/^[[:blank:]]*SOFTWARE_VNCSERVER_DISPLAY_INDEX=/{s/^[^=]*=//p;q}' /boot/dietpi.txt)
(( \$REALVNC )) || export LD_PRELOAD=$ld_preload # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=932499
\$FP_BINARY :\${DISPLAY:-1} -geometry \${WIDTH:-1280}'x'\${HEIGHT:-720} -depth \${DEPTH:-16} || exit 1

# Shared mode: x11vnc, excluding RealVNC as it has its own services
# TigerVNC shared desktop mode
elif (( ! \$REALVNC )); then

# Wait for X to start
while ! pgrep Xorg
until pgrep Xorg
do

echo 'Waiting for X11 to start'
@@ -9209,13 +9209,20 @@ case "\$1" in
xset dpms force on # Disable screen blanking
x11vnc -display :0 -usepw -forever || exit 1

# RealVNC shared desktop mode
else

# No need to wait for X, this service detects the first appearing X session and attaches to it.
systemctl start vncserver-x11-serviced || exit 1

fi
;;

stop)
DISPLAY=\$(sed -n '/^[[:blank:]]*SOFTWARE_VNCSERVER_DISPLAY_INDEX=/{s/^[^=]*=//p;q}' /boot/dietpi.txt)
\$FP_BINARY -kill :\${DISPLAY:-1} &> /dev/null
killall -qw x11vnc Xtigervnc
\$FP_BINARY -kill :\${DISPLAY:-1} 2> /dev/null
(( \$REALVNC )) && systemctl stop vncserver-x11-serviced
killall -qw x11vnc Xtigervnc /usr/bin/vncserver-x11-serviced vncserver-x11-serviced Xvnc-core
;;

esac
@@ -9224,14 +9231,6 @@ exit 0
_EOF_
chmod +x /usr/local/bin/vncserver

# RealVNC: Enable services
if (( ${aSOFTWARE_INSTALL_STATE[120]} == 1 )); then

systemctl enable vncserver-x11-serviced
systemctl enable vncserver-virtuald

fi

# Stretch + TigerVNC: Disable Localhost only by default
[[ -f '/etc/vnc.conf' ]] && GCI_PRESERVE=1 G_CONFIG_INJECT '\$localhost[[:blank:]]*=' '$localhost = "no";' /etc/vnc.conf

@@ -9275,12 +9274,16 @@ $cmd_launch_desktop &
_EOF_
chmod +x /root/.vnc/xstartup

# Set control + read-only passwords
vncpasswd -f << _EOF_ > /root/.vnc/passwd
# TigerVNC: Set control + read-only passwords (RealVNC uses UNIX user authentication by default, does not support the "-f" option and uses different files!)
if command -v tigervncpasswd &> /dev/null; then

tigervncpasswd -f << _EOF_ > /root/.vnc/passwd
$GLOBAL_PW
$GLOBAL_PW
_EOF_
chmod 600 /root/.vnc/passwd
chmod 600 /root/.vnc/passwd

fi

fi

@@ -13595,6 +13598,13 @@ _EOF_

(( ${aSOFTWARE_INSTALL_STATE[28]} == -1 )) && software_id=28 || software_id=120
Banner_Uninstalling

# RealVNC services
systemctl unmask vncserver-x11-serviced 2> /dev/null
systemctl disable --now vncserver-x11-serviced 2> /dev/null
systemctl unmask vncserver-virtuald 2> /dev/null
systemctl disable --now vncserver-virtuald 2> /dev/null

G_AGP tigervnc-* x11vnc realvnc-vnc-server

if [[ -f '/etc/systemd/system/vncserver.service' ]]; then
@@ -13603,13 +13613,14 @@ _EOF_
rm -R /etc/systemd/system/vncserver.service*

fi
[[ -f '/etc/init.d/vncserver' ]] && rm /etc/init.d/vncserver
[[ -f '/usr/local/bin/vncserver' ]] && rm /usr/local/bin/vncserver
[[ -d '/root/.vnc' ]] && rm -R /root/.vnc
if [[ -f '/etc/init.d/vncserver' ]]; then

# + RealVNC services
systemctl disable vncserver-x11-serviced.service 2> /dev/null
systemctl disable vncserver-virtuald.service 2> /dev/null
rm /etc/init.d/vncserver
update-rc.d -f vncserver remove

fi
[[ -f '/usr/local/bin/vncserver' ]] && rm /usr/local/bin/vncserver
rm -Rf /{root,home/*}/.vnc

fi