From f5fe47e1d2eb9787ab0f681a89b87242c3025b52 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 16 May 2020 08:45:17 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to apt run --- .etckeeper | 2 ++ NX/nxnode | 2 +- NX/nxserver | 2 +- NX/server/localhost/server.cfg.sample | 14 ++++++++++++++ cups/printers.conf.O | 2 +- rcS.d/{S01ufw => K01ufw} | 0 systemd/system/multi-user.target.wants/ufw.service | 1 - 7 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 NX/server/localhost/server.cfg.sample rename rcS.d/{S01ufw => K01ufw} (100%) delete mode 120000 systemd/system/multi-user.target.wants/ufw.service diff --git a/.etckeeper b/.etckeeper index 1def3cc..03d763f 100755 --- a/.etckeeper +++ b/.etckeeper @@ -140,6 +140,7 @@ maybe chmod 0644 'NX/server/localhost/client.cfg' maybe chmod 0644 'NX/server/localhost/node.cfg' maybe chmod 0644 'NX/server/localhost/player.cfg' maybe chmod 0644 'NX/server/localhost/server.cfg' +maybe chmod 0644 'NX/server/localhost/server.cfg.sample' maybe chmod 0755 'NetworkManager' maybe chmod 0644 'NetworkManager/NetworkManager.conf' maybe chmod 0755 'NetworkManager/VPN' @@ -3355,6 +3356,7 @@ maybe chmod 0644 'xdg/autostart/xdg-user-dirs.desktop' maybe chmod 0644 'xdg/autostart/zeitgeist-datahub.desktop' maybe chmod 0755 'xdg/menus' maybe chmod 0755 'xdg/menus/applications-merged' +maybe chgrp 'mhoellein' 'xdg/menus/applications-merged/NoMachine-dir.menu' maybe chmod 0644 'xdg/menus/applications-merged/NoMachine-dir.menu' maybe chmod 0644 'xdg/menus/gnome-applications.menu' maybe chmod 0644 'xdg/menus/unity-lens-applications.menu' diff --git a/NX/nxnode b/NX/nxnode index 02041a5..1177ac6 100755 --- a/NX/nxnode +++ b/NX/nxnode @@ -1,7 +1,7 @@ #!/bin/bash ###################################################################### # # -# Copyright (c) 2001, 2018 NoMachine, http://www.nomachine.com. # +# Copyright (c) 2001, 2020 NoMachine, http://www.nomachine.com. # # # # All rights reserved. # # # diff --git a/NX/nxserver b/NX/nxserver index 5523792..c20889c 100755 --- a/NX/nxserver +++ b/NX/nxserver @@ -1,7 +1,7 @@ #!/bin/bash ###################################################################### # # -# Copyright (c) 2001, 2019 NoMachine, http://www.nomachine.com. # +# Copyright (c) 2001, 2020 NoMachine, http://www.nomachine.com. # # # # All rights reserved. # # # diff --git a/NX/server/localhost/server.cfg.sample b/NX/server/localhost/server.cfg.sample new file mode 100644 index 0000000..4cb302a --- /dev/null +++ b/NX/server/localhost/server.cfg.sample @@ -0,0 +1,14 @@ +###################################################################### +# # +# Copyright (c) 2001, 2020 NoMachine, http://www.nomachine.com. # +# # +# All rights reserved. # +# # +###################################################################### + +# +# Specify the path of base directory where the NX software has been +# installed. +# + +ServerRoot = "/usr/NX" diff --git a/cups/printers.conf.O b/cups/printers.conf.O index 5cb47ef..7716936 100644 --- a/cups/printers.conf.O +++ b/cups/printers.conf.O @@ -79,7 +79,7 @@ Info HP Color LaserJet MFP M277dw MakeModel HP Color LaserJet Pro MFP M277 Postscript (recommended) DeviceURI socket://192.168.178.254 State Idle -StateTime 1589390202 +StateTime 1589391218 ConfigTime 1496773872 Type 8425500 Accepting Yes diff --git a/rcS.d/S01ufw b/rcS.d/K01ufw similarity index 100% rename from rcS.d/S01ufw rename to rcS.d/K01ufw diff --git a/systemd/system/multi-user.target.wants/ufw.service b/systemd/system/multi-user.target.wants/ufw.service deleted file mode 120000 index 8686649..0000000 --- a/systemd/system/multi-user.target.wants/ufw.service +++ /dev/null @@ -1 +0,0 @@ -/lib/systemd/system/ufw.service \ No newline at end of file -- 2.43.0