From: Mario Höllein Date: Wed, 8 Aug 2018 17:50:41 +0000 (+0200) Subject: saving uncommitted changes in /etc prior to apt run X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=4aa0736f2d1c0073840bff4c8c36475f80b4f149;p=zenbook saving uncommitted changes in /etc prior to apt run --- diff --git a/alternatives/editor b/alternatives/editor index 7a06612..0d51672 120000 --- a/alternatives/editor +++ b/alternatives/editor @@ -1 +1 @@ -/bin/nano \ No newline at end of file +/usr/bin/vim.tiny \ No newline at end of file diff --git a/alternatives/editor.1.gz b/alternatives/editor.1.gz index bb2d082..e02a6af 120000 --- a/alternatives/editor.1.gz +++ b/alternatives/editor.1.gz @@ -1 +1 @@ -/usr/share/man/man1/nano.1.gz \ No newline at end of file +/usr/share/man/man1/vim.1.gz \ No newline at end of file diff --git a/alternatives/editor.fr.1.gz b/alternatives/editor.fr.1.gz new file mode 120000 index 0000000..af52858 --- /dev/null +++ b/alternatives/editor.fr.1.gz @@ -0,0 +1 @@ +/usr/share/man/fr/man1/vim.1.gz \ No newline at end of file diff --git a/alternatives/editor.it.1.gz b/alternatives/editor.it.1.gz new file mode 120000 index 0000000..4498a3d --- /dev/null +++ b/alternatives/editor.it.1.gz @@ -0,0 +1 @@ +/usr/share/man/it/man1/vim.1.gz \ No newline at end of file diff --git a/alternatives/editor.ja.1.gz b/alternatives/editor.ja.1.gz new file mode 120000 index 0000000..071acfb --- /dev/null +++ b/alternatives/editor.ja.1.gz @@ -0,0 +1 @@ +/usr/share/man/ja/man1/vim.1.gz \ No newline at end of file diff --git a/alternatives/editor.pl.1.gz b/alternatives/editor.pl.1.gz new file mode 120000 index 0000000..345590a --- /dev/null +++ b/alternatives/editor.pl.1.gz @@ -0,0 +1 @@ +/usr/share/man/pl/man1/vim.1.gz \ No newline at end of file diff --git a/alternatives/editor.ru.1.gz b/alternatives/editor.ru.1.gz new file mode 120000 index 0000000..ea9aa16 --- /dev/null +++ b/alternatives/editor.ru.1.gz @@ -0,0 +1 @@ +/usr/share/man/ru/man1/vim.1.gz \ No newline at end of file diff --git a/cups/printers.conf.O b/cups/printers.conf.O index c84fbb5..9fe5bec 100644 --- a/cups/printers.conf.O +++ b/cups/printers.conf.O @@ -79,3 +79,22 @@ KLimit 0 OpPolicy default ErrorPolicy retry-job + +UUID urn:uuid:5c45504b-9b54-3064-76ec-a4c99a3c7d6d +Info TEST @ linux-a5xv +Location linux-a5xv.local +DeviceURI ipps://linux-a5xv.local:631/printers/TEST +State Idle +StateTime 1533706502 +ConfigTime 1533706502 +Type 6 +Accepting Yes +Shared No +JobSheets none none +QuotaPeriod 0 +PageLimit 0 +KLimit 0 +OpPolicy default +ErrorPolicy retry-job +Option cups-browsed true + diff --git a/group b/group index f6eef97..049f1d4 100644 --- a/group +++ b/group @@ -77,3 +77,4 @@ davfs2:x:136:mhoellein mongodb:x:137:mongodb trezord:x:999: u2fkey:x:1012:mhoellein +susi:x:1013: diff --git a/group- b/group- index bba4705..f6eef97 100644 --- a/group- +++ b/group- @@ -76,4 +76,4 @@ wireshark:x:135: davfs2:x:136:mhoellein mongodb:x:137:mongodb trezord:x:999: -u2fkey:x:1012: +u2fkey:x:1012:mhoellein diff --git a/gshadow b/gshadow index bb1c9ce..d774626 100644 --- a/gshadow +++ b/gshadow @@ -77,3 +77,4 @@ davfs2:!::mhoellein mongodb:!::mongodb trezord:!:: u2fkey:!::mhoellein +susi:!:: diff --git a/gshadow- b/gshadow- index f86c241..bb1c9ce 100644 --- a/gshadow- +++ b/gshadow- @@ -76,4 +76,4 @@ wireshark:!:: davfs2:!::mhoellein mongodb:!::mongodb trezord:!:: -u2fkey:!:: +u2fkey:!::mhoellein diff --git a/passwd b/passwd index 84470ba..f033be9 100644 --- a/passwd +++ b/passwd @@ -46,3 +46,4 @@ postfix:x:125:132::/var/spool/postfix:/bin/false davfs2:x:126:136::/var/cache/davfs2:/bin/false mongodb:x:127:65534::/var/lib/mongodb:/bin/false trezord:x:999:999:TREZOR Bridge:/var:/bin/false +susi:x:1012:1013:Susanne Weber:/home/susi: diff --git a/passwd- b/passwd- index 7770a52..84470ba 100644 --- a/passwd- +++ b/passwd- @@ -45,3 +45,4 @@ nvidia-persistenced:x:123:131:NVIDIA Persistence Daemon,,,:/:/sbin/nologin postfix:x:125:132::/var/spool/postfix:/bin/false davfs2:x:126:136::/var/cache/davfs2:/bin/false mongodb:x:127:65534::/var/lib/mongodb:/bin/false +trezord:x:999:999:TREZOR Bridge:/var:/bin/false diff --git a/shadow b/shadow index e33a667..7b3c085 100644 --- a/shadow +++ b/shadow @@ -46,3 +46,4 @@ postfix:*:17326:0:99999:7::: davfs2:*:17416:0:99999:7::: mongodb:*:17457:0:99999:7::: trezord:!:17738:::::: +susi:$6$Fcb59jpZ$88N57qIZj1cwxBeklmMoGkFkCmnSpNxC.eWkAVzDAtmgdCiEDdWDXz4XvOdl.VThcynXtWeonUNCKUvLfku2J0:17751:0:99999:7::: diff --git a/shadow- b/shadow- index 39ab258..e33a667 100644 --- a/shadow- +++ b/shadow- @@ -45,3 +45,4 @@ nvidia-persistenced:*:17325:0:99999:7::: postfix:*:17326:0:99999:7::: davfs2:*:17416:0:99999:7::: mongodb:*:17457:0:99999:7::: +trezord:!:17738:::::: diff --git a/subgid b/subgid index 4810f77..43587cb 100644 --- a/subgid +++ b/subgid @@ -1 +1,2 @@ mhoellein:165536:65536 +susi:100000:65536 diff --git a/subgid- b/subgid- index 7aacaaf..4810f77 100644 --- a/subgid- +++ b/subgid- @@ -1,2 +1 @@ -oem:100000:65536 mhoellein:165536:65536 diff --git a/subuid b/subuid index 4810f77..43587cb 100644 --- a/subuid +++ b/subuid @@ -1 +1,2 @@ mhoellein:165536:65536 +susi:100000:65536 diff --git a/subuid- b/subuid- index 7aacaaf..4810f77 100644 --- a/subuid- +++ b/subuid- @@ -1,2 +1 @@ -oem:100000:65536 mhoellein:165536:65536