Hello community, here is the log from the commit of package mkinitrd checked in at Thu Oct 9 12:07:07 CEST 2008. -------- --- mkinitrd/mkinitrd.changes 2008-09-24 15:35:54.000000000 +0200 +++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes 2008-10-09 09:41:43.000000000 +0200 @@ -1,0 +2,13 @@ +Thu Oct 9 09:12:14 CEST 2008 - agraf@suse.de + +- Remove rootfs module check (bnc#432766) +- Include libata drivers only if libata is used (bnc#433105) +- Remove warning for non-existing driver directories (bnc#433455) +- Fix script syntax + +------------------------------------------------------------------- +Mon Sep 29 13:33:46 CEST 2008 - hare@suse.de + +- Build ramdisk in /dev/shm to speed up mkinitrd + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.pev357/_old 2008-10-09 12:05:41.000000000 +0200 +++ /var/tmp/diff_new_pack.pev357/_new 2008-10-09 12:05:41.000000000 +0200 @@ -25,7 +25,7 @@ Requires: coreutils modutils util-linux grep gzip sed cpio udev sysvinit file perl AutoReqProv: on Version: 2.4 -Release: 26 +Release: 27 Conflicts: udev < 118 Requires: dhcpcd Summary: Creates an Initial RAM Disk Image for Preloading Modules @@ -109,6 +109,13 @@ %doc %{_mandir}/man8/mkinitrd.8.gz %changelog +* Thu Oct 09 2008 agraf@suse.de +- Remove rootfs module check (bnc#432766) +- Include libata drivers only if libata is used (bnc#433105) +- Remove warning for non-existing driver directories (bnc#433455) +- Fix script syntax +* Mon Sep 29 2008 hare@suse.de +- Build ramdisk in /dev/shm to speed up mkinitrd * Wed Sep 24 2008 hare@suse.de - Handle cciss devices correctly (bnc#424217) - Do not call update-bootloader on error ++++++ mkinitrd.tgz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.4/man/mkinitrd.8 new/mkinitrd-2.4/man/mkinitrd.8 --- old/mkinitrd-2.4/man/mkinitrd.8 2008-09-24 15:35:42.000000000 +0200 +++ new/mkinitrd-2.4/man/mkinitrd.8 2008-10-09 09:41:09.000000000 +0200 @@ -12,13 +12,15 @@ vital subsystems (e.g. networking when doing nfs), does a filesystem check on the root filesystem and finally passes control to /sbin/init. udev is used to create the device nodes in a tmpfs mounted /dev directory. -This directory is moved over to the final root filesystem, essentially hiding the -on-disk content below /dev on the root filesystem. +This directory is moved over to the final root filesystem, essentially +hiding the on-disk content below /dev on the root filesystem. -A few options can be specified via the kernel command line to modify some hardcoded -values in the "/init" script. They are read from /proc/cmdline. +A few options can be specified via the kernel command line to modify +some hardcoded values in the "/init" script. They are read from +/proc/cmdline. -While in the old days the Linux kernel was responsible for mounting the rootfilesystem +While in the old days the Linux kernel was responsible for mounting +the rootfilesystem and running /sbin/init, all the work is now done by the "/init" script. .SH OPTIONS @@ -28,7 +30,8 @@ .TP \fB-k "kernel list"\fR list of kernel images for which initrd files are created (relative to -boot_dir), defaults to "vmlinux" on powerpc, "image" on s390 and "vmlinuz" for everything else. +boot_dir), defaults to "vmlinux" on powerpc, "image" on s390 and +"vmlinuz" for everything else. .TP \fB-i "initrd list"\fR list of file names (relativ to boot_dir) for the initrd; positions have to @@ -86,7 +89,11 @@ Directory to use for mkinitrd files instead of /lib/mkinitrd .TP \fB-A\fR -Create a so called "monster initrd" which includes all available features and modules. +Create a so called "monster initrd" which includes all +available features and modules. +.TP +\fB-S\fR +Do not include all libata modules by default. .TP \fBroot_dir\fR the directory the root partition is mounted to defaults to "/" 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-09-24 15:35:42.000000000 +0200 +++ new/mkinitrd-2.4/mkinitrd.changes 2008-10-09 09:41:09.000000000 +0200 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Thu Oct 9 09:12:14 CEST 2008 - agraf@suse.de + +- Remove rootfs module check (bnc#432766) +- Include libata drivers only if libata is used (bnc#433105) +- Remove warning for non-existing driver directories (bnc#433455) +- Fix script syntax + +------------------------------------------------------------------- +Mon Sep 29 13:33:46 CEST 2008 - hare@suse.de + +- Build ramdisk in /dev/shm to speed up mkinitrd + +------------------------------------------------------------------- Wed Sep 24 15:29:37 CEST 2008 - hare@suse.de - Handle cciss devices correctly (bnc#424217) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.4/sbin/mkinitrd new/mkinitrd-2.4/sbin/mkinitrd --- old/mkinitrd-2.4/sbin/mkinitrd 2008-09-24 15:35:42.000000000 +0200 +++ new/mkinitrd-2.4/sbin/mkinitrd 2008-10-09 09:41:09.000000000 +0200 @@ -36,9 +36,9 @@ } read_options() { - egrep -h '%param_' $INITRD_PATH/setup/*.sh | sed 's/^.*_\(.\): \(.*\)$/ tmp_option=\$(read_options_eval \1 \2); [ \"$tmp_option\" ] \&\& cmd_option[\${#cmd_option[@]}]=\"\$tmp_option\"/' > /tmp/$$.params - . /tmp/$$.params - rm -f /tmp/$$.params + egrep -h '%param_' $INITRD_PATH/setup/*.sh | sed 's/^.*_\(.\): \(.*\)$/ tmp_option=\$(read_options_eval \1 \2); [ \"$tmp_option\" ] \&\& cmd_option[\${#cmd_option[@]}]=\"\$tmp_option\"/' > $tmp_dir/$$.params + . $tmp_dir/$$.params + rm -f $tmp_dir/$$.params } parse_option() { @@ -248,7 +248,7 @@ if [ -n "$tmp_dir" ]; then tmp_dir="/${tmp_dir#/}" # make sure it is an absolute path else - tmp_dir=/var/tmp + tmp_dir=/dev/shm fi if [ ! -d "$tmp_dir" ]; then echo "$tmp_dir is not a directory" >&2 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.4/scripts/boot-mount.sh new/mkinitrd-2.4/scripts/boot-mount.sh --- old/mkinitrd-2.4/scripts/boot-mount.sh 2008-09-24 15:35:42.000000000 +0200 +++ new/mkinitrd-2.4/scripts/boot-mount.sh 2008-10-09 09:41:09.000000000 +0200 @@ -4,7 +4,6 @@ #%depends: resume # #%programs: /sbin/fsck $rootfsck -#%modules: $rootfsmod #%if: ! "$root_already_mounted" #%dontshow # @@ -67,8 +66,6 @@ sysdev=$(/sbin/udevadm info -q path -n $rootdev) # Fallback if rootdev is not controlled by udev if [ $? -ne 0 ] && [ -b $rootdev ] ; then - local devn maj min sysdev - devn=$(devnumber $rootdev) maj=$(devmajor $devn) min=$(devminor $devn) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.4/scripts/boot-storage.sh new/mkinitrd-2.4/scripts/boot-storage.sh --- old/mkinitrd-2.4/scripts/boot-storage.sh 2008-09-24 15:35:42.000000000 +0200 +++ new/mkinitrd-2.4/scripts/boot-storage.sh 2008-10-09 09:41:09.000000000 +0200 @@ -2,6 +2,7 @@ # #%stage: boot #%depends: start +#%udevmodules: $rootfsmod # #%dontshow # diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.4/scripts/setup-block.sh new/mkinitrd-2.4/scripts/setup-block.sh --- old/mkinitrd-2.4/scripts/setup-block.sh 2008-09-24 15:35:42.000000000 +0200 +++ new/mkinitrd-2.4/scripts/setup-block.sh 2008-10-09 09:41:09.000000000 +0200 @@ -2,8 +2,9 @@ # #%stage: block #%depends: partition -#%param_S: "Don't include all IDE and SCSI drivers." +#%param_S: "Don't include all libata drivers." # + handle_scsi() { local dev=$1 local devpath tgtnum hostnum procname @@ -25,6 +26,12 @@ procname="$(readlink /sys/class/scsi_host/host${hostnum}/device/../driver)" procname="${procname##*/}" fi + + # let's see if that driver is on libata + if [ -L "/sys/module/libata/holders/$procname" ]; then + block_uses_libata=1 + fi + echo $procname } @@ -99,12 +106,25 @@ echo -n "$newmodule " } -if [ "$create_monster_initrd" -o ! "$param_S" ]; then - for i in $(find $root_dir/lib/modules/$kernel_version/kernel/drivers/{ata,ide,scsi,s390/block,s390/scsi} -name "*.ko"); do - i=${i%*.ko} - block_modules="$block_modules ${i##*/}" +if [ "$create_monster_initrd" ]; then + for d in $root_dir/lib/modules/$kernel_version/kernel/drivers/{ata,ide,scsi,s390/block,s390/scsi}; do + if [ -d "$d" ]; then + for i in $(find "$d" -name "*.ko"); do + i=${i%*.ko} + block_modules="$block_modules ${i##*/}" + done + fi done else + # if we need libata, just copy all libata drivers + if [ "$block_uses_libata" -a ! "$param_S" ]; then + for i in $(find $root_dir/lib/modules/$kernel_version/kernel/drivers/ata -name "*.ko"); do + i=${i%*.ko} + block_modules="$block_modules ${i##*/}" + done + fi + + # copy over all drivers needed to boot up the system for bd in $blockdev; do case $bd in # only include devices /dev*) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.4/scripts/setup-storage.sh new/mkinitrd-2.4/scripts/setup-storage.sh --- old/mkinitrd-2.4/scripts/setup-storage.sh 2008-09-24 15:35:42.000000000 +0200 +++ new/mkinitrd-2.4/scripts/setup-storage.sh 2008-10-09 09:41:09.000000000 +0200 @@ -333,15 +333,16 @@ URL <protocol>://<path>" fi +# We assume that we always have to load a module for the rootfs +rootfsmod=$rootfstype + # Check if we have to load a module for the rootfs type +# XXX: This check should happen more generically for all modules if [ ! "$(find $root_dir/lib/modules/$kernel_version/ -name $rootfstype.ko)" ]; then - if ! grep -q ${rootfstype}_fs_type $map ; then - error 1 "Could not find the filesystem module for root device $rootdev ($rootfstype)" - else + if grep -q ${rootfstype}_fs_type $map ; then + # No need to load a module, since this is compiled in rootfsmod= fi -else - rootfsmod=$rootfstype fi # blockdev is the list current block devices. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de