From dd6ea856028ac48539d7d8cbd7acd3bcd744565b Mon Sep 17 00:00:00 2001 From: bryan Date: Fri, 18 Feb 2022 18:59:42 -0500 Subject: [PATCH 1/5] Debugging for vncauth --- installJRMC | 1 + 1 file changed, 1 insertion(+) diff --git a/installJRMC b/installJRMC index e7441b3..3f3fa12 100755 --- a/installJRMC +++ b/installJRMC @@ -878,6 +878,7 @@ setVNCPass() { return 1 fi else + debug "HERE!" declare -g NOVNCAUTH=1 fi } From 4f02bf36c7386dcb9db12facb10d1c64e7e34d63 Mon Sep 17 00:00:00 2001 From: bryan Date: Fri, 18 Feb 2022 19:00:59 -0500 Subject: [PATCH 2/5] Debugging for vncauth --- installJRMC | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/installJRMC b/installJRMC index 3f3fa12..124ee86 100755 --- a/installJRMC +++ b/installJRMC @@ -878,7 +878,6 @@ setVNCPass() { return 1 fi else - debug "HERE!" declare -g NOVNCAUTH=1 fi } @@ -1016,6 +1015,8 @@ service_jriver-xvnc() { setVNCPass xvnc + debug "NOVNCAUTH: $NOVNCAUTH" + if (( NOVNCAUTH )); then start_cmd="/usr/bin/vncserver $NEXT_DISPLAY -geometry 1440x900 -alwaysshared -name jriver$NEXT_DISPLAY -SecurityTypes None -autokill -xstartup /usr/bin/mediacenter$MVERSION" else From 6c831f856721a5d5a7b20dd776a9e252ef0c4c00 Mon Sep 17 00:00:00 2001 From: bryan Date: Fri, 18 Feb 2022 19:02:54 -0500 Subject: [PATCH 3/5] Debugging for vncauth --- installJRMC | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/installJRMC b/installJRMC index 124ee86..b3337b5 100755 --- a/installJRMC +++ b/installJRMC @@ -1015,14 +1015,14 @@ service_jriver-xvnc() { setVNCPass xvnc - debug "NOVNCAUTH: $NOVNCAUTH" - if (( NOVNCAUTH )); then start_cmd="/usr/bin/vncserver $NEXT_DISPLAY -geometry 1440x900 -alwaysshared -name jriver$NEXT_DISPLAY -SecurityTypes None -autokill -xstartup /usr/bin/mediacenter$MVERSION" else start_cmd="/usr/bin/vncserver $NEXT_DISPLAY -geometry 1440x900 -alwaysshared -rfbauth $HOME/.vnc/jrmc_passwd -autokill -xstartup /usr/bin/mediacenter$MVERSION" fi + debug "start_cmd: $start_cmd" + sudo bash -c "cat <<- EOF > $SERVICE_FNAME [Unit] Description=Remote desktop service (VNC) @@ -1040,8 +1040,6 @@ service_jriver-xvnc() { WantedBy=multi-user.target EOF" - debug "DONE" - systemctl_reload_cmd && systemctl_enable_cmd "$SERVICE_NAME" && echo "Xvnc running on localhost:$PORT" && From e1d57b3664c934a7779a744968295d62046368bb Mon Sep 17 00:00:00 2001 From: bryan Date: Fri, 18 Feb 2022 19:05:11 -0500 Subject: [PATCH 4/5] Debugging for vncauth --- installJRMC | 2 -- 1 file changed, 2 deletions(-) diff --git a/installJRMC b/installJRMC index b3337b5..bfb756f 100755 --- a/installJRMC +++ b/installJRMC @@ -1021,8 +1021,6 @@ service_jriver-xvnc() { start_cmd="/usr/bin/vncserver $NEXT_DISPLAY -geometry 1440x900 -alwaysshared -rfbauth $HOME/.vnc/jrmc_passwd -autokill -xstartup /usr/bin/mediacenter$MVERSION" fi - debug "start_cmd: $start_cmd" - sudo bash -c "cat <<- EOF > $SERVICE_FNAME [Unit] Description=Remote desktop service (VNC) From 095b2c5bb8ada4680be195ad3f7efe275f28a375 Mon Sep 17 00:00:00 2001 From: bryan Date: Sun, 27 Feb 2022 12:27:51 -0500 Subject: [PATCH 5/5] Fix vhattr --- installJRMC | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/installJRMC b/installJRMC index bfb756f..f7510df 100755 --- a/installJRMC +++ b/installJRMC @@ -37,7 +37,7 @@ printHelp() { --install, -i repo|local repo: Install MC from repository, updates are handled by the system package manager local: Build and install MC package locally - --build[=suse|fedora|centos|rhel] + --build[=suse|fedora|centos] Build RPM from source DEB but do not install Optionally, specify a target distro for cross-building (ex. --build=suse, note the '=') --compat @@ -56,7 +56,7 @@ printHelp() { Starts services at boot (system) or at user login (user) (Default: boot) --container, -c CONTAINER (TODO: Under construction) See CONTAINERS section below for a list of possible services to install - --createrepo[=suse|fedora|centos|rhel] + --createrepo[=suse|fedora|centos] Build rpm, copy to webroot, and run createrepo. Use in conjunction with --build=TARGET for crossbuilding repos Optionally, specify a target distro for non-native repo (ex. --createrepo=fedora, note the '=') --createrepo-webroot PATH @@ -1381,12 +1381,13 @@ disableCoW() { declare mc_system_path="/usr/lib/jriver" declare mc_user_path mc_user_path=$(getent passwd "$USER" | cut -d: -f6) + mc_user_path="$mc_user_path/.jriver" for dir in "$mc_system_path" "$mc_user_path"; do if [[ $(stat -f -c %T "$dir") == "btrfs" ]] && ! lsattr -d "$dir" | cut -f1 -d" " | grep -q C; then echo "Disabling CoW for $dir" - sudo chattr -R +C "$dir" + sudo chattr +C "$dir" fi done }