From 50872d18b27a5747b78f1358fc2018104e8fd7cd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mario=20H=C3=B6llein?= Date: Thu, 30 Aug 2018 22:37:41 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to apt run --- .etckeeper | 2 ++ cups/printers.conf.O | 8 ++--- default/grub | 2 +- default/grub.prime-backup | 34 +++++++++++++++++++ modprobe.d/blacklist-nvidia.conf | 8 +++++ resolv.conf | 2 +- .../nvidia-prime-boot.service | 1 + 7 files changed, 51 insertions(+), 6 deletions(-) create mode 100644 default/grub.prime-backup create mode 100644 modprobe.d/blacklist-nvidia.conf create mode 120000 systemd/system/display-manager.service.wants/nvidia-prime-boot.service diff --git a/.etckeeper b/.etckeeper index 6df8391..4f53074 100755 --- a/.etckeeper +++ b/.etckeeper @@ -1243,6 +1243,7 @@ maybe chmod 0644 'default/devolo-updates' maybe chmod 0644 'default/devpts' maybe chmod 0644 'default/google-chrome' maybe chmod 0644 'default/grub' +maybe chmod 0600 'default/grub.prime-backup' maybe chmod 0644 'default/halt' maybe chmod 0644 'default/im-config' maybe chmod 0644 'default/intel-microcode' @@ -1912,6 +1913,7 @@ maybe chmod 0644 'modprobe.d/blacklist-firewire.conf' maybe chmod 0644 'modprobe.d/blacklist-framebuffer.conf' maybe chmod 0644 'modprobe.d/blacklist-modem.conf' maybe chmod 0644 'modprobe.d/blacklist-nouveau.conf' +maybe chmod 0600 'modprobe.d/blacklist-nvidia.conf' maybe chmod 0644 'modprobe.d/blacklist-rare-network.conf' maybe chmod 0644 'modprobe.d/blacklist-watchdog.conf' maybe chmod 0644 'modprobe.d/blacklist.conf' diff --git a/cups/printers.conf.O b/cups/printers.conf.O index 9035d2b..ddbd592 100644 --- a/cups/printers.conf.O +++ b/cups/printers.conf.O @@ -25,7 +25,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 1534701273 +StateTime 1535619758 ConfigTime 1496773872 Type 8425500 Accepting Yes @@ -80,14 +80,14 @@ OpPolicy default ErrorPolicy retry-job -UUID urn:uuid:bbb4bb0f-5550-3186-56a8-8e45a5eb0b8d +UUID urn:uuid:b45da962-9d0a-359c-6fd3-ab75a1085329 Info Location MakeModel Color LaserJet MFP M277dw DeviceURI ipp://NPI9D0E59.local:631/ipp/print State Idle -StateTime 1535438345 -ConfigTime 1535438348 +StateTime 1535657198 +ConfigTime 1535657201 Type 4188 Accepting Yes Shared No diff --git a/default/grub b/default/grub index 74f28d2..7ed9c1f 100644 --- a/default/grub +++ b/default/grub @@ -8,7 +8,7 @@ GRUB_DEFAULT=0 GRUB_HIDDEN_TIMEOUT_QUIET=true GRUB_TIMEOUT=10 GRUB_DISTRIBUTOR=`lsb_release -i -s 2> /dev/null || echo Debian` -GRUB_CMDLINE_LINUX_DEFAULT="quiet splash" +GRUB_CMDLINE_LINUX_DEFAULT="quiet splash nouveau.runpm=0" GRUB_CMDLINE_LINUX="" # Uncomment to enable BadRAM filtering, modify to suit your needs diff --git a/default/grub.prime-backup b/default/grub.prime-backup new file mode 100644 index 0000000..74f28d2 --- /dev/null +++ b/default/grub.prime-backup @@ -0,0 +1,34 @@ +# If you change this file, run 'update-grub' afterwards to update +# /boot/grub/grub.cfg. +# For full documentation of the options in this file, see: +# info -f grub -n 'Simple configuration' + +GRUB_DEFAULT=0 +#GRUB_HIDDEN_TIMEOUT=0 +GRUB_HIDDEN_TIMEOUT_QUIET=true +GRUB_TIMEOUT=10 +GRUB_DISTRIBUTOR=`lsb_release -i -s 2> /dev/null || echo Debian` +GRUB_CMDLINE_LINUX_DEFAULT="quiet splash" +GRUB_CMDLINE_LINUX="" + +# Uncomment to enable BadRAM filtering, modify to suit your needs +# This works with Linux (no patch required) and with any kernel that obtains +# the memory map information from GRUB (GNU Mach, kernel of FreeBSD ...) +#GRUB_BADRAM="0x01234567,0xfefefefe,0x89abcdef,0xefefefef" + +# Uncomment to disable graphical terminal (grub-pc only) +#GRUB_TERMINAL=console + +# The resolution used on graphical terminal +# note that you can use only modes which your graphic card supports via VBE +# you can see them in real GRUB with the command `vbeinfo' +#GRUB_GFXMODE=640x480 + +# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to Linux +#GRUB_DISABLE_LINUX_UUID=true + +# Uncomment to disable generation of recovery mode menu entries +#GRUB_DISABLE_RECOVERY="true" + +# Uncomment to get a beep at grub start +#GRUB_INIT_TUNE="480 440 1" diff --git a/modprobe.d/blacklist-nvidia.conf b/modprobe.d/blacklist-nvidia.conf new file mode 100644 index 0000000..db9824f --- /dev/null +++ b/modprobe.d/blacklist-nvidia.conf @@ -0,0 +1,8 @@ +# Do not modify +# This file was generated by nvidia-prime +blacklist nvidia +blacklist nvidia-drm +blacklist nvidia-modeset +alias nvidia off +alias nvidia-drm off +alias nvidia-modeset off \ No newline at end of file diff --git a/resolv.conf b/resolv.conf index 0141cbb..89efb95 120000 --- a/resolv.conf +++ b/resolv.conf @@ -1 +1 @@ -../run/resolvconf/resolv.conf \ No newline at end of file +/run/systemd/resolve/resolv.conf \ No newline at end of file diff --git a/systemd/system/display-manager.service.wants/nvidia-prime-boot.service b/systemd/system/display-manager.service.wants/nvidia-prime-boot.service new file mode 120000 index 0000000..a505664 --- /dev/null +++ b/systemd/system/display-manager.service.wants/nvidia-prime-boot.service @@ -0,0 +1 @@ +/lib/systemd/system/nvidia-prime-boot.service \ No newline at end of file -- 2.43.0