diff options
| author | Jonathan Bauer | 2020-12-08 13:38:35 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2020-12-08 13:38:35 +0100 |
| commit | 3ef02ec2a4eefe3c330c652dbb457e31be9d0135 (patch) | |
| tree | 8ca1bb8a4dc33faa5114478a23fa7c11baa7d09e | |
| parent | Merge branch 'master' into installer (diff) | |
| parent | [kernel-vanilla] Fix hardcoded aufs4 (diff) | |
| download | mltk-3ef02ec2a4eefe3c330c652dbb457e31be9d0135.tar.gz mltk-3ef02ec2a4eefe3c330c652dbb457e31be9d0135.tar.xz mltk-3ef02ec2a4eefe3c330c652dbb457e31be9d0135.zip | |
Merge branch 'master' into installer
| -rw-r--r-- | core/modules/kernel-vanilla/module.build | 2 | ||||
| -rwxr-xr-x | core/modules/remote-access/data/etc/X11/Xsetup.d/50-launch-vncserver | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/modules/kernel-vanilla/module.build b/core/modules/kernel-vanilla/module.build index d8714cc8..4954ac35 100644 --- a/core/modules/kernel-vanilla/module.build +++ b/core/modules/kernel-vanilla/module.build @@ -180,7 +180,7 @@ patch_aufs() { patch=$(( patch - 1 )) done pinfo "Getting branch origin/$NEEDED_BRANCH" - git checkout "origin/$NEEDED_BRANCH" || git checkout "origin/aufs4.x-rcN" || perror "Could not checkout needed branch." + git checkout "origin/$NEEDED_BRANCH" || git checkout "origin/${AUFS}.x-rcN" || perror "Could not checkout needed branch." pinfo "Starting to patch... $NEEDED_BRANCH" tarcopy "Documentation fs" "$MODULE_WORK_DIR/ksrc" diff --git a/core/modules/remote-access/data/etc/X11/Xsetup.d/50-launch-vncserver b/core/modules/remote-access/data/etc/X11/Xsetup.d/50-launch-vncserver index 40c8d61d..0fd80cab 100755 --- a/core/modules/remote-access/data/etc/X11/Xsetup.d/50-launch-vncserver +++ b/core/modules/remote-access/data/etc/X11/Xsetup.d/50-launch-vncserver @@ -37,7 +37,7 @@ while true; do s="$( date +%s )" # skip keycode stuff fixes altgr for vmware - x11vnc -rfbport 5900 -shared -forever -xkb -capslock -skip_keycodes 92,187,188 -remap DEAD=gac,U20AC-EuroSign -passwd "$passwd" + x11vnc -rfbport 5900 -shared -forever -noxrecord -xkb -capslock -skip_keycodes 92,187,188 -remap DEAD=gac,U20AC-EuroSign -passwd "$passwd" e="$( date +%s )" d="$(( e - s ))" if [ "$d" -gt 5 ]; then |