| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182 |
- From 0e8c18bc2639da328274d02d9222ee2c1f6bf696 Mon Sep 17 00:00:00 2001
- From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
- Date: Tue, 6 Mar 2018 23:39:47 +0100
- Subject: [PATCH] Use Arch Linux' device access groups
- MIME-Version: 1.0
- Content-Type: text/plain; charset=UTF-8
- Content-Transfer-Encoding: 8bit
- cdrom → optical
- dialout → uucp
- tape → storage
- ---
- meson.build | 6 +++---
- meson_options.txt | 12 ++++++------
- rules.d/50-udev-default.rules.in | 14 +++++++-------
- sysusers.d/basic.conf.in | 6 +++---
- 4 files changed, 19 insertions(+), 19 deletions(-)
- diff --git a/meson.build b/meson.build
- index 76ad51d3fb..5cf679b088 100644
- --- a/meson.build
- +++ b/meson.build
- @@ -915,19 +915,19 @@ conf.set_quoted('NOBODY_GROUP_NAME', nobody_group)
- static_ugids = []
- foreach option : ['adm-gid',
- 'audio-gid',
- - 'cdrom-gid',
- - 'dialout-gid',
- 'disk-gid',
- 'input-gid',
- 'kmem-gid',
- 'kvm-gid',
- 'lp-gid',
- + 'optical-gid',
- 'render-gid',
- 'sgx-gid',
- - 'tape-gid',
- + 'storage-gid',
- 'tty-gid',
- 'users-gid',
- 'utmp-gid',
- + 'uucp-gid',
- 'video-gid',
- 'wheel-gid',
- 'systemd-journal-gid',
- diff --git a/meson_options.txt b/meson_options.txt
- index 814f340840..253a77ecb3 100644
- --- a/meson_options.txt
- +++ b/meson_options.txt
- @@ -257,10 +257,6 @@ option('adm-gid', type : 'integer', value : 0,
- description : 'soft-static allocation for the "adm" group')
- option('audio-gid', type : 'integer', value : 0,
- description : 'soft-static allocation for the "audio" group')
- -option('cdrom-gid', type : 'integer', value : 0,
- - description : 'soft-static allocation for the "cdrom" group')
- -option('dialout-gid', type : 'integer', value : 0,
- - description : 'soft-static allocation for the "dialout" group')
- option('disk-gid', type : 'integer', value : 0,
- description : 'soft-static allocation for the "disk" group')
- option('input-gid', type : 'integer', value : 0,
- @@ -271,18 +267,22 @@ option('kvm-gid', type : 'integer', value : 0,
- description : 'soft-static allocation for the "kvm" group')
- option('lp-gid', type : 'integer', value : 0,
- description : 'soft-static allocation for the "lp" group')
- +option('optical-gid', type : 'integer', value : '0',
- + description : 'soft-static allocation for the "optical" group')
- option('render-gid', type : 'integer', value : 0,
- description : 'soft-static allocation for the "render" group')
- option('sgx-gid', type : 'integer', value : 0,
- description : 'soft-static allocation for the "sgx" group')
- -option('tape-gid', type : 'integer', value : 0,
- - description : 'soft-static allocation for the "tape" group')
- +option('storage-gid', type : 'integer', value : '0',
- + description : 'soft-static allocation for the "storage" group')
- option('tty-gid', type : 'integer', value : 5,
- description : 'the numeric GID of the "tty" group')
- option('users-gid', type : 'integer', value : 0,
- description : 'soft-static allocation for the "users" group')
- option('utmp-gid', type : 'integer', value : 0,
- description : 'soft-static allocation for the "utmp" group')
- +option('uucp-gid', type : 'integer', value : '0',
- + description : 'soft-static allocation for the "uucp" group')
- option('video-gid', type : 'integer', value : 0,
- description : 'soft-static allocation for the "video" group')
- option('wheel-gid', type : 'integer', value : 0,
- diff --git a/rules.d/50-udev-default.rules.in b/rules.d/50-udev-default.rules.in
- index 843bdaf9ce..a192f091df 100644
- --- a/rules.d/50-udev-default.rules.in
- +++ b/rules.d/50-udev-default.rules.in
- @@ -26,7 +26,7 @@ SUBSYSTEM=="tty", KERNEL=="sclp_line[0-9]*", GROUP="tty", MODE="0620"
- SUBSYSTEM=="tty", KERNEL=="ttysclp[0-9]*", GROUP="tty", MODE="0620"
- SUBSYSTEM=="tty", KERNEL=="3270/tty[0-9]*", GROUP="tty", MODE="0620"
- SUBSYSTEM=="vc", KERNEL=="vcs*|vcsa*", GROUP="tty"
- -KERNEL=="tty[A-Z]*[0-9]|ttymxc[0-9]*|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="dialout"
- +KERNEL=="tty[A-Z]*[0-9]|ttymxc[0-9]*|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="uucp"
-
- SUBSYSTEM=="mem", KERNEL=="mem|kmem|port", GROUP="kmem", MODE="0640"
-
- @@ -72,13 +72,13 @@ KERNEL=="irlpt[0-9]*", GROUP="lp"
- SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="*:0701??:*", GROUP="lp"
-
- SUBSYSTEM=="block", GROUP="disk"
- -SUBSYSTEM=="block", KERNEL=="sr[0-9]*", GROUP="cdrom"
- -SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="cdrom"
- -KERNEL=="sch[0-9]*", GROUP="cdrom"
- -KERNEL=="pktcdvd[0-9]*", GROUP="cdrom"
- -KERNEL=="pktcdvd", GROUP="cdrom"
- +SUBSYSTEM=="block", KERNEL=="sr[0-9]*", GROUP="optical"
- +SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="optical"
- +KERNEL=="sch[0-9]*", GROUP="optical"
- +KERNEL=="pktcdvd[0-9]*", GROUP="optical"
- +KERNEL=="pktcdvd", GROUP="optical"
-
- -SUBSYSTEM=="scsi_generic|scsi_tape", SUBSYSTEMS=="scsi", ATTRS{type}=="1|8", GROUP="tape"
- +SUBSYSTEM=="scsi_generic|scsi_tape", SUBSYSTEMS=="scsi", ATTRS{type}=="1|8", GROUP="storage"
- SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="0", GROUP="disk"
- KERNEL=="qft[0-9]*|nqft[0-9]*|zqft[0-9]*|nzqft[0-9]*|rawqft[0-9]*|nrawqft[0-9]*", GROUP="disk"
- KERNEL=="loop-control", GROUP="disk", OPTIONS+="static_node=loop-control"
- diff --git a/sysusers.d/basic.conf.in b/sysusers.d/basic.conf.in
- index a602b872e4..8d38febb6a 100644
- --- a/sysusers.d/basic.conf.in
- +++ b/sysusers.d/basic.conf.in
- @@ -23,17 +23,17 @@ g utmp {{UTMP_GID }} - -
-
- # Physical and virtual hardware access groups
- g audio {{AUDIO_GID }} - -
- -g cdrom {{CDROM_GID }} - -
- -g dialout {{DIALOUT_GID}} - -
- g disk {{DISK_GID }} - -
- g input {{INPUT_GID }} - -
- g kmem {{KMEM_GID }} - -
- g kvm {{KVM_GID }} - -
- g lp {{LP_GID }} - -
- +g optical {{OPTICAL_GID}} - -
- g render {{RENDER_GID }} - -
- g sgx {{SGX_GID }} - -
- -g tape {{TAPE_GID }} - -
- +g storage {{STORAGE_GID}} - -
- g tty {{TTY_GID }} - -
- +g uucp {{UUCP_GID }} - -
- g video {{VIDEO_GID }} - -
-
- # Default group for normal users
- From 9e2987a7b4d09d7b554141e9ef2c911cb3fda570 Mon Sep 17 00:00:00 2001
- From: Christian Hesse <mail@eworm.de>
- Date: Mon, 27 Dec 2021 23:32:42 +0100
- Subject: [PATCH] generate tmpfiles.d/legacy.conf
- ---
- tmpfiles.d/legacy.conf.in | 3 ---
- tmpfiles.d/meson.build | 2 +-
- 2 files changed, 1 insertion(+), 4 deletions(-)
- diff --git a/tmpfiles.d/legacy.conf.in b/tmpfiles.d/legacy.conf.in
- index 4f2c0d7c43..62e2ae0986 100644
- --- a/tmpfiles.d/legacy.conf.in
- +++ b/tmpfiles.d/legacy.conf.in
- @@ -12,9 +12,6 @@
-
- d /run/lock 0755 root root -
- L /var/lock - - - - ../run/lock
- -{% if CREATE_LOG_DIRS %}
- -L /var/log/README - - - - ../..{{DOC_DIR}}/README.logs
- -{% endif %}
-
- # /run/lock/subsys is used for serializing SysV service execution, and
- # hence without use on SysV-less systems.
- diff --git a/tmpfiles.d/meson.build b/tmpfiles.d/meson.build
- index ca1abbf3fe..25e2b53402 100644
- --- a/tmpfiles.d/meson.build
- +++ b/tmpfiles.d/meson.build
- @@ -29,7 +29,7 @@ foreach pair : files
- endforeach
-
- in_files = [['etc.conf', ''],
- - ['legacy.conf', 'HAVE_SYSV_COMPAT'],
- + ['legacy.conf', ''],
- ['static-nodes-permissions.conf', ''],
- ['systemd.conf', ''],
- ['var.conf', ''],
|
