Hello community, here is the log from the commit of package mkinitrd checked in at Fri Aug 24 01:45:25 CEST 2007. -------- --- mkinitrd/mkinitrd.changes 2007-08-10 14:22:37.000000000 +0200 +++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes 2007-08-23 14:55:23.000000000 +0200 @@ -1,0 +2,24 @@ +Thu Aug 23 14:54:06 CEST 2007 - vkleen@suse.de + +- Fix dm linear support so booting works + +------------------------------------------------------------------- +Wed Aug 22 19:49:01 CEST 2007 - agraf@suse.de + +- Not all SCSI drivers have a proc_name entry in sysfs, so we need + a proper fallback (#298726) + +------------------------------------------------------------------- +Mon Aug 20 13:41:35 CEST 2007 - agraf@suse.de + +- Include mount.nfs so nfsroot works again (broken due to split in + util-linux) (#300096) + +------------------------------------------------------------------- +Fri Aug 10 16:48:21 CEST 2007 - agraf@suse.de + +- Add dm linear support (#218122) +- Split acpi setup to a seperate setup script +- Make acpi setup backward-compatible (#285807) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.yr8373/_old 2007-08-24 01:44:47.000000000 +0200 +++ /var/tmp/diff_new_pack.yr8373/_new 2007-08-24 01:44:47.000000000 +0200 @@ -18,7 +18,7 @@ Requires: coreutils modutils util-linux grep gzip sed gawk cpio udev pciutils sysvinit file perl Autoreqprov: on Version: 2.1 -Release: 19 +Release: 23 Summary: Creates an Initial RAM Disk Image for Preloading Modules BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: mkinitrd.tgz @@ -103,6 +103,18 @@ %doc %{_mandir}/man8/mkinitrd.8.gz %changelog +* Thu Aug 23 2007 - vkleen@suse.de +- Fix dm linear support so booting works +* Wed Aug 22 2007 - agraf@suse.de +- Not all SCSI drivers have a proc_name entry in sysfs, so we need + a proper fallback (#298726) +* Mon Aug 20 2007 - agraf@suse.de +- Include mount.nfs so nfsroot works again (broken due to split in + util-linux) (#300096) +* Fri Aug 10 2007 - agraf@suse.de +- Add dm linear support (#218122) +- Split acpi setup to a seperate setup script +- Make acpi setup backward-compatible (#285807) * Fri Aug 10 2007 - hare@suse.de - Update DASD support - Match to correct minor number for EVMS (#288510) ++++++ mkinitrd.tgz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.1/mkinitrd.changes new/mkinitrd-2.1/mkinitrd.changes --- old/mkinitrd-2.1/mkinitrd.changes 2007-08-10 14:14:06.000000000 +0200 +++ new/mkinitrd-2.1/mkinitrd.changes 2007-08-23 14:55:03.000000000 +0200 @@ -1,4 +1,28 @@ ------------------------------------------------------------------- +Thu Aug 23 14:54:06 CEST 2007 - vkleen@suse.de + +- Fix dm linear support so booting works + +------------------------------------------------------------------- +Wed Aug 22 19:49:01 CEST 2007 - agraf@suse.de + +- Not all SCSI drivers have a proc_name entry in sysfs, so we need + a proper fallback (#298726) + +------------------------------------------------------------------- +Mon Aug 20 13:41:35 CEST 2007 - agraf@suse.de + +- Include mount.nfs so nfsroot works again (broken due to split in + util-linux) (#300096) + +------------------------------------------------------------------- +Fri Aug 10 16:48:21 CEST 2007 - agraf@suse.de + +- Add dm linear support (#218122) +- Split acpi setup to a seperate setup script +- Make acpi setup backward-compatible (#285807) + +------------------------------------------------------------------- Fri Aug 10 12:32:40 CEST 2007 - hare@suse.de - Update DASD support diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.1/scripts/boot-dm.sh new/mkinitrd-2.1/scripts/boot-dm.sh --- old/mkinitrd-2.1/scripts/boot-dm.sh 2007-08-10 14:14:06.000000000 +0200 +++ new/mkinitrd-2.1/scripts/boot-dm.sh 2007-08-23 14:55:03.000000000 +0200 @@ -1,7 +1,8 @@ #!/bin/bash -#%stage: block +#%stage: boot +#%depends: start #%modules: $dm_modules dm-mod dm-snapshot -#%programs: /sbin/dmsetup +#%programs: /sbin/dmsetup /sbin/blockdev # dm-crypt dm-zero dm-mirror #%if: -n "$root_dm" # @@ -17,15 +18,6 @@ load_modules -echo -n "Waiting for /dev/mapper/control to appear: " -for i in 1 2 3 4 5; do - [ -e /dev/mapper/control ] && break - sleep 1 - echo -n "." -done -if [ -e /dev/mapper/control ]; then - echo " ok" -else - echo " failed" -fi - +# because we run before udev we need to create the device node manually +mkdir /dev/mapper +mknod /dev/mapper/control c 10 63 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.1/scripts/boot-nfs.sh new/mkinitrd-2.1/scripts/boot-nfs.sh --- old/mkinitrd-2.1/scripts/boot-nfs.sh 2007-08-10 14:14:06.000000000 +0200 +++ new/mkinitrd-2.1/scripts/boot-nfs.sh 2007-08-23 14:55:03.000000000 +0200 @@ -1,6 +1,7 @@ #!/bin/bash #%stage: block #%modules: nfs +#%programs: /sbin/mount.nfs #%if: "$rootfstype" = "nfs" -o "$interface" # ##### Network FileSystem diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.1/scripts/boot-udev.sh new/mkinitrd-2.1/scripts/boot-udev.sh --- old/mkinitrd-2.1/scripts/boot-udev.sh 2007-08-10 14:14:06.000000000 +0200 +++ new/mkinitrd-2.1/scripts/boot-udev.sh 2007-08-23 14:55:03.000000000 +0200 @@ -1,6 +1,6 @@ #!/bin/bash #%stage: boot -#%depends: start +#%depends: start dm #%programs: /sbin/udevd /sbin/udevtrigger /sbin/udevsettle udevinfo /sbin/udevcontrol #%dontshow # diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.1/scripts/setup-acpi.sh new/mkinitrd-2.1/scripts/setup-acpi.sh --- old/mkinitrd-2.1/scripts/setup-acpi.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/mkinitrd-2.1/scripts/setup-acpi.sh 2007-08-23 14:55:03.000000000 +0200 @@ -0,0 +1,56 @@ +#!/bin/bash +# +#%stage: boot +# +# Attach ACPI DSDT if necessary. +attach_dsdt() { + local initrd_image=$1 + local sdt_match + + if [ -z "$acpi_dsdt" ]; then + acpi_dsdt="$ACPI_DSDT" + fi + if [ -z "$acpi_dsdt" ]; then + return + fi + for sdt in $acpi_dsdt; do + # File must be named: DSDT.aml or SSDT[0-9]*.aml + # For compatibility reasons DSDT.aml can have an arbitrary + # name if only DSDT should get overridden + + # sdt_type shows the type of the SDT (S or D) + sdt_type=$(echo "$sdt" | sed 's/^.*\/\([SD]\)SDT[0-9]*\.aml$/\1/') + # fallback for arbitrary file names + if [ "${#sdt_type}" != 1 ]; then + sdt_type=D + fi + if [ ! -f "$sdt" ]; then + echo "[ACPI] ${sdt_type}SDT $sdt does not exist. Not including it." + return + elif ! grep -q "[SD]SDT" "$sdt" ; then + echo "[ACPI] File $sdt is not a valid ACPI ${sdt_type}SDT. Not including it." + return + elif grep -qE 'DefinitionBlock' "$sdt" ; then + echo "[ACPI] ${sdt_type}SDT $sdt does not seem to be in binary form. " \ + "Not including it." + return + elif [ ! "$(echo "$sdt" | sed -n '/\/[SD]SDT[0-9]*\.aml$/p')" ];then + if [ "$renamed_dsdt" ];then + echo "[ACPI] ($sdt) Multiple [DS]SDTs must be named: DSDT.aml or SSDT[0-9]*.aml" + return + else + echo "[ACPI] Please rename $sdt to $(dirname $sdt)/DSDT.aml!" + echo "[ACPI] Using compatibility mode (one DSDT only)." + cp $sdt DSDT.aml + renamed_dsdt=1 + fi + else + cp "$sdt" $tmp_mnt + fi + + echo -e "ACPI ${sdt_type}SDT:\t$sdt" + done +} + +attach_dsdt + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.1/scripts/setup-block.sh new/mkinitrd-2.1/scripts/setup-block.sh --- old/mkinitrd-2.1/scripts/setup-block.sh 2007-08-10 14:14:06.000000000 +0200 +++ new/mkinitrd-2.1/scripts/setup-block.sh 2007-08-23 14:55:03.000000000 +0200 @@ -13,7 +13,13 @@ echo "scsi host$hostnum not found" exit 1; fi - cat /sys/class/scsi_host/host$hostnum/proc_name + procname=$(cat /sys/class/scsi_host/host$hostnum/proc_name) + # some drivers do not include proc_name so we need a fallback + if [ "$procname" = "<NULL>" ] ; then + procname="$(readlink /sys/class/scsi_host/host${hostnum}/device/../driver)" + procname="${procname##*/}" + fi + echo $procname } get_devmodule() { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.1/scripts/setup-dm.sh new/mkinitrd-2.1/scripts/setup-dm.sh --- old/mkinitrd-2.1/scripts/setup-dm.sh 2007-08-10 14:14:06.000000000 +0200 +++ new/mkinitrd-2.1/scripts/setup-dm.sh 2007-08-23 14:55:03.000000000 +0200 @@ -13,6 +13,8 @@ blockdev="$(dm_resolvedeps_recursive $blockdev)" [ "$?" = 0 ] && root_dm=1 + # include dm when using dm based block devs + [ "$DM_BLOCK" ] && root_dm=1 # include modules if [ -n "$root_dm" ] ; then @@ -24,5 +26,9 @@ fi done fi + + # include dm block var from sysconfig + mkdir -p etc/sysconfig + grep DM_BLOCK /etc/sysconfig/kernel > etc/sysconfig/kernel save_var root_dm fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.1/scripts/setup-done.sh new/mkinitrd-2.1/scripts/setup-done.sh --- old/mkinitrd-2.1/scripts/setup-done.sh 2007-08-10 14:14:06.000000000 +0200 +++ new/mkinitrd-2.1/scripts/setup-done.sh 2007-08-23 14:55:03.000000000 +0200 @@ -3,47 +3,6 @@ #%stage: boot #%depends: progs sharedlibs # -# Attach ACPI DSDT if necessary. -attach_dsdt() { - local initrd_image=$1 - local sdt_match - - if [ -z "$acpi_dsdt" ]; then - if [ -f /etc/sysconfig/kernel ]; then - . /etc/sysconfig/kernel - acpi_dsdt="$ACPI_DSDT" - fi - fi - if [ -z "$acpi_dsdt" ]; then - return - fi - for sdt in "$acpi_dsdt";do - # File must be named: DSDT.aml or SSDT[0-9]*.aml - sdt_match=`expr match $(echo $sdt) ".*[SD]SDT[0-9]*\.aml"` - if [ $sdt_match -lt 8 ];then - oops 2 "($sdt) [DS]SDT must be named: DSDT.aml or SSDT[0-9]*.aml" - return - fi - if [ ! -f "$sdt" ]; then - oops 2 "ACPI DSDT $sdt does not exist." - return - fi - if ! grep -q "[SD]SDT" "$sdt" ; then - oops 2 "File $sdt is not a valid ACPI DSDT. Ignoring." - return - elif grep -qE 'DefinitionBlock' "$sdt" ; then - oops 2 "ACPI DSDT $sdt does not seem to be in binary form." \ - "Will not attach this to $initrd_image." - return - fi - - cp "$sdt" $tmp_mnt - - echo -e "ACPI DSDT:\t$sdt" - done -} - -attach_dsdt pushd . > /dev/null 2>&1 cd $tmp_mnt diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.1/scripts/setup-kpartx.sh new/mkinitrd-2.1/scripts/setup-kpartx.sh --- old/mkinitrd-2.1/scripts/setup-kpartx.sh 2007-08-10 14:14:06.000000000 +0200 +++ new/mkinitrd-2.1/scripts/setup-kpartx.sh 2007-08-23 14:55:03.000000000 +0200 @@ -5,6 +5,8 @@ if [ -x /sbin/dmsetup ]; then kpartx_blockdev= + # always activate kpartx when using dm block + [ "$DM_BLOCK" ] && root_kpartx=1 for bd in $blockdev ; do update_blockdev $bd if [ "$blockdriver" = device-mapper ]; then diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.1/scripts/setup-udev.sh new/mkinitrd-2.1/scripts/setup-udev.sh --- old/mkinitrd-2.1/scripts/setup-udev.sh 2007-08-10 14:14:06.000000000 +0200 +++ new/mkinitrd-2.1/scripts/setup-udev.sh 2007-08-23 14:55:03.000000000 +0200 @@ -11,6 +11,7 @@ 59-dasd.rules \ 60-persistent-storage.rules \ 60-persistent-input.rules \ + 62-dm_linear.rules \ 64-device-mapper.rules \ 64-md-raid.rules \ 80-drivers.rules; do ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org