Hello community, here is the log from the commit of package mkinitrd for openSUSE:12.1 checked in at 2011-11-08 09:31:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1/mkinitrd (Old) and /work/SRC/openSUSE:12.1/.mkinitrd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mkinitrd", Maintainer is "MMarek@suse.com" Changes: -------- --- /work/SRC/openSUSE:12.1/mkinitrd/mkinitrd.changes 2011-10-24 13:07:44.000000000 +0200 +++ /work/SRC/openSUSE:12.1/.mkinitrd.new/mkinitrd.changes 2011-11-08 09:31:32.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Nov 7 12:54:16 UTC 2011 - mmarek@suse.cz + +- Revert the NO_KMS_IN_INITRD -> KMS_IN_INITRD rename, it breaks + other scripts for no good reason (bnc#619218#c12). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.2cRHx2/_old 2011-11-08 09:31:32.000000000 +0100 +++ /var/tmp/diff_new_pack.2cRHx2/_new 2011-11-08 09:31:32.000000000 +0100 @@ -116,16 +116,9 @@ install -m 644 etc/sysconfig.kernel-mkinitrd $RPM_BUILD_ROOT/var/adm/fillup-templates/ %post -%{remove_and_set -n kernel SKIP_RUNNING_KERNEL NO_KMS_IN_INITRD} %{fillup_only -an kernel} %{insserv_force_if_yast /etc/init.d/boot.loadmodules} %{fillup_and_insserv -f -Y purge-kernels} -case "$NO_KMS_IN_INITRD" in - no) - sed -i -e "s@^KMS_IN_INITRD=.*@KMS_IN_INITRD=\"yes\"@" /etc/sysconfig/kernel ;; - yes) - sed -i -e "s@^KMS_IN_INITRD=.*@KMS_IN_INITRD=\"no\"@" /etc/sysconfig/kernel ;; -esac %postun %insserv_cleanup ++++++ mkinitrd.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.0/etc/sysconfig.kernel-mkinitrd new/mkinitrd-2.7.0/etc/sysconfig.kernel-mkinitrd --- old/mkinitrd-2.7.0/etc/sysconfig.kernel-mkinitrd 2011-10-18 10:45:45.000000000 +0200 +++ new/mkinitrd-2.7.0/etc/sysconfig.kernel-mkinitrd 2011-11-07 13:55:24.000000000 +0100 @@ -9,7 +9,7 @@ # INITRD_MODULES="" -## Type: string(yes) +## Type: yesno ## Command: /sbin/mkinitrd ## Default: "" # @@ -19,7 +19,7 @@ # supported on the underlying hardware. # After changing run mkinitrd again. # -KMS_IN_INITRD="yes" +NO_KMS_IN_INITRD="no" ## Type: string ## Command: /sbin/mkinitrd diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.0/mkinitrd.changes new/mkinitrd-2.7.0/mkinitrd.changes --- old/mkinitrd-2.7.0/mkinitrd.changes 2011-10-18 10:45:45.000000000 +0200 +++ new/mkinitrd-2.7.0/mkinitrd.changes 2011-11-07 13:55:24.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Nov 7 12:54:16 UTC 2011 - mmarek@suse.cz + +- Revert the NO_KMS_IN_INITRD -> KMS_IN_INITRD rename, it breaks + other scripts for no good reason (bnc#619218#c12). + +------------------------------------------------------------------- Tue Oct 18 08:45:11 UTC 2011 - mmarek@suse.cz - Do not create /dev/shm/initrd_exports.sh, it was only needed by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.0/mkinitrd.spec new/mkinitrd-2.7.0/mkinitrd.spec --- old/mkinitrd-2.7.0/mkinitrd.spec 2011-10-18 10:45:45.000000000 +0200 +++ new/mkinitrd-2.7.0/mkinitrd.spec 2011-11-07 13:55:24.000000000 +0100 @@ -116,16 +116,9 @@ install -m 644 etc/sysconfig.kernel-mkinitrd $RPM_BUILD_ROOT/var/adm/fillup-templates/ %post -%{remove_and_set -n kernel SKIP_RUNNING_KERNEL NO_KMS_IN_INITRD} %{fillup_only -an kernel} %{insserv_force_if_yast /etc/init.d/boot.loadmodules} %{fillup_and_insserv -f -Y purge-kernels} -case "$NO_KMS_IN_INITRD" in - no) - sed -i -e "s@^KMS_IN_INITRD=.*@KMS_IN_INITRD=\"yes\"@" /etc/sysconfig/kernel ;; - yes) - sed -i -e "s@^KMS_IN_INITRD=.*@KMS_IN_INITRD=\"no\"@" /etc/sysconfig/kernel ;; -esac %postun %insserv_cleanup diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/setup-kms.sh new/mkinitrd-2.7.0/scripts/setup-kms.sh --- old/mkinitrd-2.7.0/scripts/setup-kms.sh 2011-10-18 10:45:45.000000000 +0200 +++ new/mkinitrd-2.7.0/scripts/setup-kms.sh 2011-11-07 13:55:24.000000000 +0100 @@ -250,7 +250,7 @@ ################## end of functions ###################### -if [ "$KMS_IN_INITRD" != "no" ] && pciids_on_system +if [ "$NO_KMS_IN_INITRD" != "yes" ] && pciids_on_system then gfx_modules=$(class_drivers $kernel_version $supported_classes) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org