Hello community, here is the log from the commit of package mkinitrd checked in at Thu Nov 2 20:22:57 CET 2006. -------- --- mkinitrd/mkinitrd.changes 2006-10-31 18:46:40.000000000 +0100 +++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes 2006-11-02 14:09:05.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Nov 2 14:06:45 CET 2006 - trenn@suse.de + +- Also allow SSDT[0-9]?.aml files to be placed to initrd root dir + to let the BIOS provided ones be overridden + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.4f9Vgx/_old 2006-11-02 20:22:51.000000000 +0100 +++ /var/tmp/diff_new_pack.4f9Vgx/_new 2006-11-02 20:22:51.000000000 +0100 @@ -18,7 +18,7 @@ Requires: coreutils modutils util-linux grep e2fsprogs gzip sed gawk cpio udev pciutils sysvinit reiserfs file Autoreqprov: on Version: 1.2 -Release: 136 +Release: 138 Summary: Creates an Initial RAM Disk Image for Preloading Modules BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: mkinitrd @@ -87,6 +87,9 @@ %doc %{_mandir}/man8/mkinitrd.8.gz %changelog -n mkinitrd +* Thu Nov 02 2006 - trenn@suse.de +- Also allow SSDT[0-9]?.aml files to be placed to initrd root dir + to let the BIOS provided ones be overridden * Tue Oct 31 2006 - olh@suse.de - require file for elf detection * Tue Oct 31 2006 - olh@suse.de ++++++ mkinitrd ++++++ --- mkinitrd/mkinitrd 2006-10-28 13:17:13.000000000 +0200 +++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd 2006-11-02 14:09:05.000000000 +0100 @@ -581,6 +581,7 @@ # 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 @@ -591,22 +592,30 @@ if [ -z "$acpi_dsdt" ]; then return fi - if [ ! -f "$acpi_dsdt" ]; then - oops 2 "ACPI DSDT $acpi_dsdt does not exist." - return - fi - if ! grep -q "DSDT" "$acpi_dsdt" ; then - oops 2 "File $acpi_dsdt is not a valid ACPI DSDT. Ignoring." - return - elif grep -qE 'DefinitionBlock' "$acpi_dsdt" ; then - oops 2 "ACPI DSDT $acpi_dsdt does not seem to be in binary form." \ - "Will not attach this to $initrd_image." - 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 "$acpi_dsdt" $tmp_mnt/DSDT.aml + cp "$sdt" $tmp_mnt - echo -e "ACPI DSDT:\t$acpi_dsdt" + echo -e "ACPI DSDT:\t$sdt" + done } # Check for IDE module ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org