saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index 1def3cc4b48ae3541a3f819fd57cc7407526126d..03d763fd9ba8aee0294941c10fea77f8f2b87645 100755 (executable)
--- 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 02041a5a61fef3ed7d4b1af489076ed985c5f823..1177ac67742b281663bfa42be1904ab650bf8a69 100755 (executable)
--- 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 5523792f122d96a53d5bf87798583469260f98cf..c20889c3414797c6ce555342dea16cdeed8104e1 100755 (executable)
--- 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 (file)
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 5cb47efaf6780b51449ffd986a5b1af2529574c7..77169362145d6899f29b6393c140d3f5314c29cd 100644 (file)
--- 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/K01ufw b/rcS.d/K01ufw
new file mode 120000 (symlink)
index 0000000..958d443
--- /dev/null
+++ b/rcS.d/K01ufw
@@ -0,0 +1 @@
+../init.d/ufw
\ No newline at end of file

diff --git a/rcS.d/S01ufw b/rcS.d/S01ufw
deleted file mode 120000 (symlink)
index 958d443..0000000
--- a/rcS.d/S01ufw
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/ufw
\ No newline at end of file

diff --git a/systemd/system/multi-user.target.wants/ufw.service b/systemd/system/multi-user.target.wants/ufw.service
deleted file mode 120000 (symlink)
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