Hello community, here is the log from the commit of package mkinitrd checked in at Tue Jul 3 16:45:30 CEST 2007. -------- --- mkinitrd/mkinitrd.changes 2007-06-12 16:08:47.000000000 +0200 +++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes 2007-07-03 13:38:29.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Jun 20 13:04:08 CEST 2007 - agraf@suse.de + +- Fixed blogd killing to not use sleep +- If a script failed, throw out an error message + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.Fj1456/_old 2007-07-03 16:45:22.000000000 +0200 +++ /var/tmp/diff_new_pack.Fj1456/_new 2007-07-03 16:45:22.000000000 +0200 @@ -11,14 +11,14 @@ # norootforbuild Name: mkinitrd -License: GNU General Public License (GPL) +License: GPL v2 or later Group: System/Base Provides: aaa_base:/sbin/mk_initrd #!BuildIgnore: module-init-tools e2fsprogs udev pciutils reiserfs Requires: coreutils modutils util-linux grep gzip sed gawk cpio udev pciutils sysvinit file Autoreqprov: on Version: 2.0 -Release: 23 +Release: 26 Summary: Creates an Initial RAM Disk Image for Preloading Modules BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: mkinitrd.tgz @@ -86,6 +86,9 @@ %doc %{_mandir}/man8/mkinitrd.8.gz %changelog +* Wed Jun 20 2007 - agraf@suse.de +- Fixed blogd killing to not use sleep +- If a script failed, throw out an error message * Tue Jun 12 2007 - hare@suse.de - Fixup verbose() to not change the return value * Mon Jun 11 2007 - agraf@suse.de ++++++ mkinitrd.tgz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.0/lib/mkinitrd/boot/01-start.sh new/mkinitrd-2.0/lib/mkinitrd/boot/01-start.sh --- old/mkinitrd-2.0/lib/mkinitrd/boot/01-start.sh 2007-06-12 16:06:08.000000000 +0200 +++ new/mkinitrd-2.0/lib/mkinitrd/boot/01-start.sh 2007-06-27 16:06:07.000000000 +0200 @@ -17,7 +17,6 @@ export PATH=/sbin:/usr/sbin:/bin:/usr/bin -devpts=no die() { umount /proc umount /sys @@ -104,7 +103,6 @@ ln -sf /dev/shm/initrd.msg /var/log/boot.msg mkdir -p /var/run mount -t devpts devpts /dev/pts - devpts=yes /sbin/blogd $REDIRECT fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.0/lib/mkinitrd/boot/27-killblogd2.sh new/mkinitrd-2.0/lib/mkinitrd/boot/27-killblogd2.sh --- old/mkinitrd-2.0/lib/mkinitrd/boot/27-killblogd2.sh 2007-06-12 16:06:08.000000000 +0200 +++ new/mkinitrd-2.0/lib/mkinitrd/boot/27-killblogd2.sh 2007-06-27 16:06:07.000000000 +0200 @@ -1,5 +1,5 @@ #!/bin/bash -#%requires: killiscsi +#%programs: usleep #%dontshow # ##### blogd end2 @@ -12,8 +12,8 @@ if test -n "$blogd_pid" ; then kill -QUIT "$blogd_pid" - sleep 1 - rm -f /var/log/boot.msg - test "$devpts" = "no" || umount -t devpts /root/dev/pts - devpts=no + while [ -d "/proc/$blogd_pid" ]; do + usleep 300000 + done + umount -t devpts /root/dev/pts fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.0/lib/mkinitrd/setup/074-kpartx.sh new/mkinitrd-2.0/lib/mkinitrd/setup/074-kpartx.sh --- old/mkinitrd-2.0/lib/mkinitrd/setup/074-kpartx.sh 2007-06-12 16:06:08.000000000 +0200 +++ new/mkinitrd-2.0/lib/mkinitrd/setup/074-kpartx.sh 2007-06-27 16:06:07.000000000 +0200 @@ -22,6 +22,9 @@ fi done + if [ "$root_kpartx" ]; then + cp /etc/udev/rules.d/70-kpartx.rules $tmp_mnt/etc/udev/rules.d + fi blockdev="$kpartx_blockdev" fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.0/lib/mkinitrd/setup/52-busybox.sh new/mkinitrd-2.0/lib/mkinitrd/setup/52-busybox.sh --- old/mkinitrd-2.0/lib/mkinitrd/setup/52-busybox.sh 2007-06-12 16:06:08.000000000 +0200 +++ new/mkinitrd-2.0/lib/mkinitrd/setup/52-busybox.sh 2007-06-27 16:06:07.000000000 +0200 @@ -7,13 +7,24 @@ for i in `busybox | grep Curr -A 200 | grep -v "Currently defined f"`; do DIR=bin busyfile="${i/,/}" - # skip programs that do not work properly - case $busyfile in - modprobe|fsck|umount|mount) - continue - ;; - esac - if [ -e "bin/$busyfile" ]; then + # skip programs that do not work properly (if they exist) + if [ -e "bin/$busyfile" -o -e "sbin/$busyfile" ]; then + case $busyfile in + # modprobe: breaks udev + # fsck: breaks fsck.ext3 + # umount: does not know -f + # sleep: can only use full integers (no floats) + # init: no need for init in initrd (breaks bootchart) + # cp: missing -v (breaks bootchart) + modprobe|fsck|umount|mount|sleep|init|cp) + continue + ;; + esac + fi + if [ -h "bin/$busyfile" ]; then + # don't process symlinks + continue + elif [ -e "bin/$busyfile" ]; then verbose "[BUSYBOX] replacing $DIR/$busyfile" rm -f bin/$busyfile elif [ -e "sbin/$busyfile" ]; then diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.0/mkinitrd.changes new/mkinitrd-2.0/mkinitrd.changes --- old/mkinitrd-2.0/mkinitrd.changes 2007-06-12 16:06:08.000000000 +0200 +++ new/mkinitrd-2.0/mkinitrd.changes 2007-06-27 16:06:07.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jun 20 13:04:08 CEST 2007 - agraf@suse.de + +- Fixed blogd killing to not use sleep +- If a script failed, throw out an error message + +------------------------------------------------------------------- Tue Jun 12 16:03:46 CEST 2007 - hare@suse.de - Fixup verbose() to not change the return value diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.0/sbin/mkinitrd new/mkinitrd-2.0/sbin/mkinitrd --- old/mkinitrd-2.0/sbin/mkinitrd 2007-06-12 16:06:08.000000000 +0200 +++ new/mkinitrd-2.0/sbin/mkinitrd 2007-06-27 16:06:07.000000000 +0200 @@ -415,7 +415,7 @@ curscript="${setupfile##*-}" # echo "[$curscript] $blockdev" source $setupfile - [ $? -ne 0 ] && return 1 + [ $? -ne 0 ] && oops 1 "Script $setupfile failed!" fi done cd "$oldpwd" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org