forked from pool/systemd
f37ad01569
- Configure split-usr=true only when %usrmerged is not defined
- Import commit 40bda18e346ff45132ccd6f8f8e96de78dcf3470 (merge of v249.4)
For a complete list of changes, visit:
7f23815a70...40bda18e34
- Rework the test (sub)package:
- it's been renamed into 'systemd-testsuite'
- it includes the extended tests too
- the relevant commits have been backported to SUSE/v249 so no SUSE
specific patch is needed to run the extended tests (see below)
- the deps needed by the extended tests have been added
- Import commit 7f23815a706cf2b2df3eac2eb2f8220736b8f427
ad216581b6 test: if haveged is part of initrd it needs to be installed in the image too
088fbb71d0 test: adapt install_pam() for openSUSE
4d631c1f0c Revert "test: adapt TEST-13-NSPAWN-SMOKE for SUSE"
ef956eb8a2 test: on openSUSE the static linked version of busybox is named "busybox-static"
6f7ce633b0 TEST-13-*: in busybox container sleep(1) takes a delay in seconds only
278baaa3ec test: don't try to find BUILD_DIR when NO_BUILD is set
3bba2f876a test: add support for NO_BUILD=1 on openSUSE
d77cbc1b64 test: make busybox TEST-13-only dependency
- Upgrade to v249.2 (commit c0bb2fcbc26f6aacde574656159504f263916719)
See https://github.com/openSUSE/systemd/blob/SUSE/v249/NEWS for
details.
- Rebased 0002-rc-local-fix-ordering-startup-for-etc-init.d-boot.lo.patch
0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch
- Configure split-usr=true only when %usrmerged is not defined
OBS-URL: https://build.opensuse.org/request/show/915488
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=335
30 lines
1.1 KiB
Diff
30 lines
1.1 KiB
Diff
From ae4741127dc0ae575d13b8a7b201207da6167517 Mon Sep 17 00:00:00 2001
|
|
From: Robert Milasan <rmilasan@suse.com>
|
|
Date: Sat, 12 Jul 2014 14:20:36 +0200
|
|
Subject: [PATCH 05/11] udev: create default symlinks for primary cd_dvd drive
|
|
|
|
Imported from SLE12-SP1, commit 4f8bacfbffd7049608b5076.
|
|
|
|
[rmilasan: fixes bnc#783054]
|
|
---
|
|
rules.d/60-cdrom_id.rules | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/rules.d/60-cdrom_id.rules b/rules.d/60-cdrom_id.rules
|
|
index 288f8ce2f9..578c77441c 100644
|
|
--- a/rules.d/60-cdrom_id.rules
|
|
+++ b/rules.d/60-cdrom_id.rules
|
|
@@ -25,5 +25,9 @@ IMPORT{program}="cdrom_id --lock-media $devnode"
|
|
ENV{DISK_MEDIA_CHANGE}=="?*", ENV{ID_CDROM_MEDIA}!="?*", ENV{SYSTEMD_READY}="0"
|
|
|
|
KERNEL=="sr0", SYMLINK+="cdrom", OPTIONS+="link_priority=-100"
|
|
+KERNEL=="sr0", ENV{ID_CDROM}=="1", SYMLINK+="cdrom", OPTIONS+="link_priority=-100"
|
|
+KERNEL=="sr0", ENV{ID_CDROM_CD_RW}=="1", SYMLINK+="cdrw", OPTIONS+="link_priority=-100"
|
|
+KERNEL=="sr0", ENV{ID_CDROM_DVD}=="1", SYMLINK+="dvd", OPTIONS+="link_priority=-100"
|
|
+KERNEL=="sr0", ENV{ID_CDROM_DVD_RW}=="1", SYMLINK+="dvdrw", OPTIONS+="link_priority=-100"
|
|
|
|
LABEL="cdrom_end"
|
|
--
|
|
2.26.2
|
|
|