From f11231e3f7cf45ea7927217630512bed3ee41a6d Mon Sep 17 00:00:00 2001 From: frank Date: Fri, 10 Aug 2012 01:42:21 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- cups/printers.conf | 2 +- ssh/ssh_config | 2 ++ ssh/sshd_config | 3 +++ udev/rules.d/70-persistent-cd.rules | 6 ++++++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/cups/printers.conf b/cups/printers.conf index 9192b464..3791002d 100644 --- a/cups/printers.conf +++ b/cups/printers.conf @@ -1,5 +1,5 @@ # Printer configuration file for CUPS v1.5.2 -# Written by cupsd on 2012-07-17 08:52 +# Written by cupsd on 2012-08-08 17:41 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING UUID urn:uuid:7ae9b14e-20ad-3628-427d-870cdf4cdea4 diff --git a/ssh/ssh_config b/ssh/ssh_config index 4df379c2..69bf3a41 100644 --- a/ssh/ssh_config +++ b/ssh/ssh_config @@ -58,3 +58,5 @@ Host * # PermitLocalCommand no # VisualHostKey no # ProxyCommand ssh -q -W %h:%p gateway.example.com + + SendEnv LANG LC_* diff --git a/ssh/sshd_config b/ssh/sshd_config index 3e564b02..364730cb 100644 --- a/ssh/sshd_config +++ b/ssh/sshd_config @@ -179,6 +179,9 @@ PrintLastLog no # no default banner path #Banner none +# Allow client to pass locale environment variables +AcceptEnv LANG LC_* + # override default of no subsystems Subsystem sftp /usr/lib64/misc/sftp-server diff --git a/udev/rules.d/70-persistent-cd.rules b/udev/rules.d/70-persistent-cd.rules index e129da16..338b41d7 100644 --- a/udev/rules.d/70-persistent-cd.rules +++ b/udev/rules.d/70-persistent-cd.rules @@ -10,3 +10,9 @@ SUBSYSTEM=="block", ENV{ID_CDROM}=="?*", ENV{ID_PATH}=="pci-0000:00:11.0-scsi-2: SUBSYSTEM=="block", ENV{ID_CDROM}=="?*", ENV{ID_PATH}=="pci-0000:00:11.0-scsi-2:0:0:0", SYMLINK+="dvd", ENV{GENERATED}="1" SUBSYSTEM=="block", ENV{ID_CDROM}=="?*", ENV{ID_PATH}=="pci-0000:00:11.0-scsi-2:0:0:0", SYMLINK+="dvdrw", ENV{GENERATED}="1" +# TSSTcorp_CDDVDW_SH-222AL (pci-0000:00:11.0-scsi-0:0:0:0) +SUBSYSTEM=="block", ENV{ID_CDROM}=="?*", ENV{ID_PATH}=="pci-0000:00:11.0-scsi-0:0:0:0", SYMLINK+="cdrom1", ENV{GENERATED}="1" +SUBSYSTEM=="block", ENV{ID_CDROM}=="?*", ENV{ID_PATH}=="pci-0000:00:11.0-scsi-0:0:0:0", SYMLINK+="cdrw1", ENV{GENERATED}="1" +SUBSYSTEM=="block", ENV{ID_CDROM}=="?*", ENV{ID_PATH}=="pci-0000:00:11.0-scsi-0:0:0:0", SYMLINK+="dvd1", ENV{GENERATED}="1" +SUBSYSTEM=="block", ENV{ID_CDROM}=="?*", ENV{ID_PATH}=="pci-0000:00:11.0-scsi-0:0:0:0", SYMLINK+="dvdrw1", ENV{GENERATED}="1" + -- 2.39.5