Hello community, here is the log from the commit of package mkinitrd for openSUSE:Factory checked in at Wed Mar 31 18:52:54 CEST 2010. -------- --- mkinitrd/mkinitrd.changes 2010-03-25 14:59:28.000000000 +0100 +++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes 2010-03-26 15:43:16.000000000 +0100 @@ -1,0 +2,12 @@ +Fri Mar 26 15:25:22 CET 2010 - mmarek@suse.cz + +- setup-storage: Do not assume that anything that contains a colon + is nfs (bnc#590135). + +------------------------------------------------------------------- +Fri Mar 26 14:34:47 CET 2010 - mmarek@suse.cz + +- setup-start: include /etc/sysconfig/kernel early enough + (bnc#591398, bnc#591400). + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.YiGeYl/_old 2010-03-31 18:50:25.000000000 +0200 +++ /var/tmp/diff_new_pack.YiGeYl/_new 2010-03-31 18:50:25.000000000 +0200 @@ -31,7 +31,7 @@ %endif AutoReqProv: on Version: 2.5.10 -Release: 14 +Release: 15 Conflicts: udev < 118 Requires: dhcpcd Summary: Creates an Initial RAM Disk Image for Preloading Modules ++++++ mkinitrd.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.5.10/mkinitrd.changes new/mkinitrd-2.5.10/mkinitrd.changes --- old/mkinitrd-2.5.10/mkinitrd.changes 2010-03-25 14:36:03.000000000 +0100 +++ new/mkinitrd-2.5.10/mkinitrd.changes 2010-03-26 15:30:24.000000000 +0100 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Fri Mar 26 15:25:22 CET 2010 - mmarek@suse.cz + +- setup-storage: Do not assume that anything that contains a colon + is nfs (bnc#590135). + +------------------------------------------------------------------- +Fri Mar 26 14:34:47 CET 2010 - mmarek@suse.cz + +- setup-start: include /etc/sysconfig/kernel early enough + (bnc#591398, bnc#591400). + +------------------------------------------------------------------- Thu Mar 25 14:35:24 CET 2010 - mmarek@suse.cz - setup-block: catch "(null)" in /sys/class/scsi_host/*/proc_name diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.5.10/scripts/setup-kms.sh new/mkinitrd-2.5.10/scripts/setup-kms.sh --- old/mkinitrd-2.5.10/scripts/setup-kms.sh 2010-03-25 14:36:03.000000000 +0100 +++ new/mkinitrd-2.5.10/scripts/setup-kms.sh 2010-03-26 15:30:24.000000000 +0100 @@ -1,7 +1,7 @@ #!/bin/bash # #%stage: setup -#%depends: prepare +#%depends: start DRIVERS="i915" supported_classes="0300" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.5.10/scripts/setup-start.sh new/mkinitrd-2.5.10/scripts/setup-start.sh --- old/mkinitrd-2.5.10/scripts/setup-start.sh 2010-03-25 14:36:03.000000000 +0100 +++ new/mkinitrd-2.5.10/scripts/setup-start.sh 2010-03-26 15:30:24.000000000 +0100 @@ -25,15 +25,13 @@ # Set in the mkinitrd script save_var build_day +# get variables INITRD_MODULES, DOMU_INITRD_MODULES etc. from configuration +. $root_dir/etc/sysconfig/kernel if [ -z "$param_m" ]; then - # get INITRD_MODULES from system configuration - . $root_dir/etc/sysconfig/kernel modules="$INITRD_MODULES" fi if [ -z "$param_u" ]; then - # get DOMU_INITRD_MODULES from system configuration - . $root_dir/etc/sysconfig/kernel domu_modules="$DOMU_INITRD_MODULES" fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.5.10/scripts/setup-storage.sh new/mkinitrd-2.5.10/scripts/setup-storage.sh --- old/mkinitrd-2.5.10/scripts/setup-storage.sh 2010-03-25 14:36:03.000000000 +0100 +++ new/mkinitrd-2.5.10/scripts/setup-storage.sh 2010-03-26 15:30:24.000000000 +0100 @@ -308,6 +308,8 @@ rootfstype=${rootdev%%://*} interface=${interface:-default} ;; + scsi:*) + ;; *:*) rootfstype=nfs interface=${interface:-default} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org