Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at Tue Aug 2 11:24:35 CEST 2011.
-------- --- aaa_base/aaa_base.changes 2011-07-26 17:50:05.000000000 +0200 +++ /mounts/work_src_done/STABLE/aaa_base/aaa_base.changes 2011-08-02 10:48:33.000000000 +0200 @@ -1,0 +2,15 @@ +Tue Aug 2 08:48:13 UTC 2011 - r...@suse.com + +- remove more occurrences of boot.loadmodules now in mkinitrd package + +------------------------------------------------------------------- +Tue Aug 2 00:11:07 UTC 2011 - r...@suse.com + +- remove etc/sysconfig/kernel, lives now in mkinitrd package + +------------------------------------------------------------------- +Tue Aug 2 00:01:51 UTC 2011 - r...@suse.com + +- sbin/service: skip *.disabled for --status-all (bnc#690282) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.Hh41rc/_old 2011-08-02 11:24:11.000000000 +0200 +++ /var/tmp/diff_new_pack.Hh41rc/_new 2011-08-02 11:24:11.000000000 +0200 @@ -21,7 +21,7 @@ Name: aaa_base Version: 12.1 -Release: 97 +Release: 99 License: GPLv2+ Group: System/Fhs Url: http://gitorious.org/opensuse/aaa_base @@ -155,7 +155,6 @@ /etc/init.d/boot.cgroup /etc/init.d/boot.klog /etc/init.d/boot.ldconfig -/etc/init.d/boot.loadmodules /etc/init.d/boot.localfs /etc/init.d/boot.localnet /etc/init.d/boot.rootfsck @@ -197,7 +196,6 @@ /var/adm/fillup-templates/sysconfig.boot /var/adm/fillup-templates/sysconfig.clock /var/adm/fillup-templates/sysconfig.cron -/var/adm/fillup-templates/sysconfig.kernel /var/adm/fillup-templates/sysconfig.language /var/adm/fillup-templates/sysconfig.news /var/adm/fillup-templates/sysconfig.proxy ++++++ aaa_base-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.Hh41rc/_old 2011-08-02 11:24:11.000000000 +0200 +++ /var/tmp/diff_new_pack.Hh41rc/_new 2011-08-02 11:24:11.000000000 +0200 @@ -33,7 +33,6 @@ addFilter("no-reload-entry.*/etc/init.d/single") addFilter("no-reload-entry.*/etc/init.d/boot.cleanup") addFilter("no-reload-entry.*/etc/init.d/halt") -addFilter("no-reload-entry.*/etc/init.d/boot.loadmodules") addFilter("no-reload-entry.*/etc/init.d/boot.ldconfig") addFilter("no-reload-entry.*/etc/init.d/boot") addFilter("no-reload-entry.*/etc/init.d/boot.klog") @@ -55,7 +54,6 @@ addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/boot.cleanup") addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/skeleton") addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/halt") -addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/boot.loadmodules") addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/boot.ldconfig") addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/boot") addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/boot.klog") ++++++ aaa_base.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/aaa_base.post new/aaa_base/aaa_base.post --- old/aaa_base/aaa_base.post 2011-07-26 17:49:10.000000000 +0200 +++ new/aaa_base/aaa_base.post 2011-08-02 10:47:39.000000000 +0200 @@ -32,7 +32,7 @@ # Initialize runlevel links # %{fillup_and_insserv -y boot.localfs boot.swap boot.klog boot.localnet halt random reboot single} -%{insserv_force_if_yast /etc/init.d/boot.loadmodules /etc/init.d/boot.cleanup /etc/init.d/boot.rootfsck} +%{insserv_force_if_yast /etc/init.d/boot.cleanup /etc/init.d/boot.rootfsck} ## powerfail probably needs empty header ... # add Kill-links in boot.d if needed: @@ -49,7 +49,7 @@ if ! [ -d /etc/sysconfig ] ; then mkdir -p /etc/sysconfig fi -for i in language backup boot kernel \ +for i in language backup boot \ suseconfig clock proxy windowmanager \ cron news shutdown ; do %{fillup_only -n $i} @@ -79,19 +79,6 @@ fi fi -# clear old install settings of MODULES_LOADED_ON_BOOT -eval `grep "^MODULES_LOADED_ON_BOOT" /etc/sysconfig/kernel` -MLOB_NEW="" -for i in $MODULES_LOADED_ON_BOOT ; do - case $i in - capability|raw1394|video1394) continue ;; - esac - MLOB_NEW="$MLOB_NEW${MLOB_NEW:+ }$i" -done -if test "$MODULES_LOADED_ON_BOOT" != "$MLOB_NEW" ; then - sed -i -e "s|^MODULES_LOADED_ON_BOOT=.*|MODULES_LOADED_ON_BOOT=\"$MLOB_NEW\"|" \ - /etc/sysconfig/kernel -fi # # Backup gshadow file and remove it (merge passwords into # /etc/group before). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/files/etc/init.d/boot.loadmodules new/aaa_base/files/etc/init.d/boot.loadmodules --- old/aaa_base/files/etc/init.d/boot.loadmodules 2011-07-26 17:49:10.000000000 +0200 +++ new/aaa_base/files/etc/init.d/boot.loadmodules 1970-01-01 01:00:00.000000000 +0100 @@ -1,51 +0,0 @@ -#! /bin/sh -# -# Copyright (c) 2002 SuSE Linux AG, Nuernberg, Germany. All rights reserved. -# -# File: /etc/init.d/boot.loadmodules -# Author: Jiri Srain <jsr...@suse.cz> -# -### BEGIN INIT INFO -# Provides: boot.loadmodules -# Required-Start: boot.udev -# Required-Stop: boot.udev -# Default-Start: B -# Default-Stop: -# Short-Description: load modules required to be loaded in specific order -# Description: load modules required to be loaded in specific order -### END INIT INFO - -. /etc/rc.status - -rc_reset - -case "$1" in - start|restart) - # Read variable for sysconfig and load all mentioned modules - echo Loading required kernel modules - . /etc/sysconfig/kernel - for I in $MODULES_LOADED_ON_BOOT ; do - if ! modprobe -n $I > /dev/null 2>&1 ; then continue ; fi - modprobe $I; - done - rc_status -v1 -r - ;; - stop) - # skip / nothing to do - ;; - status) - echo -n "Checking if boot.loadmodules has run" - rc_reset - for I in $MODULES_LOADED_ON_BOOT ; do - lsmod | grep -q "^$I " || rc_failed 3 - done - rc_status -v - ;; - *) - echo "Usage: $0 {start|stop|status|restart}" - exit 1 - ;; -esac - -rc_exit - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/files/sbin/service new/aaa_base/files/sbin/service --- old/aaa_base/files/sbin/service 2011-07-26 17:49:10.000000000 +0200 +++ new/aaa_base/files/sbin/service 2011-08-02 10:47:39.000000000 +0200 @@ -87,6 +87,7 @@ case "${rc##*/}" in *.local|*.rpm*|*.ba*|*.old|*.new) continue ;; *.dpkg|*.save|*.swp|*.core) continue ;; + *.disabled) continue ;; boot|rc|single|halt|reboot) continue ;; powerfail|rx|Makefile|README) continue ;; skeleton|*.d) continue ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/files/var/adm/fillup-templates/sysconfig.kernel new/aaa_base/files/var/adm/fillup-templates/sysconfig.kernel --- old/aaa_base/files/var/adm/fillup-templates/sysconfig.kernel 2011-07-26 17:49:10.000000000 +0200 +++ new/aaa_base/files/var/adm/fillup-templates/sysconfig.kernel 1970-01-01 01:00:00.000000000 +0100 @@ -1,73 +0,0 @@ -## Path: System/Kernel -## Description: -## Type: string -## Command: /sbin/mkinitrd -# -# This variable contains the list of modules to be added to the initial -# ramdisk by calling the script "mkinitrd" -# (like drivers for scsi-controllers, for lvm or reiserfs) -# -INITRD_MODULES="" - -## Type: string(yes) -## Command: /sbin/mkinitrd -## Default: "" -# -# -# This variable disables the initialization of KMS in the initrd -# by not including the modules required for KMS even though KMS is -# supported on the underlying hardware. -# After changing run mkinitrd again. -# -NO_KMS_IN_INITRD="no" - -## Type: string -## Command: /sbin/mkinitrd -# -# This variable contains the list of modules to be added to the initial -# ramdisk that is created for unprivilegd Xen domains (domU); you may need -# drivers for virtual block and network devices in addition to filesystem -# and device-mapper modules. -# -DOMU_INITRD_MODULES="xennet xenblk" - -## Type: string -## ServiceRestart: boot.loadmodules -# -# This variable contains the list of modules to be loaded -# once the main filesystem is active -# You will find a few default modules for hardware which -# can not be detected automatically. -# -MODULES_LOADED_ON_BOOT="" - -## Type: string -## Default: "" -# -# The file name of a binary ACPI Differentiated System Description Table -# (DSDT). This table is appended to the initial ram disk (initrd) that -# the mkinitrd script creates. If the kernel finds that its initrd -# contains a DSDT, this table replaces the DSDT of the bios. If the file -# specified in ACPI_DSDT is not found or ACPI_DSDT is empty/not specified, -# no DSDT will be appended to the initrd. -# Example path /etc/acpi/DSDT.aml -# You can also override Secondary System Description Tables (SSDTs). -# Add DSDT and SSDT files separated by spaces, e.g. "DSDT.aml SSDT1.aml" -# The files must be named DSDT.aml and/or SSDT[1-9]*.aml. -# For compatiblity reasons, if only one file is added it is assumed it is -# the DSDT and will be used as such, in future the above naming scheme -# will be enforce. -# Be aware that overriding these tables can harm your system. -# Only do this if you know what you are doing and file a bug on -# bugzilla.kernel.org so that the root cause of the issue will get fixed. -ACPI_DSDT="" - -## Type: string(yes) -## Default: "" -# -# Skip doing a minimal preparation of the /usr/src/linux source tree so -# that most header files can be directly included. If set, /usr/src/linux -# will not be touched. -# -SKIP_RUNNING_KERNEL="" - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
