Hello community, here is the log from the commit of package mkinitrd checked in at Wed May 30 01:15:41 CEST 2007. -------- --- mkinitrd/mkinitrd.changes 2007-05-24 10:14:38.000000000 +0200 +++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes 2007-05-29 17:33:35.055676000 +0200 @@ -1,0 +2,7 @@ +Tue May 29 17:33:51 CEST 2007 - agraf@suse.de + +- Include optional busybox support (activate with -f busybox) + (#276555) +- Suppress useless warnings in resume features + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.Bu1777/_old 2007-05-30 01:15:10.000000000 +0200 +++ /var/tmp/diff_new_pack.Bu1777/_new 2007-05-30 01:15:10.000000000 +0200 @@ -18,7 +18,7 @@ Requires: coreutils modutils util-linux grep gzip sed gawk cpio udev pciutils sysvinit file Autoreqprov: on Version: 2.0 -Release: 9 +Release: 12 Summary: Creates an Initial RAM Disk Image for Preloading Modules BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: mkinitrd.tgz @@ -92,6 +92,10 @@ %doc %{_mandir}/man8/mkinitrd.8.gz %changelog +* Tue May 29 2007 - agraf@suse.de +- Include optional busybox support (activate with -f busybox) + (#276555) +- Suppress useless warnings in resume features * Thu May 24 2007 - agraf@suse.de - Resolve persistent device names for non-root-devices - Split resume into userspace and kernel resume ++++++ mkinitrd.tgz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.0/lib/mkinitrd/boot/18-resume.userspace.sh new/mkinitrd-2.0/lib/mkinitrd/boot/18-resume.userspace.sh --- old/mkinitrd-2.0/lib/mkinitrd/boot/18-resume.userspace.sh 2007-05-23 15:23:40.000000000 +0200 +++ new/mkinitrd-2.0/lib/mkinitrd/boot/18-resume.userspace.sh 2007-05-29 17:24:11.000000000 +0200 @@ -15,7 +15,7 @@ ## resume the device to resume from ## -[ "$(set -u; $noresume && echo 1)" = "1" ] && resume_mode=off +[ "$( ( set -u; echo $noresume >/dev/null; echo 1 ) 2>/dev/null )" = "1" ] && resume_mode=off # Verify manual resume mode if [ "$resume_mode" != "off" -a -n "$resumedev" ]; then diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.0/lib/mkinitrd/boot/19-resume.kernel.sh new/mkinitrd-2.0/lib/mkinitrd/boot/19-resume.kernel.sh --- old/mkinitrd-2.0/lib/mkinitrd/boot/19-resume.kernel.sh 2007-05-23 15:25:18.000000000 +0200 +++ new/mkinitrd-2.0/lib/mkinitrd/boot/19-resume.kernel.sh 2007-05-29 17:24:21.000000000 +0200 @@ -14,7 +14,7 @@ ## resume the device to resume from ## -[ "$(set -u; $noresume && echo 1)" = "1" ] && resume_mode=off +[ "$( ( set -u; echo $noresume >/dev/null; echo 1 ) 2>/dev/null )" = "1" ] && resume_mode=off # Verify manual resume mode if [ "$resume_mode" != "off" -a -n "$resumedev" ]; then diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.0/lib/mkinitrd/boot/52-busybox.sh new/mkinitrd-2.0/lib/mkinitrd/boot/52-busybox.sh --- old/mkinitrd-2.0/lib/mkinitrd/boot/52-busybox.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/mkinitrd-2.0/lib/mkinitrd/boot/52-busybox.sh 2007-05-25 13:33:48.000000000 +0200 @@ -0,0 +1,5 @@ +#!/bin/bash +#%if: 1 = 2 +#%programs: busybox + +## this is only a dummy script so we see busybox as a feature in the list 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 1970-01-01 01:00:00.000000000 +0100 +++ new/mkinitrd-2.0/lib/mkinitrd/setup/52-busybox.sh 2007-05-29 17:29:03.000000000 +0200 @@ -0,0 +1,27 @@ +#!/bin/bash + +if use_script busybox; then + if [ ! -x "/usr/bin/busybox" ]; then + echo "[BUSYBOX] No Busybox executable was found" + else + 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 + verbose "[BUSYBOX] replacing $DIR/$busyfile" + rm -f bin/$busyfile + elif [ -e "sbin/$busyfile" ]; then + DIR=sbin + rm -f sbin/$busyfile + verbose "[BUSYBOX] replacing $DIR/$busyfile" + fi + ln -s ../bin/busybox "$DIR/$busyfile" + done + fi +fi ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org