dirkmueller/systemd
SHA256
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=715
This commit is contained in:
Dr. Werner Fink 2014-07-14 15:05:04 +00:00 committed by Git OBS Bridge
parent ce279d0b30
commit 5449275070
6 changed files with 46 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
1007-physical-hotplug-cpu-and-memory.patch
View File

@ -1,6 +1,6 @@
--- /dev/null --- systemd-210/rules/80-hotplug-cpu-mem.rules
+++ systemd-206/rules/80-hotplug-cpu-mem.rules +++ systemd-210/rules/80-hotplug-cpu-mem.rules 2014-05-21 15:47:01.885605543 +0000
@@ -0,0 +1,9 @@ @@ -0,0 +1,12 @@
+# do not edit this file, it will be overwritten on update +# do not edit this file, it will be overwritten on update
+ +
+# Hotplug physical CPU +# Hotplug physical CPU
@ -9,9 +9,12 @@
+ +
+# Hotplug physical memory +# Hotplug physical memory
+SUBSYSTEM=="memory", ACTION=="add", TEST=="state", ATTR{state}=="offline", \ +SUBSYSTEM=="memory", ACTION=="add", TEST=="state", ATTR{state}=="offline", \
+ ATTR{state}="online" + ATTR{state}="online", TAG+="tmpfs"
--- systemd-206.orig/Makefile.am +
+++ systemd-206/Makefile.am +#
+TAG=="tmpfs", RUN+="/usr/lib/udev/remount-tmpfs"
--- systemd-210/Makefile.am
+++ systemd-210/Makefile.am
@@ -2480,6 +2480,10 @@ dist_udevrules_DATA += \ @@ -2480,6 +2480,10 @@ dist_udevrules_DATA += \
rules/73-seat-numlock.rules rules/73-seat-numlock.rules

8
systemd-mini.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Jul 14 14:53:21 UTC 2014 - werner@suse.de
- Update patch
1007-physical-hotplug-cpu-and-memory.patch (bnc#869603)
- Add script systemd-remount-tmpfs (bnc#869603) as helper script
for the rule changed in patch 1007-physical-hotplug-cpu-and-memory.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jul 14 11:43:12 UTC 2014 - werner@suse.de Mon Jul 14 11:43:12 UTC 2014 - werner@suse.de

3
systemd-mini.spec
View File

@ -182,6 +182,7 @@ Source1061: write_dev_root_rule
Source1062: systemd-udev-root-symlink Source1062: systemd-udev-root-symlink
Source1063: udev-generate-peristent-rule.sh Source1063: udev-generate-peristent-rule.sh
Source1064: systemd-sleep-grub Source1064: systemd-sleep-grub
Source1065: systemd-remount-tmpfs
# #
# PATCH-FIX-UPSTREAM avoid-assertion-if-invalid-address-familily-is-passed-to-g.patch lnussel@suse.com bnc#791101 -- avoid assertion if invalid address familily is passed to gethostbyaddr_r # PATCH-FIX-UPSTREAM avoid-assertion-if-invalid-address-familily-is-passed-to-g.patch lnussel@suse.com bnc#791101 -- avoid assertion if invalid address familily is passed to gethostbyaddr_r
@ -1523,6 +1524,7 @@ sed -ie "s|@@PREFIX@@|%{_prefix}/lib/udev|g" %{S:1062}
install -m644 -D %{S:1062} %{buildroot}/%{_prefix}/lib/systemd/system/systemd-udev-root-symlink.service install -m644 -D %{S:1062} %{buildroot}/%{_prefix}/lib/systemd/system/systemd-udev-root-symlink.service
install -m755 -D %{S:1063} %{buildroot}/%{_prefix}/lib/udev/udev-generate-peristent-rule install -m755 -D %{S:1063} %{buildroot}/%{_prefix}/lib/udev/udev-generate-peristent-rule
install -m755 -D %{S:1064} %{buildroot}/%{_bindir}/systemd-sleep-grub install -m755 -D %{S:1064} %{buildroot}/%{_bindir}/systemd-sleep-grub
install -m755 -D %{S:1065} %{buildroot}/%{_prefix}/lib/udev/remount-tmpfs
mkdir -p %{buildroot}/%{_prefix}/lib/systemd/system/basic.target.wants mkdir -p %{buildroot}/%{_prefix}/lib/systemd/system/basic.target.wants
ln -sf ../systemd-udev-root-symlink.service %{buildroot}/%{_prefix}/lib/systemd/system/basic.target.wants ln -sf ../systemd-udev-root-symlink.service %{buildroot}/%{_prefix}/lib/systemd/system/basic.target.wants
rm -rf %{buildroot}%{_sysconfdir}/rpm rm -rf %{buildroot}%{_sysconfdir}/rpm
@ -2225,6 +2227,7 @@ exit 0
%{_prefix}/lib/udev/write_dev_root_rule %{_prefix}/lib/udev/write_dev_root_rule
%{_prefix}/lib/udev/udev-generate-peristent-rule %{_prefix}/lib/udev/udev-generate-peristent-rule
%{_prefix}/lib/udev/net-set-sriov-names %{_prefix}/lib/udev/net-set-sriov-names
%{_prefix}/lib/udev/remount-tmpfs
%{_prefix}/lib/udev/rule_generator.functions %{_prefix}/lib/udev/rule_generator.functions
%{_prefix}/lib/udev/write_net_rules %{_prefix}/lib/udev/write_net_rules
%dir %{_prefix}/lib/udev/rules.d/ %dir %{_prefix}/lib/udev/rules.d/

15
systemd-remount-tmpfs Normal file
View File

@ -0,0 +1,15 @@
#!/bin/sh
PATH=/usr/bin:/bin:/usr/sbin:/sbin
DIR=$(sed -rn '/^#/d;\@^[[:graph:]]+[[:space:]]+/[[:graph:]]+[[:space:]]+tmpfs[[:space:]]+.*size=[0-9]+[kmg,[:space:]]@{ s@^[[:graph:]]+[[:space:]]+(/[[:graph:]]+).*@\1@p }' /etc/fstab)
if [ -n "$DIR" ]; then
for i in $DIR; do
echo $i
mount -o remount "$i" >/dev/null 2>&1
STATE=$?
if [ "$STATE" -gt 0 ]; then
logger "Remount of $i failed with state $STATE"
fi
done
fi

8
systemd.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Jul 14 14:53:21 UTC 2014 - werner@suse.de
- Update patch
1007-physical-hotplug-cpu-and-memory.patch (bnc#869603)
- Add script systemd-remount-tmpfs (bnc#869603) as helper script
for the rule changed in patch 1007-physical-hotplug-cpu-and-memory.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jul 14 11:43:12 UTC 2014 - werner@suse.de Mon Jul 14 11:43:12 UTC 2014 - werner@suse.de

3
systemd.spec
View File

@ -177,6 +177,7 @@ Source1061: write_dev_root_rule
Source1062: systemd-udev-root-symlink Source1062: systemd-udev-root-symlink
Source1063: udev-generate-peristent-rule.sh Source1063: udev-generate-peristent-rule.sh
Source1064: systemd-sleep-grub Source1064: systemd-sleep-grub
Source1065: systemd-remount-tmpfs
# #
# PATCH-FIX-UPSTREAM avoid-assertion-if-invalid-address-familily-is-passed-to-g.patch lnussel@suse.com bnc#791101 -- avoid assertion if invalid address familily is passed to gethostbyaddr_r # PATCH-FIX-UPSTREAM avoid-assertion-if-invalid-address-familily-is-passed-to-g.patch lnussel@suse.com bnc#791101 -- avoid assertion if invalid address familily is passed to gethostbyaddr_r
@ -1518,6 +1519,7 @@ sed -ie "s|@@PREFIX@@|%{_prefix}/lib/udev|g" %{S:1062}
install -m644 -D %{S:1062} %{buildroot}/%{_prefix}/lib/systemd/system/systemd-udev-root-symlink.service install -m644 -D %{S:1062} %{buildroot}/%{_prefix}/lib/systemd/system/systemd-udev-root-symlink.service
install -m755 -D %{S:1063} %{buildroot}/%{_prefix}/lib/udev/udev-generate-peristent-rule install -m755 -D %{S:1063} %{buildroot}/%{_prefix}/lib/udev/udev-generate-peristent-rule
install -m755 -D %{S:1064} %{buildroot}/%{_bindir}/systemd-sleep-grub install -m755 -D %{S:1064} %{buildroot}/%{_bindir}/systemd-sleep-grub
install -m755 -D %{S:1065} %{buildroot}/%{_prefix}/lib/udev/remount-tmpfs
mkdir -p %{buildroot}/%{_prefix}/lib/systemd/system/basic.target.wants mkdir -p %{buildroot}/%{_prefix}/lib/systemd/system/basic.target.wants
ln -sf ../systemd-udev-root-symlink.service %{buildroot}/%{_prefix}/lib/systemd/system/basic.target.wants ln -sf ../systemd-udev-root-symlink.service %{buildroot}/%{_prefix}/lib/systemd/system/basic.target.wants
rm -rf %{buildroot}%{_sysconfdir}/rpm rm -rf %{buildroot}%{_sysconfdir}/rpm
@ -2220,6 +2222,7 @@ exit 0
%{_prefix}/lib/udev/write_dev_root_rule %{_prefix}/lib/udev/write_dev_root_rule
%{_prefix}/lib/udev/udev-generate-peristent-rule %{_prefix}/lib/udev/udev-generate-peristent-rule
%{_prefix}/lib/udev/net-set-sriov-names %{_prefix}/lib/udev/net-set-sriov-names
%{_prefix}/lib/udev/remount-tmpfs
%{_prefix}/lib/udev/rule_generator.functions %{_prefix}/lib/udev/rule_generator.functions
%{_prefix}/lib/udev/write_net_rules %{_prefix}/lib/udev/write_net_rules
%dir %{_prefix}/lib/udev/rules.d/ %dir %{_prefix}/lib/udev/rules.d/