Hello community,
here is the log from the commit of package mkinitrd for openSUSE:Factory
checked in at Wed Sep 21 17:11:39 CEST 2011.
--------
--- mkinitrd/mkinitrd.changes 2011-09-20 10:43:42.000000000 +0200
+++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes 2011-09-21
10:25:00.000000000 +0200
@@ -1,0 +2,17 @@
+Wed Sep 21 08:19:47 UTC 2011 - mma...@suse.cz
+
+- setup-network: 77-network.rules has moved to /lib/udev/rules.d/
+ (bnc#707855).
+
+-------------------------------------------------------------------
+Wed Sep 21 07:27:32 UTC 2011 - e...@suse.de
+
+- netconsole: Make the setup more robust and add error detection.
+
+-------------------------------------------------------------------
+Tue Sep 20 21:20:09 UTC 2011 - mma...@suse.com
+
+- Add /etc/{protocols,netconfig,services} to the initrd
+ (bnc#714945).
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mkinitrd.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkinitrd-2.7.0/mkinitrd.changes
new/mkinitrd-2.7.0/mkinitrd.changes
--- old/mkinitrd-2.7.0/mkinitrd.changes 2011-09-20 10:42:20.000000000 +0200
+++ new/mkinitrd-2.7.0/mkinitrd.changes 2011-09-21 10:20:18.000000000 +0200
@@ -1,4 +1,21 @@
-------------------------------------------------------------------
+Wed Sep 21 08:19:47 UTC 2011 - mma...@suse.cz
+
+- setup-network: 77-network.rules has moved to /lib/udev/rules.d/
+ (bnc#707855).
+
+-------------------------------------------------------------------
+Wed Sep 21 07:27:32 UTC 2011 - e...@suse.de
+
+- netconsole: Make the setup more robust and add error detection.
+
+-------------------------------------------------------------------
+Tue Sep 20 21:20:09 UTC 2011 - mma...@suse.com
+
+- Add /etc/{protocols,netconfig,services} to the initrd
+ (bnc#714945).
+
+-------------------------------------------------------------------
Tue Sep 20 08:41:54 UTC 2011 - mma...@suse.cz
- purge-kernels: Also handle kernel-source packages (bnc#718753).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/boot-netconsole.sh
new/mkinitrd-2.7.0/scripts/boot-netconsole.sh
--- old/mkinitrd-2.7.0/scripts/boot-netconsole.sh 2011-09-20
10:42:20.000000000 +0200
+++ new/mkinitrd-2.7.0/scripts/boot-netconsole.sh 2011-09-21
10:20:18.000000000 +0200
@@ -23,9 +23,13 @@
# no colon in NETCONSOLE => no port specified => use default
netc_udpport="514" # syslog
fi
-ping -c1 $netc_loghost >/dev/null 2>&1
-netc_lladdr=$(arp $netc_loghost | while read ip type mac o; do [ "$mac" !=
"HWaddress" ] && echo $mac; done)
-netc_ipaddr=$(arp -n | while read ip type mac o; do [ "$mac" == "$netc_lladdr"
] && echo $ip; done)
-echo -e "Netconsole:\tlog to $netc_loghost:$netc_udpport [ $netc_ipaddr /
$netc_lladdr ] via $interface"
+ping -w5 -c1 $netc_loghost >/dev/null 2>&1
+netc_lladdr=$(arp $netc_loghost | while read ip type mac o; do [ "$mac" !=
"HWaddress" -a "$type" != "(incomplete)" ] && { echo $mac; break; }; done)
+if [ "z$netc_lladdr" != "z" ]; then
+ netc_ipaddr=$(arp -n | while read ip type mac o; do [ "$mac" ==
"$netc_lladdr" ] && { echo $ip; break; }; done)
+ echo -e "Netconsole:\tlog to $netc_loghost:$netc_udpport [ $netc_ipaddr /
$netc_lladdr ] via $interface"
-add_module_param netconsole
"netconsole=@/,${netc_udpport}@${netc_ipaddr}/${netc_lladdr}"
+ add_module_param netconsole
"netconsole=@/,${netc_udpport}@${netc_ipaddr}/${netc_lladdr}"
+else
+ echo -e "Cannot configure netconsole: cannot find logging host
$netc_loghost on $interface"
+fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/setup-network.sh
new/mkinitrd-2.7.0/scripts/setup-network.sh
--- old/mkinitrd-2.7.0/scripts/setup-network.sh 2011-09-20 10:42:20.000000000
+0200
+++ new/mkinitrd-2.7.0/scripts/setup-network.sh 2011-09-21 10:20:18.000000000
+0200
@@ -286,9 +286,8 @@
cp /etc/resolv.conf $tmp_mnt/etc
fi
-# Copy /etc/hosts in any case to be able to resolve static host names in the
-# initrd (bnc #468090)
-cp /etc/hosts $tmp_mnt/etc
+# Copy netcfg files (bnc#468090, bnc#714945)
+cp /etc/{hosts,protocols,services,netconfig} $tmp_mnt/etc
# Get static IP configuration if requested
for iface in $static_interfaces; do
@@ -302,14 +301,18 @@
if [ -f /etc/udev/rules.d/70-persistent-net.rules ] ; then
cp /etc/udev/rules.d/70-persistent-net.rules $tmp_mnt/etc/udev/rules.d
fi
-if [ -f /etc/udev/rules.d/77-network.rules ] ; then
- cp /etc/udev/rules.d/77-network.rules $tmp_mnt/etc/udev/rules.d
+for f in /{lib,etc}/udev/rules.d/77-network.rules; do
+ if ! test -e "$f"; then
+ continue
+ fi
+ cp --parents "$f" $tmp_mnt/
cp_bin /sbin/ifup $tmp_mnt/sbin/ifup
cp_bin /bin/awk $tmp_mnt/bin/awk
cp_bin /bin/grep $tmp_mnt/bin/grep
cp_bin /bin/logger $tmp_mnt/bin/logger
cp_bin /bin/touch $tmp_mnt/bin/touch
-fi
+ break
+done
test -n "$static_interfaces" && verbose "[NETWORK]\tstatic: $static_interfaces"
test -n "$dhcp_interfaces" && verbose "[NETWORK]\tdynamic: $dhcp_interfaces"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
