rpm/systemd
SHA256
1
0
Fork 0
forked from pool/systemd
Code Pull Requests Activity

Accepting request 180966 from Base:System

Browse Source 
- Drop 1007-add-msft-compability-rules.patch, breaks boot and links
  in /dev/disk/by-id, will need proper rework (bnc#826528).

- 0160-mount-when-learning-about-the-root-mount-from-mounti.patch Another
  case where we are trying to umount the root directory at shutdown.
- 0185-core-only-attempt-to-connect-to-a-session-bus-if-one.patch
  only attempt to connect to a session bus if one likely exists
- Drop 1007-add-msft-compability-rules.patch, breaks boot and links
  in /dev/disk/by-id, will need proper rework (bnc#826528).

- 0160-mount-when-learning-about-the-root-mount-from-mounti.patch Another
  case where we are trying to umount the root directory at shutdown.
- 0185-core-only-attempt-to-connect-to-a-session-bus-if-one.patch
  only attempt to connect to a session bus if one likely exists (forwarded request 180965 from rmilasan)

OBS-URL: https://build.opensuse.org/request/show/180966
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=148
This commit is contained in:
Stephan Kulow 2013-06-26 09:08:48 +00:00 committed by Git OBS Bridge
commit 391b8fbb9a
6 changed files with 39 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
1007-add-msft-compability-rules.patch
View File

@ -1,29 +0,0 @@
Index: systemd-204/Makefile.am
===================================================================
--- systemd-204.orig/Makefile.am
+++ systemd-204/Makefile.am
@@ -2238,6 +2238,10 @@ dist_udevrules_DATA += \
rules/73-seat-numlock.rules
# ------------------------------------------------------------------------------
+dist_udevrules_DATA += \
+ rules/61-msft.rules
+
+# ------------------------------------------------------------------------------
if ENABLE_GUDEV
if ENABLE_GTK_DOC
SUBDIRS += \
Index: systemd-204/rules/61-msft.rules
===================================================================
--- /dev/null
+++ systemd-204/rules/61-msft.rules
@@ -0,0 +1,9 @@
+# MSFT compability rules
+ACTION!="add|change", GOTO="msft_end"
+
+ENV{DEVTYPE}=="partition", IMPORT{parent}="SCSI_IDENT_*"
+KERNEL=="sd*[!0-9]|sr*", ENV{SCSI_IDENT_LUN_T10}!="?*", IMPORT{program}="/usr/bin/sg_inq -p di --export $tempnode", ENV{ID_BUS}="scsi"
+KERNEL=="sd*|sr*", ENV{DEVTYPE}=="disk", ENV{SCSI_IDENT_LUN_T10}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-1$env{SCSI_IDENT_LUN_T10}"
+KERNEL=="sd*", ENV{DEVTYPE}=="partition", ENV{SCSI_IDENT_LUN_T10}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-1$env{SCSI_IDENT_LUN_T10}-part%n"
+
+LABEL="msft_end"

30
1008-physical-hotplug-cpu-and-memory.patch → 1007-physical-hotplug-cpu-and-memory.patch
View File

@ -1,18 +1,3 @@
Index: systemd-204/Makefile.am
===================================================================
--- systemd-204.orig/Makefile.am
+++ systemd-204/Makefile.am
@@ -2242,6 +2242,10 @@ dist_udevrules_DATA += \
rules/61-msft.rules
# ------------------------------------------------------------------------------
+dist_udevrules_DATA += \
+ rules/80-hotplug-cpu-mem.rules
+
+# ------------------------------------------------------------------------------
if ENABLE_GUDEV
if ENABLE_GTK_DOC
SUBDIRS += \
Index: systemd-204/rules/80-hotplug-cpu-mem.rules
===================================================================
--- /dev/null
@ -27,3 +12,18 @@ Index: systemd-204/rules/80-hotplug-cpu-mem.rules
+# Hotplug physical memory
+SUBSYSTEM=="memory", ACTION=="add", TEST=="state", ATTR{state}=="offline", \
+ ATTR{state}="online"
Index: systemd-204/Makefile.am
===================================================================
--- systemd-204.orig/Makefile.am
+++ systemd-204/Makefile.am
@@ -2238,6 +2238,10 @@ dist_udevrules_DATA += \
rules/73-seat-numlock.rules
# ------------------------------------------------------------------------------
+dist_udevrules_DATA += \
+ rules/80-hotplug-cpu-mem.rules
+
+# ------------------------------------------------------------------------------
if ENABLE_GUDEV
if ENABLE_GTK_DOC
SUBDIRS += \

12
systemd-mini.changes
View File

@ -1,9 +1,15 @@
-------------------------------------------------------------------
Wed Jun 26 08:51:29 UTC 2013 - rmilasan@suse.com
- Drop 1007-add-msft-compability-rules.patch, breaks boot and links
in /dev/disk/by-id, will need proper rework (bnc#826528).
-------------------------------------------------------------------
Mon Jun 24 00:15:24 UTC 2013 - crrodriguez@opensuse.org
-0160-mount-when-learning-about-the-root-mount-from-mounti.patch Another case where
we are trying to umount the root directory at shutdown.
-0185-core-only-attempt-to-connect-to-a-session-bus-if-one.patch
- 0160-mount-when-learning-about-the-root-mount-from-mounti.patch Another
case where we are trying to umount the root directory at shutdown.
- 0185-core-only-attempt-to-connect-to-a-session-bus-if-one.patch
only attempt to connect to a session bus if one likely exists
-------------------------------------------------------------------

7
systemd-mini.spec
View File

@ -199,10 +199,8 @@ Patch1004: 1004-fix-devname-prefix.patch
Patch1005: 1005-create-default-links-for-primary-cd_dvd-drive.patch
# PATCH-FIX-OPENSUSE 1006-udev-always-rename-network.patch
Patch1006: 1006-udev-always-rename-network.patch
# PATCH-FIX-OPENSUSE 1007-add-msft-compability-rules.patch
Patch1007: 1007-add-msft-compability-rules.patch
# PATCH-FIX-OPENSUSE 1008-physical-hotplug-cpu-and-memory.patch
Patch1008: 1008-physical-hotplug-cpu-and-memory.patch
# PATCH-FIX-OPENSUSE 1007-physical-hotplug-cpu-and-memory.patch
Patch1007: 1007-physical-hotplug-cpu-and-memory.patch
%description
Systemd is a system and service manager, compatible with SysV and LSB
@ -437,7 +435,6 @@ cp %{SOURCE7} m4/
# don't apply when bootstrapping to not modify Makefile.am
%if ! 0%{?bootstrap}
%patch1007 -p1
%patch1008 -p1
%endif
%build

12
systemd.changes
View File

@ -1,9 +1,15 @@
-------------------------------------------------------------------
Wed Jun 26 08:51:29 UTC 2013 - rmilasan@suse.com
- Drop 1007-add-msft-compability-rules.patch, breaks boot and links
in /dev/disk/by-id, will need proper rework (bnc#826528).
-------------------------------------------------------------------
Mon Jun 24 00:15:24 UTC 2013 - crrodriguez@opensuse.org
-0160-mount-when-learning-about-the-root-mount-from-mounti.patch Another case where
we are trying to umount the root directory at shutdown.
-0185-core-only-attempt-to-connect-to-a-session-bus-if-one.patch
- 0160-mount-when-learning-about-the-root-mount-from-mounti.patch Another
case where we are trying to umount the root directory at shutdown.
- 0185-core-only-attempt-to-connect-to-a-session-bus-if-one.patch
only attempt to connect to a session bus if one likely exists
-------------------------------------------------------------------

7
systemd.spec
View File

@ -194,10 +194,8 @@ Patch1004: 1004-fix-devname-prefix.patch
Patch1005: 1005-create-default-links-for-primary-cd_dvd-drive.patch
# PATCH-FIX-OPENSUSE 1006-udev-always-rename-network.patch
Patch1006: 1006-udev-always-rename-network.patch
# PATCH-FIX-OPENSUSE 1007-add-msft-compability-rules.patch
Patch1007: 1007-add-msft-compability-rules.patch
# PATCH-FIX-OPENSUSE 1008-physical-hotplug-cpu-and-memory.patch
Patch1008: 1008-physical-hotplug-cpu-and-memory.patch
# PATCH-FIX-OPENSUSE 1007-physical-hotplug-cpu-and-memory.patch
Patch1007: 1007-physical-hotplug-cpu-and-memory.patch
%description
Systemd is a system and service manager, compatible with SysV and LSB
@ -432,7 +430,6 @@ cp %{SOURCE7} m4/
# don't apply when bootstrapping to not modify Makefile.am
%if ! 0%{?bootstrap}
%patch1007 -p1
%patch1008 -p1
%endif
%build