Hello community, here is the log from the commit of package sysconfig for openSUSE:12.1:Update:Test checked in at 2012-03-23 14:50:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/sysconfig (Old) and /work/SRC/openSUSE:12.1:Update:Test/.sysconfig.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sysconfig", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:12.1:Update:Test/sysconfig/sysconfig.changes 2012-03-05 14:16:17.000000000 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.sysconfig.new/sysconfig.changes 2012-03-23 14:50:15.000000000 +0100 @@ -1,0 +2,9 @@ +Wed Mar 14 12:41:45 UTC 2012 - [email protected] + +- Added tests to the 77-network.rules rule file if the /sbin/ifup + and /etc/sysconfig/network/scripts/ifup-sysctl exist (bnc#724775), + disabled ipw3945d.sh script run and updated 81-mount.rules file + to work with more actual udev versions. Thanks to Robert Milasan, + who proposed these changes. + +------------------------------------------------------------------ New: ---- 0011-Test-if-scripts-used-in-77-network.rules-exists.patch 0012-Corrected-IMPORT-in-hardware-81-mount.rules.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysconfig.spec ++++++ --- /var/tmp/diff_new_pack.opnqAb/_old 2012-03-23 14:50:15.000000000 +0100 +++ /var/tmp/diff_new_pack.opnqAb/_new 2012-03-23 14:50:15.000000000 +0100 @@ -40,6 +40,8 @@ Patch8: 0008-Disabled-bash-posix-mode-to-allow-bash-features.patch Patch9: 0009-Filter-out-labeled-ipv4-addresses-in-get_ipv4address.patch Patch10: 0010-network-start-fails-under-systemd.test.patch +Patch11: 0011-Test-if-scripts-used-in-77-network.rules-exists.patch +Patch12: 0012-Corrected-IMPORT-in-hardware-81-mount.rules.patch %description This package provides the SuSE system configuration scheme and @@ -69,6 +71,8 @@ %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 +%patch12 -p1 %build autoreconf --force --install ++++++ 0011-Test-if-scripts-used-in-77-network.rules-exists.patch ++++++ >From 8bdf8febc33806a278c79a7a09ecf66dcaa58510 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski <[email protected]> Date: Wed, 14 Mar 2012 13:50:03 +0100 Subject: [PATCH] Test if scripts used in 77-network.rules exists Added tests to the 77-network.rules rule file if the /sbin/ifup and /etc/sysconfig/network/scripts/ifup-sysctl exist (bnc#724775). Also disabled the IMO obsolete ipw3945d.sh script run completely. Thanks to Robert Milasan, who proposed these changes. Signed-off-by: Marius Tomaschewski <[email protected]> --- config/77-network.rules | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/config/77-network.rules b/config/77-network.rules index f86a8e3..56b7927 100644 --- a/config/77-network.rules +++ b/config/77-network.rules @@ -1,11 +1,12 @@ # Driver module ipw3945 requires an userspace daemon to register network -# interfaces. -SUBSYSTEM=="drivers", ACTION=="add", DEVPATH=="/bus/pci/drivers/ipw3945", RUN+="ipw3945d.sh" +# interfaces. +# Commented it out -- looks like something old & obsolete. +#SUBSYSTEM=="drivers", ACTION=="add", DEVPATH=="/bus/pci/drivers/ipw3945", TEST=="ipw3945d.sh", RUN+="ipw3945d.sh" # # Apply per interface sysctl settings before setup (see man 5 ifsysctl): # -SUBSYSTEM=="net", ACTION=="add", RUN+="/etc/sysconfig/network/scripts/ifup-sysctl $env{INTERFACE} -o hotplug" +SUBSYSTEM=="net", ACTION=="add", TEST=="/etc/sysconfig/network/scripts/ifup-sysctl", RUN+="/etc/sysconfig/network/scripts/ifup-sysctl $env{INTERFACE} -o hotplug" # # The following rules are to: @@ -21,6 +22,7 @@ SUBSYSTEM=="net", ACTION=="add", RUN+="/etc/sysconfig/network/scripts/ifup-sysct # We do it here name based for the well known/default interface names, # ifup makes it again by interface type to catch also custom names. # +SUBSYSTEM=="net", TEST!="/sbin/ifup", GOTO="skip_ifup" SUBSYSTEM=="net", ENV{INTERFACE}=="lo*|dummy*|vif*.*|br*|bond*|vlan*|gre*|sit*|tap*|tun*|ipip*|ip6tnl*|ipsec*|ppp*|ippp*|isdn*|modem*|dsl*|plip*|irda*", GOTO="skip_ifup" SUBSYSTEM=="net", ACTION=="add", RUN+="/sbin/ifup $env{INTERFACE} -o hotplug" SUBSYSTEM=="net", ACTION=="remove", RUN+="/sbin/ifdown %k -o hotplug" -- 1.7.7 ++++++ 0012-Corrected-IMPORT-in-hardware-81-mount.rules.patch ++++++ >From 2b58cc51bc593b06fae0201b4f65d7fa9992fc28 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski <[email protected]> Date: Wed, 14 Mar 2012 13:50:53 +0100 Subject: [PATCH] Corrected IMPORT in hardware/81-mount.rules Use IMPORT{program}="udevmountd" instead of IMPORT="udevmountd" as needed by more actual udev versions (>= udev-128, udev-181 does not understand it rules without {program} any more). Thanks to Robert Milasan, who proposed these changes. Signed-off-by: Marius Tomaschewski <[email protected]> --- config/hardware/81-mount.rules | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/config/hardware/81-mount.rules b/config/hardware/81-mount.rules index f04dd8e..4402702 100644 --- a/config/hardware/81-mount.rules +++ b/config/hardware/81-mount.rules @@ -5,7 +5,7 @@ ACTION=="add", SUBSYSTEM=="block", KERNEL=="dm-*", GOTO="skip_mount" ACTION=="add", SUBSYSTEM=="block", KERNEL=="md*", GOTO="skip_mount" # don't handle crypto devices, boot.crypto does that already (bnc#569942) ACTION=="change", SUBSYSTEM=="block", KERNEL=="dm-*", ENV{DM_TARGET_TYPES}=="crypt", GOTO="skip_mount" -ACTION=="add|change", SUBSYSTEM=="block", ENV{FSTAB_OPTS}=="*nofail*", IMPORT="udevmountd" +ACTION=="add|change", SUBSYSTEM=="block", ENV{FSTAB_OPTS}=="*nofail*", IMPORT{program}="udevmountd" ACTION=="add|change", ENV{FSCK_STATE}=="unknown|clean", RUN+="udevmountd add" ACTION=="remove", ENV{FSTAB_OPTS}=="*nofail*", RUN+="udevmountd remove" -- 1.7.7 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
