Mailinglist Archive: opensuse-commit (910 mails)

< Previous Next >
commit sysconfig for openSUSE:Factory
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Mon, 02 Mar 2009 15:55:41 +0100
  • Message-id: <20090302145541.89221678091@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package sysconfig for openSUSE:Factory
checked in at Mon Mar 2 15:55:41 CET 2009.


--------
--- sysconfig/sysconfig.changes 2009-02-20 15:01:33.000000000 +0100
+++ /mounts/work_src_done/STABLE/sysconfig/sysconfig.changes 2009-02-26
15:59:13.000000000 +0100
@@ -1,0 +2,17 @@
+Thu Feb 26 15:58:54 CET 2009 - hare@xxxxxxx
+
+- ctc device has been renamed to ctcm (bnc#440570)
+
+-------------------------------------------------------------------
+Wed Feb 25 09:47:17 CET 2009 - mt@xxxxxxx
+
+- Fixed to use exact match for networkmanager generation info
+ comment in the resolv.conf to avoid discarding of static dns
+ setup on update (bnc#471785).
+
+-------------------------------------------------------------------
+Mon Feb 23 10:25:53 CET 2009 - ihno@xxxxxxx
+
+- Blacklist chsc_sch module (bnc#478601)
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
sysconfig-blacklist-chsc_sch.diff
sysconfig-convert-dns-networkmanager-info.bnc471785.diff
sysconfig-hwcfg2rules-ctc-module-rename

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ sysconfig.spec ++++++
--- /var/tmp/diff_new_pack.O10009/_old 2009-03-02 15:55:32.000000000 +0100
+++ /var/tmp/diff_new_pack.O10009/_new 2009-03-02 15:55:32.000000000 +0100
@@ -20,7 +20,7 @@

Name: sysconfig
Version: 0.71.14
-Release: 10
+Release: 13
Summary: The sysconfig scheme
Group: System/Base
License: GPL v2 or later
@@ -37,6 +37,9 @@
Patch5: sysconfig-create-automount-iscsi-blkdev.bnc457252.diff
Patch6: sysconfig-ifup-dhcp-status-code.bnc460093.diff
Patch7: sysconfig-hwcfg2rules-iucv-sbin-modprobe.bnc440570.diff
+Patch8: sysconfig-blacklist-chsc_sch.diff
+Patch9: sysconfig-convert-dns-networkmanager-info.bnc471785.diff
+Patch10: sysconfig-hwcfg2rules-ctc-module-rename

%description
This package provides the SuSE system configuration scheme.
@@ -64,6 +67,9 @@
%patch5 -p1
%patch6 -p0
%patch7 -p0
+%patch8 -p0
+%patch9 -p0
+%patch10 -p1

%build
autoreconf --force --install
@@ -263,6 +269,14 @@
%{stop_on_removal network}

%changelog
+* Thu Feb 26 2009 hare@xxxxxxx
+- ctc device has been renamed to ctcm (bnc#440570)
+* Wed Feb 25 2009 mt@xxxxxxx
+- Fixed to use exact match for networkmanager generation info
+ comment in the resolv.conf to avoid discarding of static dns
+ setup on update (bnc#471785).
+* Mon Feb 23 2009 ihno@xxxxxxx
+- Blacklist chsc_sch module (bnc#478601)
* Fri Feb 20 2009 mt@xxxxxxx
- Fixed to use absolute /sbin/modprobe in iucv rule (bnc#440570).
* Fri Feb 20 2009 mt@xxxxxxx

++++++ sysconfig-blacklist-chsc_sch.diff ++++++
--- config/hardware/blacklist
+++ config/hardware/blacklist
@@ -216,3 +216,7 @@
# is loaded first it will grab the device. Then intel-agp doesn't work.
# Therefore we disable automatic loading of 82875p_edac. (Bug 213840)
blacklist i82875p_edac
+#
+# Blacklist the IBM s390 module for I/O dynamic configuration support
+# Bug bnc#478601
+blacklist chsc_sch
++++++ sysconfig-convert-dns-networkmanager-info.bnc471785.diff ++++++
--- scripts/convert_to_netconfig_dns
+++ scripts/convert_to_netconfig_dns 2009/02/25 08:45:04
@@ -72,7 +72,7 @@

has_networkmanager_info()
{
- test -n "$1" -a -f "$1" && grep -qs '#.*NetworkManager' "$1" 2>/dev/null
+ test -n "$1" -a -f "$1" && grep -qs '^# generated by NetworkManager'
"$1" 2>/dev/null
}

has_netconfig_info()
++++++ sysconfig-hwcfg2rules-ctc-module-rename ++++++
Index: sysconfig-0.71.14/scripts/hardware/hwcfg2rules
===================================================================
--- sysconfig-0.71.14.orig/scripts/hardware/hwcfg2rules
+++ sysconfig-0.71.14/scripts/hardware/hwcfg2rules
@@ -49,24 +49,24 @@ EOF
}

write_ctc_rules () {
- local file=$UDEVDIR/$RULE-$type-${busid}.rules
+ local file=$UDEVDIR/$RULE-$subtype-${busid}.rules
local attr

echo "# Rules converted from $cfgname" > $file
- cat >> $file <<EOF
-ACTION=="add", SUBSYSTEM=="drivers", KERNEL=="$ccwtype",
IMPORT{program}="collect $busid %k $CCW_CHAN_IDS $ccwtype"
-EOF
for chan in $CCW_CHAN_IDS ; do
cat >> $file <<EOF
-ACTION=="add", SUBSYSTEM=="$bus", KERNEL=="$chan", RUN+="/sbin/modprobe
--quiet $MODULE"
-ACTION=="add", SUBSYSTEM=="$bus", KERNEL=="$chan", IMPORT{program}="collect
$busid %k $CCW_CHAN_IDS $ccwtype"
+ACTION=="add", SUBSYSTEM=="$bus", KERNEL=="$chan", RUN+="/sbin/modprobe
--quiet $subtype"
+ACTION=="add", SUBSYSTEM=="$bus", KERNEL=="$chan", IMPORT{program}="collect
$busid %k $CCW_CHAN_IDS $subtype"
EOF
done
+ cat >> $file <<EOF
+ACTION=="add", SUBSYSTEM=="drivers", KERNEL=="$subtype",
IMPORT{program}="collect $busid %k $CCW_CHAN_IDS $subtype"
+EOF
attr=$(echo $CCW_CHAN_IDS | sed 's/ /,/g')
cat >> $file <<EOF
-TEST=="[ccwgroup/$busid]", GOTO="$type-${busid}_end"
-ACTION=="add", SUBSYSTEM=="$bus", ENV{COLLECT_$busid}=="0",
ATTR{[drivers/ccwgroup:$type]group}="$attr"
-ACTION=="add", SUBSYSTEM=="drivers", KERNEL=="$ccwtype",
ENV{COLLECT_$busid}=="0", ATTR{[drivers/ccwgroup:$type]group}="$attr"
+TEST=="[ccwgroup/$busid]", GOTO="$type-${busid}-end"
+ACTION=="add", SUBSYSTEM=="$bus", ENV{COLLECT_$busid}=="0",
ATTR{[drivers/ccwgroup:$subtype]group}="$attr"
+ACTION=="add", SUBSYSTEM=="drivers", KERNEL=="$subtype",
ENV{COLLECT_$busid}=="0", ATTR{group}="$attr"
EOF
if [ "$CCW_CHAN_MODE" -ne 0 ] ; then
cat >> $file <<EOF
@@ -74,7 +74,7 @@ ACTION=="add", SUBSYSTEM=="ccwgroup", KE
EOF
fi
cat >> $file <<EOF
-LABEL="$type-${busid}_end"
+LABEL="$type-${busid}-end"
ACTION=="add", SUBSYSTEM=="ccwgroup", KERNEL=="$busid", ATTR{online}="1"
EOF
}
@@ -222,19 +222,19 @@ if [ "$bus" = "ccw" ] ; then
3088/08)
# Channel To Channel
ccwtype="cu3088"
- subtype="ctc"
+ subtype="ctcm"
CCW_CHAN_NUM=2
;;
3088/1e)
# FICON adapter
ccwtype="cu3088"
- subtype="ctc"
+ subtype="ctcm"
CCW_CHAN_NUM=2
;;
3088/1f)
# ESCON adapter (I.e. hardware CTC device)
ccwtype="cu3088"
- subtype="ctc"
+ subtype="ctcm"
CCW_CHAN_NUM=2
;;
3088/60)

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread