Mailinglist Archive: opensuse-commit (1942 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package mkinitrd
checked in at Tue Nov 25 09:34:47 CET 2008.


--------
--- mkinitrd/mkinitrd.changes   2008-11-24 16:51:05.000000000 +0100
+++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes      2008-11-25 
09:17:47.000000000 +0100
@@ -1,0 +2,6 @@
+Tue Nov 25 08:54:55 CET 2008 - hare@xxxxxxx
+
+- Fix syntax error in modules script (bnc#448511)
+- Setup network devices correctly (bnc#448395)
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


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

Other differences:
------------------
++++++ mkinitrd.spec ++++++
--- /var/tmp/diff_new_pack.O32334/_old  2008-11-25 09:34:06.000000000 +0100
+++ /var/tmp/diff_new_pack.O32334/_new  2008-11-25 09:34:06.000000000 +0100
@@ -25,7 +25,7 @@
 Requires:       coreutils modutils util-linux grep gzip sed cpio udev sysvinit 
file perl-Bootloader
 AutoReqProv:    on
 Version:        2.4
-Release:        30
+Release:        31
 Conflicts:      udev < 118
 Requires:       dhcpcd
 Summary:        Creates an Initial RAM Disk Image for Preloading Modules
@@ -112,6 +112,9 @@
 %doc %{_mandir}/man8/lsinitrd.8.gz
 
 %changelog
+* Tue Nov 25 2008 hare@xxxxxxx
+- Fix syntax error in modules script (bnc#448511)
+- Setup network devices correctly (bnc#448395)
 * Mon Nov 24 2008 hare@xxxxxxx
 - Fix syntax error in network script (bnc#448241)
 * Mon Nov 24 2008 hare@xxxxxxx

++++++ mkinitrd.tgz ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/mkinitrd-2.4/mkinitrd.changes 
new/mkinitrd-2.4/mkinitrd.changes
--- old/mkinitrd-2.4/mkinitrd.changes   2008-11-24 16:50:42.000000000 +0100
+++ new/mkinitrd-2.4/mkinitrd.changes   2008-11-25 09:16:47.000000000 +0100
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Tue Nov 25 08:54:55 CET 2008 - hare@xxxxxxx
+
+- Fix syntax error in modules script (bnc#448511)
+- Setup network devices correctly (bnc#448395)
+
+-------------------------------------------------------------------
 Mon Nov 24 16:45:34 CET 2008 - hare@xxxxxxx
 
 - Fix syntax error in network script (bnc#448241)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/mkinitrd-2.4/scripts/boot-network.sh 
new/mkinitrd-2.4/scripts/boot-network.sh
--- old/mkinitrd-2.4/scripts/boot-network.sh    2008-11-24 16:50:42.000000000 
+0100
+++ new/mkinitrd-2.4/scripts/boot-network.sh    2008-11-25 09:16:47.000000000 
+0100
@@ -23,18 +23,20 @@
 
 # mac address based config
 if [ "$macaddress" ] ; then
-    nettype=${ip##*:}
-    ip=${ip%:*}
-    interface=${ip##*:}
-    tmpip=${ip%:*}
     for dev in /sys/class/net/* ; do
       read tmpmac < $dev/address
       if [ "$tmpmac" == "$macaddress" ] ; then
         interface=${dev##*/}
-        echo "using interface $interface"
+        echo "[NETWORK] using interface $interface"
       fi
     done
-    ip="${tmpip}:${interface}:${nettype}"
+    if [ "$ip" ] ; then
+       nettype=${ip##*:}
+       ip=${ip%:*}
+       interface=${ip##*:}
+       tmpip=${ip%:*}
+       ip="${tmpip}:${interface}:${nettype}"
+    fi
 fi
 
 if [ "$nfsaddrs" -a ! "$(get_param ip)" ]; then 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/mkinitrd-2.4/scripts/setup-modules.sh 
new/mkinitrd-2.4/scripts/setup-modules.sh
--- old/mkinitrd-2.4/scripts/setup-modules.sh   2008-11-24 16:50:42.000000000 
+0100
+++ new/mkinitrd-2.4/scripts/setup-modules.sh   2008-11-25 09:16:47.000000000 
+0100
@@ -49,7 +49,6 @@
        if [ ! "$module_list" ]; then
            echo \
 "WARNING: no dependencies for kernel module '$module' found." >&2
-           fi
        fi
        for mod in $module_list ; do
            if ! $(echo $resolved_modules | grep -q $mod) ; then


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



Remember to have fun...

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