Hello community, here is the log from the commit of package mkinitrd for openSUSE:Factory checked in at Fri Mar 5 09:56:47 CET 2010. -------- --- mkinitrd/mkinitrd.changes 2010-02-16 16:42:05.000000000 +0100 +++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes 2010-03-03 21:49:40.000000000 +0100 @@ -1,0 +2,25 @@ +Wed Mar 3 21:45:06 CET 2010 - eich@novell.com + +- scripts/setup-kms.sh: Fix for shopt -s nocasematch (bnc#566624). + +------------------------------------------------------------------- +Wed Mar 3 15:10:42 CET 2010 - mmarek@suse.cz + +- Require sysvinit on older dists + +------------------------------------------------------------------- +Wed Mar 3 13:23:31 UTC 2010 - coolo@novell.com + +- do not require sysvinit but the tools and sbin_init + +------------------------------------------------------------------- +Wed Feb 17 13:33:55 CET 2010 - mmarek@suse.cz + +- scripts/boot-mount.sh: Fix fsck progressbar (bnc#564325). + +------------------------------------------------------------------- +Wed Feb 17 12:13:10 CET 2010 - mmarek@suse.cz + +- Update the URL in the specfile. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.auqDhV/_old 2010-03-05 09:55:21.000000000 +0100 +++ /var/tmp/diff_new_pack.auqDhV/_new 2010-03-05 09:55:21.000000000 +0100 @@ -23,16 +23,21 @@ Group: System/Base #!BuildIgnore: module-init-tools e2fsprogs udev reiserfs fop BuildRequires: asciidoc libxslt -Requires: coreutils modutils util-linux grep gzip sed cpio udev sysvinit file perl-Bootloader +Requires: coreutils modutils util-linux grep gzip sed cpio udev file perl-Bootloader +%if 0%{?suse_version} > 1120 +Requires: sysvinit-tools sbin_init +%else +Requires: sysvinit +%endif AutoReqProv: on Version: 2.5.10 -Release: 11 +Release: 12 Conflicts: udev < 118 Requires: dhcpcd Summary: Creates an Initial RAM Disk Image for Preloading Modules BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: mkinitrd.tar.bz2 -Url: http://git.opensuse.org/?p=projects/mkinitrd.git +Url: http://gitorious.org/opensuse/mkinitrd %description Mkinitrd creates file system images for use as initial RAM disk ++++++ 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-02-16 16:40:50.000000000 +0100 +++ new/mkinitrd-2.5.10/mkinitrd.changes 2010-03-03 21:46:22.000000000 +0100 @@ -1,4 +1,29 @@ ------------------------------------------------------------------- +Wed Mar 3 21:45:06 CET 2010 - eich@novell.com + +- scripts/setup-kms.sh: Fix for shopt -s nocasematch (bnc#566624). + +------------------------------------------------------------------- +Wed Mar 3 15:10:42 CET 2010 - mmarek@suse.cz + +- Require sysvinit on older dists + +------------------------------------------------------------------- +Wed Mar 3 13:23:31 UTC 2010 - coolo@novell.com + +- do not require sysvinit but the tools and sbin_init + +------------------------------------------------------------------- +Wed Feb 17 13:33:55 CET 2010 - mmarek@suse.cz + +- scripts/boot-mount.sh: Fix fsck progressbar (bnc#564325). + +------------------------------------------------------------------- +Wed Feb 17 12:13:10 CET 2010 - mmarek@suse.cz + +- Update the URL in the specfile. + +------------------------------------------------------------------- Wed Feb 10 12:22:38 CET 2010 - eich@novell.com - Fix bogus wildchar substitution in pci device list (bnc#566624) et.al. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.5.10/mkinitrd.spec new/mkinitrd-2.5.10/mkinitrd.spec --- old/mkinitrd-2.5.10/mkinitrd.spec 2010-02-16 16:40:50.000000000 +0100 +++ new/mkinitrd-2.5.10/mkinitrd.spec 2010-03-03 21:46:22.000000000 +0100 @@ -23,7 +23,12 @@ Group: System/Base #!BuildIgnore: module-init-tools e2fsprogs udev reiserfs fop BuildRequires: asciidoc libxslt -Requires: coreutils modutils util-linux grep gzip sed cpio udev sysvinit file perl-Bootloader +Requires: coreutils modutils util-linux grep gzip sed cpio udev file perl-Bootloader +%if 0%{?suse_version} > 1120 +Requires: sysvinit-tools sbin_init +%else +Requires: sysvinit +%endif AutoReqProv: on Version: @@VERSION@@ Release: 3 @@ -32,7 +37,7 @@ Summary: Creates an Initial RAM Disk Image for Preloading Modules BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: mkinitrd.tar.bz2 -Url: http://git.opensuse.org/?p=projects/mkinitrd.git +Url: http://gitorious.org/opensuse/mkinitrd %description Mkinitrd creates file system images for use as initial RAM disk diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.5.10/scripts/boot-mount.sh new/mkinitrd-2.5.10/scripts/boot-mount.sh --- old/mkinitrd-2.5.10/scripts/boot-mount.sh 2010-02-16 16:40:50.000000000 +0100 +++ new/mkinitrd-2.5.10/scripts/boot-mount.sh 2010-03-03 21:46:22.000000000 +0100 @@ -98,7 +98,8 @@ # Display progress bar if possible fsckopts="-V -a" [ "$forcefsck" ] && fsckopts="$fsckopts -f" - [ "`/sbin/showconsole`" = "/dev/tty1" ] && fsckopts="$fsckopts -C" + console=`/sbin/showconsole` + [ "${console##*/}" = "tty1" ] && fsckopts="$fsckopts -C" # Check external journal for reiserfs [ "$rootfstype" = "reiserfs" -a -n "$journaldev" ] && fsckopts="-j $journaldev $fsckopts" fsck -t $rootfstype $fsckopts $rootdev 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-02-16 16:40:50.000000000 +0100 +++ new/mkinitrd-2.5.10/scripts/setup-kms.sh 2010-03-03 21:46:22.000000000 +0100 @@ -144,19 +144,19 @@ if [ "${vendor[$j]}" = "X" -o "${m_vendor[$i]}" = "${vendor[$j]}" ] then [ "${vendor[$j]}" != "X" ] && thislevel=$(( $thislevel + 1 )) - if [ "${class[$j]}" = "X" -o "${m_class[$i]}" = "${class[$j]}" ] + if [ "${class[$j]}" = "X" ] || [[ "${m_class[$i]}" == "${class[$j]}" ]] then [ "${class[$j]}" != "X" ] && thislevel=$(( $thislevel + 2 )) - if [ "${intf[$j]}" = "X" -o "${m_if[$i]}" = "${intf[$j]}" ] + if [ "${intf[$j]}" = "X" ] || [[ "${m_if[$i]}" == "${intf[$j]}" ]] then [ "${intf[$j]}" != "X" ] && thislevel=$(( $thislevel + 4 )) - if [ "${device[$j]}" = "X" -o "${m_device[$i]}" = "${device[$j]}" ] + if [ "${device[$j]}" = "X" ] || [[ "${m_device[$i]}" == "${device[$j]}" ]] then [ "${device[$j]}" != "X" ] && thislevel=$(( $thislevel + 6 )) - if [ "${subvendor[$j]}" = "X" -o "${m_subvendor[$i]}" = "${subvendor[$j]}" ] + if [ "${subvendor[$j]}" = "X" ] || [[ "${m_subvendor[$i]}" == "${subvendor[$j]}" ]] then [ "${subvendor[$j]}" != "X" ] && thislevel=$(( $thislevel + 16 )) - if [ "${subdevice[$j]}" = "X" -o "${m_subdevice[$i]}" = "${subdevice[$j]}" ] + if [ "${subdevice[$j]}" = "X" ] || [[ "${m_subdevice[$i]}" == "${subdevice[$j]}" ]] then [ "${subdevice[$j]}" = "X" ] && thislevel=$(( $thislevel + 32 )) [ $thislevel -gt $level ] && level=$thislevel @@ -231,7 +231,7 @@ do for j in $classlist do - if [ "${m_class[$i]}" == "$j" ] + if [[ "${m_class[$i]}" == "$j" ]] then class=${m_class[$i]} alias=pci:v0000${m_vendor[$i]}d0000${m_device[$i]}sv0000${m_subvendor[$i]}sd0000${m_subdevice[$i]} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org