Hello community,
here is the log from the commit of package aaa_base
checked in at Thu Aug 21 18:02:43 CEST 2008.
--------
--- aaa_base/aaa_base.changes 2008-08-18 01:36:33.000000000 +0200
+++ aaa_base/aaa_base.changes 2008-08-19 01:21:07.275167000 +0200
@@ -1,0 +2,6 @@
+Tue Aug 19 01:20:41 CEST 2008 - ro@suse.de
+
+- remove deprecated "-p" option from fillup_and_insserv call
+- remove rc.config related snippets (from before sles8)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ aaa_base.spec ++++++
--- /var/tmp/diff_new_pack.y30248/_old 2008-08-21 18:01:18.000000000 +0200
+++ /var/tmp/diff_new_pack.y30248/_new 2008-08-21 18:01:18.000000000 +0200
@@ -28,7 +28,7 @@
PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/ls /bin/date /usr/bin/cmp /bin/fillup /sbin/insserv udev net-tools
AutoReqProv: on
Version: 11.0.42
-Release: 31
+Release: 34
Summary: SUSE Linux Base Package
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: aaa_base.tar.bz2
@@ -74,7 +74,7 @@
cp -a ../aaa_base/* $RPM_BUILD_ROOT
cp $RPM_SOURCE_DIR/get_kernel_version $RPM_BUILD_ROOT/sbin
mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
-for i in $RPM_BUILD_DIR/sysconfig_parts/sysconfig.* $RPM_BUILD_DIR/sysconfig_parts/removed_variables.aaa_base; do
+for i in $RPM_BUILD_DIR/sysconfig_parts/sysconfig.* ; do
cp $i $RPM_BUILD_ROOT/var/adm/fillup-templates/
done
#
@@ -150,6 +150,9 @@
%defattr(-,root,root)
%changelog
+* Tue Aug 19 2008 ro@suse.de
+- remove deprecated "-p" option from fillup_and_insserv call
+- remove rc.config related snippets (from before sles8)
* Mon Aug 18 2008 ro@suse.de
- fix header for boot.localnet
* Mon Aug 11 2008 werner@suse.de
++++++ aaa_base.post ++++++
--- aaa_base/aaa_base.post 2008-07-22 15:33:06.000000000 +0200
+++ aaa_base/aaa_base.post 2008-08-19 01:19:33.893917000 +0200
@@ -34,62 +34,13 @@
cp etc/nsswitch.conf etc/nsswitch.conf.aaa_base
sed "s|dns6|dns|g" < etc/nsswitch.conf.aaa_base > etc/nsswitch.conf
}
-#
-# the following rc.config-variables changed their names during the releases,
-# so we have to change them here ...
-# FONT to CONSOLE_FONT
-# TRANSLATION to CONSOLE_UNICODEMAP
-# GMT to HWCLOCK
-# replace CREATE_RESOLVCONF by comment
-# comment out NAMESERVER
-# comment out SEARCHLIST
-# comment out LANGUAGE
-# delete umask line
-#
-if test -s etc/rc.config ; then
- sed -e"s/^FONT=/CONSOLE_FONT=/" \
- -e"s/^TRANSLATION=/CONSOLE_UNICODEMAP=/" \
- -e"s/^GMT=/HWCLOCK=/" \
- -e"s/^CREATE_RESOLVCONF=.*/# Update: SuSEconfig will no longer touch resolv.conf/" \
- -e"s/^NAMESERVER=\(.*\)/# NAMESERVER=\1/" \
- -e"s/^SEARCHLIST=\(.*\)/# SEARCHLIST=\1/" \
- -e"s/^umask .*//" \
- -e"s/^test \$rc_done=/test \"\$rc_done\"=/" \
- -e"s/^LANGUAGE=/# LANGUAGE=/" etc/rc.config \
- > etc/rc.config.t && mv etc/rc.config.t etc/rc.config
- rm -f etc/rc.config.t
-fi
# GMT might already be in sysconfig/clock
%{rename_sysconfig_variable -f etc/sysconfig/clock GMT HWCLOCK}
-# XXX uncommented temporary
-if [ -e etc/aaa_base_debug -a ! -e etc/rc.config ]; then
- cat << EOF > etc/rc.config
-#
-# /etc/rc.config
-#
-# Copyright (c) 1996-2002 SuSE Linux AG Nuernberg, Germany.
-# All rights reserved.
-#
-# Author: Werner Fink , 1996
-# Burchard Steinbild, 1996
-#
-# The configuration databases for shell scripts in /etc/init.d,
-# /sbin/SuSEconfig and /etc/cron.daily/suse.de-* can now be found
-# in the /etc/sysconfig directory. This file should not be used any
-# longer and will disappear in one of the next releases.
-#
-# Please edit the files in the /etc/sysconfig directory and execute
-# /sbin/SuSEconfig to configure everything.
-#
-
-EOF
- chmod 644 etc/rc.config
-fi
#
# Initialize runlevel links
#
-%{fillup_and_insserv -py boot.proc boot.localfs boot.swap boot.clock boot.ldconfig boot.ipconfig boot.klog boot.localnet halt random reboot single}
+%{fillup_and_insserv -y boot.proc boot.localfs boot.swap boot.clock boot.ldconfig boot.ipconfig 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}
## powerfail probably needs empty header ...
@@ -100,12 +51,6 @@
fi
done
-#
-# remove old stuff from rc.config
-if [ -x bin/fillup -a -f etc/rc.config ] ; then
- bin/fillup -q -t -r -i -d "=" etc/rc.config var/adm/fillup-templates/removed_variables.aaa_base /dev/null
- test -s etc/rc.config.new && mv etc/rc.config.new etc/rc.config
-fi
%{remove_and_set -n security CONSOLE_SHUTDOWN}
%{remove_and_set -n suseconfig CHECK_INITTAB}
%{remove_and_set -n suseconfig HALT_SOUND}
@@ -113,10 +58,6 @@
if ! [ -d etc/sysconfig ] ; then
mkdir -p etc/sysconfig
fi
-# language was called lang before
-if [ ! -f etc/sysconfig/language -a -f etc/rc.config.d/lang.rc.config ] ; then
- mv etc/rc.config.d/lang.rc.config etc/sysconfig/language
-fi
for i in language backup boot kernel \
suseconfig clock proxy windowmanager sysctl \
cron news shutdown ; do
++++++ aaa_base.pre ++++++
--- aaa_base/aaa_base.pre 2008-01-23 21:51:54.000000000 +0100
+++ aaa_base/aaa_base.pre 2008-08-19 01:17:15.486387000 +0200
@@ -249,13 +249,6 @@
fi
done
-# Backup YP_DOMAINNAME, before we remove it
-if test ! -f etc/defaultdomain -a -f /etc/rc.config ; then
- eval `grep ^YP_DOMAINNAME etc/rc.config 2>/dev/null`
- echo -n $YP_DOMAINNAME > etc/defaultdomain
- chmod 644 etc/defaultdomain
-fi
-
if test -f /root/.gnupg/secring.gpg ; then
cp -a /root/.gnupg/secring.gpg /root/.gnupg/secring.gpg.aaa_save
fi
++++++ sysconfig_parts.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig_parts/removed_variables.aaa_base new/sysconfig_parts/removed_variables.aaa_base
--- old/sysconfig_parts/removed_variables.aaa_base 2007-01-26 16:13:41.000000000 +0100
+++ new/sysconfig_parts/removed_variables.aaa_base 1970-01-01 01:00:00.000000000 +0100
@@ -1,162 +0,0 @@
-#
-# If you want that new passwords will be checked through cracklib,
-# set PASSWD_USE_CRACKLIB to "yes".
-#
-PASSWD_USE_CRACKLIB="no"
-
-#
-# If you want to allow root logins from other machines, set ROOT_LOGIN_REMOTE
-# to "yes". (Logging in via ssh is not affected by this variable since SSH
-# is widely accepted as a safe login method).
-#
-ROOT_LOGIN_REMOTE="no"
-
-#
-# SERIAL_CONSOLE is used to add a serial terminal to inittab and securetty.
-# The format is "ttyS0,9600" as used in the kernel commandline.
-#
-SERIAL_CONSOLE=""
-
-#
-# NIS-domain, ask the admin of the NIS or NIS+ Server.
-# If the domainname is not set, ypbind will not be started.
-#
-YP_DOMAINNAME=""
-
-#
-# YP-Servers. Attention! You've to fill in IP adresses, a name or a nick
-# name here. It must be defined in /etc/hosts (case sensitive).
-# (e.g. "192.168.116.11 192.168.7.7")
-#
-YP_SERVER=""
-
-#
-# Should /etc/yp.conf be created automatically? ("yes" or "no")
-# If set to yes /etc/passwd and /etc/group will also be checked.
-# ypbind will not be startet if /etc/yp.conf does not exist.
-#
-CREATE_YP_CONF="yes"
-
-#
-# SuSEconfig can create and check the /etc/host.conf for you. Should this
-# be done ("yes" or "no").
-#
-CREATE_HOSTCONF="yes"
-
-#
-# Which device is the modem ? (e.g. "/dev/ttyS1")
-# (can be safely removed during update, the link is set already
-# then, on installation, YaST2 sets the link)
-MODEM=""
-
-#
-# Enable this in order to automatically load the memstat
-# kernel module for xosview at boot time if the module is
-# available for the currently running kernel.
-#
-LOAD_MEMSTAT_MODULE="no"
-
-#
-# May SuSEconfig run h2ph when kernelsources have changed
-#
-GENERATE_PERL_SYSTEM_INCLUDES="yes"
-
-#
-# Do you want ide dma mode to be started?
-# Some notes:
-# * If ide dma mode works, depends on your hardware, if you assume that you
-# have new, good non-flaky hardware, you can use it.
-# * which ide drives should use dma mode can be set in /etc/rc.config.d/idedma.rc.config
-#
-START_IDEDMA="no"
-
-#
-# Do you want USB support to be started?
-# This allows autoloading of USB drivers for printer, scanner etc.
-# The support for mouse and keyboard is either compiled into the kernel
-# or loaded via a initrd.
-# Some notes:
-# * you need to enable USB in the BIOS on an i386 compatible machine
-#
-START_USB="yes"
-
-# obsolete variable
-GOPHER_PROXY=""
-
-# obsolete variable
-HOW_TO_HANDLE_COMMERCIAL_LIBS=""
-
-# obsolete variable
-START_KERNELD=""
-
-# obsolete variable
-IRDA_IRQ=""
-
-# obsolete variable
-PCMCIA=""
-
-# obsolete variable
-USE_KERNEL_NFSD=""
-
-# obsolete variable
-KWM_GIMMICK_PIXMAP=""
-
-# obsolete variable
-DEFAULT_LANGUAGE=""
-
-# obsolete variable
-CHECK_ETC_HOSTS=""
-
-# obsolete variable
-BEAUTIFY_ETC_HOSTS=""
-
-# obsolete variable
-USE_MAKE=""
-
-# obsolete variable
-DEV_ON_TMPFS=""
-
-# obsolete variable
-SHMFS_SIZE=""
-
-# obsolete variable
-SHMFS_OPTIONS=""
-
-# obsolete variable
-SORT_PASSWD_BY_UID=""
-
-# obsolete variable
-MAIL_REPORTS_TO=""
-
-# obsolete variable
-MAIL_LEVEL=""
-
-# obsolete variable
-CREATE_INFO_DIR=""
-
-##
-## Formatting the boot script messages:
-## The boot scripts should use the variables rc_done and rc_fail to
-## symbolize their success. See /etc/init.d/skeleton for an example
-## how to use these variables.
-## rc_done_up and rc_failed_up do the same as rc_done and rc_failed
-## but one line above (usefull for starting daemons who talk to user).
-## The variable rc_reset is used by the master resource control script
-## /etc/init.d/rc to turn off all attributes and switch on the standard
-## character set.
-##
-## \033 is just ascii ESC
-## \033[<NUM>G move to column <NUM>
-## \033[1m switch bold on
-## \033[31m switch red on
-## \033[32m switch green on
-## \033[33m switch yellow on
-## \033[m switch color/bold off
-##
- rc_done="\033[71G\033[32mdone\033[m"
- rc_failed="\033[71G\033[31m\033[1mfailed\033[m"
- rc_skipped="\033[71G\033[1mskipped\033[m"
- rc_done_up="\033[1A$rc_done"
-rc_failed_up="\033[1A$rc_failed"
- rc_unused="\033[71G\033[1munused\033[m"
- rc_reset="\033[m\017"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org