desktop-lite: fixed qemu container (#370)
* desktop-lite: fixed qemu container * bump version for desktop-lite
This commit is contained in:
parent
ef192bf467
commit
c546f4bf8c
2 changed files with 6 additions and 6 deletions
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"id": "desktop-lite",
|
"id": "desktop-lite",
|
||||||
"version": "1.0.6",
|
"version": "1.0.7",
|
||||||
"name": "Light-weight Desktop",
|
"name": "Light-weight Desktop",
|
||||||
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/desktop-lite",
|
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/desktop-lite",
|
||||||
"description": "Adds a lightweight Fluxbox based desktop to the container that can be accessed using a VNC viewer or the web. GUI-based commands executed from the built-in VS code terminal will open on the desktop automatically.",
|
"description": "Adds a lightweight Fluxbox based desktop to the container that can be accessed using a VNC viewer or the web. GUI-based commands executed from the built-in VS code terminal will open on the desktop automatically.",
|
||||||
|
|
|
@ -299,9 +299,9 @@ startInBackgroundIfNotRunning()
|
||||||
{
|
{
|
||||||
log "Starting \$1."
|
log "Starting \$1."
|
||||||
echo -e "\n** \$(date) **" | sudoIf tee -a /tmp/\$1.log > /dev/null
|
echo -e "\n** \$(date) **" | sudoIf tee -a /tmp/\$1.log > /dev/null
|
||||||
if ! pidof \$1 > /dev/null; then
|
if ! pgrep -x \$1 > /dev/null; then
|
||||||
keepRunningInBackground "\$@"
|
keepRunningInBackground "\$@"
|
||||||
while ! pidof \$1 > /dev/null; do
|
while ! pgrep -x \$1 > /dev/null; do
|
||||||
sleep 1
|
sleep 1
|
||||||
done
|
done
|
||||||
log "\$1 started."
|
log "\$1 started."
|
||||||
|
@ -347,16 +347,16 @@ log "** SCRIPT START **"
|
||||||
|
|
||||||
# Start dbus.
|
# Start dbus.
|
||||||
log 'Running "/etc/init.d/dbus start".'
|
log 'Running "/etc/init.d/dbus start".'
|
||||||
if [ -f "/var/run/dbus/pid" ] && ! pidof dbus-daemon > /dev/null; then
|
if [ -f "/var/run/dbus/pid" ] && ! pgrep -x dbus-daemon > /dev/null; then
|
||||||
sudoIf rm -f /var/run/dbus/pid
|
sudoIf rm -f /var/run/dbus/pid
|
||||||
fi
|
fi
|
||||||
sudoIf /etc/init.d/dbus start 2>&1 | sudoIf tee -a /tmp/dbus-daemon-system.log > /dev/null
|
sudoIf /etc/init.d/dbus start 2>&1 | sudoIf tee -a /tmp/dbus-daemon-system.log > /dev/null
|
||||||
while ! pidof dbus-daemon > /dev/null; do
|
while ! pgrep -x dbus-daemon > /dev/null; do
|
||||||
sleep 1
|
sleep 1
|
||||||
done
|
done
|
||||||
|
|
||||||
# Startup tigervnc server and fluxbox
|
# Startup tigervnc server and fluxbox
|
||||||
sudo rm -rf /tmp/.X11-unix /tmp/.X*-lock
|
sudoIf rm -rf /tmp/.X11-unix /tmp/.X*-lock
|
||||||
mkdir -p /tmp/.X11-unix
|
mkdir -p /tmp/.X11-unix
|
||||||
sudoIf chmod 1777 /tmp/.X11-unix
|
sudoIf chmod 1777 /tmp/.X11-unix
|
||||||
sudoIf chown root:\${group_name} /tmp/.X11-unix
|
sudoIf chown root:\${group_name} /tmp/.X11-unix
|
||||||
|
|
Loading…
Reference in a new issue