Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at Mon May 30 09:24:04 CEST 2011.
-------- --- aaa_base/aaa_base.changes 2011-05-18 17:03:15.000000000 +0200 +++ /mounts/work_src_done/STABLE/aaa_base/aaa_base.changes 2011-05-27 15:10:16.000000000 +0200 @@ -1,0 +2,20 @@ +Fri May 27 13:09:56 UTC 2011 - [email protected] + +- boot.cleanup cleanup +- make /var/lock tmpfs too +- bind mount /var/run in boot.localfs +- drop /etc/sysconfig/sysctl (fate#312343) + +------------------------------------------------------------------- +Tue May 24 09:40:40 UTC 2011 - [email protected] + +- dont' enable boot.ldconfig by default +- don't enable boot.clock by default (fate#312407) +- remove reference to runlevel 4 from skeleton.compat + +------------------------------------------------------------------- +Mon May 23 14:50:45 UTC 2011 - [email protected] + +- drop /etc/sysconfig/sysctl.conf (fate#312343) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.RyO7GN/_old 2011-05-30 09:05:59.000000000 +0200 +++ /var/tmp/diff_new_pack.RyO7GN/_new 2011-05-30 09:05:59.000000000 +0200 @@ -21,7 +21,7 @@ Name: aaa_base Version: 11.5 -Release: 81 +Release: 83 License: GPLv2+ Group: System/Fhs Url: http://gitorious.org/opensuse/aaa_base @@ -153,18 +153,18 @@ /etc/init.d/boot.cleanup /etc/init.d/boot.clock /etc/init.d/boot.cgroup -/etc/init.d/boot.ipconfig /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.proc /etc/init.d/boot.rootfsck /etc/init.d/boot.swap /etc/init.d/rc /etc/init.d/reboot /etc/tmpdirs.d/01_aaa_base +%dir /lib/aaa_base +/lib/aaa_base/convert_sysctl* /lib/YaST/SuSEconfig.functions /sbin/chkconfig /sbin/get_kernel_version @@ -203,7 +203,6 @@ /var/adm/fillup-templates/sysconfig.proxy /var/adm/fillup-templates/sysconfig.shutdown /var/adm/fillup-templates/sysconfig.suseconfig -/var/adm/fillup-templates/sysconfig.sysctl /var/adm/fillup-templates/sysconfig.windowmanager %dir /lib/udev %dir /lib/udev/devices ++++++ 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-05-18 16:20:12.000000000 +0200 +++ new/aaa_base/aaa_base.post 2011-05-27 15:08:44.000000000 +0200 @@ -31,12 +31,12 @@ # # Initialize runlevel links # -%{fillup_and_insserv -y 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.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} ## powerfail probably needs empty header ... # add Kill-links in boot.d if needed: -for i in proc localfs swap clock ldconfig ipconfig klog localnet loadmodules ; do +for i in localfs swap clock ldconfig klog localnet loadmodules ; do if [ -f /etc/init.d/boot.d/S??boot.$i -a ! -f /etc/init.d/boot.d/K??boot.$i ] ; then %{insserv_force_if_yast boot.$i} fi @@ -50,10 +50,15 @@ mkdir -p /etc/sysconfig fi for i in language backup boot kernel \ - suseconfig clock proxy windowmanager sysctl \ + suseconfig clock proxy windowmanager \ cron news shutdown ; do %{fillup_only -n $i} done +if [ -e /etc/sysconfig/sysctl ]; then + echo "merging /etc/sysconfig/sysctl into /etc/sysctl.conf ..." + /lib/aaa_base/convert_sysctl + mv /etc/sysconfig/sysctl /etc/sysconfig/sysctl.rpmsave +fi # migrate HALT_SOUND value if set before if [ -n "$HALT_SOUND" -a "$HALT_SOUND" != "no" ] ; then sed -i -e "s|^HALT_SOUND=.*|HALT_SOUND=\"$HALT_SOUND\"|" /etc/sysconfig/shutdown diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/files/etc/init.d/boot new/aaa_base/files/etc/init.d/boot --- old/aaa_base/files/etc/init.d/boot 2011-05-18 16:20:12.000000000 +0200 +++ new/aaa_base/files/etc/init.d/boot 2011-05-27 15:08:44.000000000 +0200 @@ -109,9 +109,7 @@ echo -n "Mounting tmpfs at /run" mount -n -t tmpfs -o mode=0755,nodev,noexec,nosuid tmpfs /run fi -if test -d /var/run; then - mount -n --bind /run /var/run -fi +mkdir /run/lock cp -axT --remove-destination /lib/udev/devices /dev diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/files/etc/init.d/boot.cleanup new/aaa_base/files/etc/init.d/boot.cleanup --- old/aaa_base/files/etc/init.d/boot.cleanup 2011-05-18 16:20:12.000000000 +0200 +++ new/aaa_base/files/etc/init.d/boot.cleanup 2011-05-27 15:08:44.000000000 +0200 @@ -1,7 +1,7 @@ -#! /bin/sh +#! /bin/bash # # Copyright (c) 2001-2005 SuSE Linux AG, Nuernberg, Germany. -# All rights reserved. +# Copyright (c) 2011 SUSE Linux Products GmbH, Nuernberg, Germany. # # /etc/init.d/boot.cleanup # @@ -22,52 +22,26 @@ . /etc/rc.status . /etc/sysconfig/cron +: ${TMP_DIRS_TO_CLEAR:=/tmp} +: ${CLEAR_TMP_DIRS_AT_BOOTUP:=no} + rc_reset case "$1" in - start|stop|restart) + start|stop) if test "$1" = "start" -o "$RUNLEVEL" = "6" ; then # - # clean up + # some legacy clean up # rm -f /var/lib/rpm/__db* - rm -rf /tmp/screens /tmp/uscreens 2>/dev/null - rm -f /tmp/.X*lock /var/spool/uucp/LCK* /var/log/sa/sadc.LOCK /fsck_corrected_errors 2>/dev/null - if test -x /usr/bin/find -a -x /usr/bin/xargs; then - { - find /tmp/ssh-* /tmp/gpg-* -type s -name "*agent*" -maxdepth 1 -print0 - find /var/lock -type f -print0 - if test -d /var/lib/ntp/var/run; then - find /var/lib/ntp/var/run -type f -print0 - fi - } 2>/dev/null | xargs -0r rm -f - else - # fallback for find if we get /usr from nfs - rec_rem() { - for f in "$1"/* - do - test "$f" = /var/run/utmp && continue - test -L "$f" && continue - test -f "$f" && rm -f "$f" - test -d "$f" && rec_rem "$f" - done - } - # - test -d /var/lock && rec_rem /var/lock - fi + rm -f /tmp/.X*lock /var/spool/uucp/LCK* /var/log/sa/sadc.LOCK /fsck_corrected_errors + rm -rf /tmp/ssh-* + rm -rf /tmp/gpg-* + touch /var/run/utmp chmod 664 /var/run/utmp chown root:utmp /var/run/utmp - # Re-read inittab for jobs and redo utmp records if required - test "$PREVLEVEL" = "S" && telinit q - - # FASTBOOT: This costs us ~1s, and could be done by a simple "mv" - # if at all necessary. - # - # # Restore a possibly dynamically modified /etc/resolv.conf - test "$DO_FASTBOOT" != "yes" && /sbin/netconfig update - # delete temp files # If $CLEAR_TMP_DIRS_AT_BOOTUP = yes, delete files in # $TMP_DIRS_TO_CLEAR, if $CLEAR_TMP_DIRS_AT_BOOTUP starts with a "/" @@ -89,13 +63,18 @@ done fi ;; + + restart|reload) + rc_failed 3 + rc_status -v + ;; status) # assume we have been run rc_reset rc_status -v ;; *) - echo "Usage: $0 {start|stop|status|restart}" + echo "Usage: $0 {start|stop|status}" exit 1 ;; esac diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/files/etc/init.d/boot.clock new/aaa_base/files/etc/init.d/boot.clock --- old/aaa_base/files/etc/init.d/boot.clock 2011-05-18 16:20:12.000000000 +0200 +++ new/aaa_base/files/etc/init.d/boot.clock 2011-05-27 15:08:44.000000000 +0200 @@ -1,8 +1,7 @@ #!/bin/bash # # Copyright (c) 2001-2002 SuSE Linux AG, Nuernberg, Germany. -# Copyright (c) 2008,2009 SuSE LINUX Products GmbH, Nuernberg, Germany. -# All rights reserved. +# Copyright (c) 2008-2011 SuSE LINUX Products GmbH, Nuernberg, Germany. # # /etc/init.d/boot.clock # @@ -24,8 +23,11 @@ . /etc/rc.status . /etc/sysconfig/clock +: ${HWCLOCK:=-u} +: ${SYSTOHC:=yes} + # -# Don't run into trouble due daylight-saving time +# Only compensate for clock drift if RTC is UTC # USE_ADJFILE=no case "$HWCLOCK" in diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/files/etc/init.d/boot.ipconfig new/aaa_base/files/etc/init.d/boot.ipconfig --- old/aaa_base/files/etc/init.d/boot.ipconfig 2011-05-18 16:20:12.000000000 +0200 +++ new/aaa_base/files/etc/init.d/boot.ipconfig 1970-01-01 01:00:00.000000000 +0100 @@ -1,159 +0,0 @@ -#! /bin/sh -# -# Copyright (c) 2001-2002 SuSE Linux AG, Nuernberg, Germany. -# All rights reserved. -# -# /etc/init.d/boot.ipconfig -# -### BEGIN INIT INFO -# Provides: boot.ipconfig -# Required-Start: -# Should-Start: boot.sysctl -# Required-Stop: -# Should-Stop: $null -# Default-Start: B -# Default-Stop: -# Short-Description: run ip configuration hooks -# Description: Set IP configuration hooks depending on -# values entered in /etc/sysconfig/sysctl -### END INIT INFO - -. /etc/rc.status -. /etc/sysconfig/sysctl - -rc_reset - -case "$1" in - start|restart) - # - # Enable "dynamic IP patch" - # - if test -n "$IP_DYNIP" -a "$IP_DYNIP" != no -a \ - -e /proc/sys/net/ipv4/ip_dynaddr ; then - echo -n "Enabling dynamic IP patch" - case "$IP_DYNIP" in - yes) echo 7 ; ECHO_RETURN=$rc_done ;; - [1-9]) echo $IP_DYNIP ; ECHO_RETURN=$rc_done ;; - *) ECHO_RETURN=" invalid IP_DYNIP=$IP_DYNIP $rc_skipped" ;; - esac > /proc/sys/net/ipv4/ip_dynaddr || ECHO_RETURN=$rc_failed - echo -e "$ECHO_RETURN" - fi - - # - # Enable syn flood protection - # - if test -n "$IP_TCP_SYNCOOKIES" -a "$IP_TCP_SYNCOOKIES" != no -a \ - -e /proc/sys/net/ipv4/tcp_syncookies ; then - echo -n "Enabling syn flood protection" - case "$IP_TCP_SYNCOOKIES" in - yes) echo 1 ; ECHO_RETURN=$rc_done ;; - *) ECHO_RETURN=" invalid IP_TCP_SYNCOOKIES=$IP_TCP_SYNCOOKIES $rc_skipped" ;; - esac > /proc/sys/net/ipv4/tcp_syncookies || ECHO_RETURN=$rc_failed - echo -e "$ECHO_RETURN" - fi - - - # - # Enable IP forwarding ? - # - if test -e /proc/sys/net/ipv4/ip_forward -a -n "$IP_FORWARD" ; then - case $IP_FORWARD in - yes) - echo -n "Enabling IP forwarding" - echo "1" > /proc/sys/net/ipv4/ip_forward - ;; - *) - echo -n "Disabling IP forwarding" - echo "0" > /proc/sys/net/ipv4/ip_forward - ;; - esac - rc_status -v -r - fi - # - # Enable IPv6 forwarding ? - # - LOAD_IPV6="no" - case $IPV6_FORWARD in - yes) LOAD_IPV6="yes" ;; - esac - case $IPV6_PRIVACY in - yes) LOAD_IPV6="yes" ;; - esac - test -n "$IPV6_MLD_VERSION" && LOAD_IPV6="yes" - test "$LOAD_IPV6" = "yes" && /sbin/modprobe ipv6 >/dev/null 2>&1 - # - if test -e /proc/sys/net/ipv6/conf/all/forwarding -a -n "$IPV6_FORWARD" ; then - case $IPV6_FORWARD in - yes) - echo -n "Enabling IPv6 forwarding" - echo "1" > /proc/sys/net/ipv6/conf/all/forwarding - ;; - *) - echo -n "Disabling IPv6 forwarding" - echo "0" > /proc/sys/net/ipv6/conf/all/forwarding - ;; - esac - rc_status -v -r - fi - # - # Enable IPv6 privacy? - # - if test -e /proc/sys/net/ipv6/conf/default/use_tempaddr -a -n "$IPV6_PRIVACY"; then - [ $IPV6_PRIVACY = yes ] && IPV6_PRIVACY=2 - case $IPV6_PRIVACY in - [0-9]) - echo -n "Enabling IPv6 privacy" - ;; - *) - echo -n "Disabling IPv6 privacy" - IPV6_PRIVACY=0 - ;; - esac - echo "$IPV6_PRIVACY" > /proc/sys/net/ipv6/conf/default/use_tempaddr - rc_status -v -r - fi - # - # Set MLD version? - # - if test -e /proc/sys/net/ipv6/conf/all/force_mld_version -a -n "$IPV6_MLD_VERSION"; then - echo -n "Setting MLD version to $IPV6_MLD_VERSION" - echo "$IPV6_MLD_VERSION" > /proc/sys/net/ipv6/conf/all/force_mld_version - rc_status -v -r - fi - ;; - stop) - # skip / nothing to do - ;; - status) - echo -n "checking if boot.ipconfig has been run" - rc_reset - VAL4=`cat /proc/sys/net/ipv4/ip_forward` - case $IP_FORWARD in - yes) - test "$VAL4" = "1" || rc_failed 3 - ;; - *) - test "$VAL4" = "0" || rc_failed 3 - ;; - esac - if test -e /proc/sys/net/ipv6/conf/all/forwarding ; then - VAL6=`cat /proc/sys/net/ipv6/conf/all/forwarding` - case $IPV6_FORWARD in - yes) - test "$VAL6" = "1" || rc_failed 3 - ;; - *) - test "$VAL6" = "0" || rc_failed 3 - ;; - esac - fi - 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/etc/init.d/boot.localfs new/aaa_base/files/etc/init.d/boot.localfs --- old/aaa_base/files/etc/init.d/boot.localfs 2011-05-18 16:20:12.000000000 +0200 +++ new/aaa_base/files/etc/init.d/boot.localfs 2011-05-27 15:08:44.000000000 +0200 @@ -23,7 +23,6 @@ # to get max number of parallel fsck processes . /etc/sysconfig/boot . /etc/sysconfig/kernel -. /etc/sysconfig/sysctl test -z "$REDIRECT" && REDIRECT="$(showconsole 2>/dev/null)" export REDIRECT @@ -155,12 +154,6 @@ case "$1" in start) - # handle DMAPI_PROBE here, boot.sysctl is too late - if test "$DMAPI_PROBE" = "yes" ; then - test -d /proc/sys/fs/xfs || modprobe xfs - test -e /proc/sys/fs/xfs/probe_dmapi && echo 1 > /proc/sys/fs/xfs/probe_dmapi - fi - # rootfs is mounted rw, lvm et al should be up now wait_for_udev @@ -292,6 +285,13 @@ mount -av -t $nofs -O no_netdev rc_status -v1 -r + if test -d /var/lock && ! mountpoint -q /var/lock; then + mount -n --bind /run/lock /var/lock + fi + if test -d /var/run && ! mountpoint -q /var/run; then + mount -n --bind /run /var/run + fi + # now handle uncommon mount points memfs_nonudev ;; @@ -353,6 +353,7 @@ /proc*) continue ;; /sys*) continue ;; /cgroup*) continue ;; + /run) continue ;; /sys/fs/*) continue ;; /sys/kernel/*) continue ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/files/etc/init.d/boot.proc new/aaa_base/files/etc/init.d/boot.proc --- old/aaa_base/files/etc/init.d/boot.proc 2011-05-18 16:20:12.000000000 +0200 +++ new/aaa_base/files/etc/init.d/boot.proc 1970-01-01 01:00:00.000000000 +0100 @@ -1,74 +0,0 @@ -#! /bin/sh -# -# Copyright (c) 2001-2002 SuSE Linux AG, Nuernberg, Germany. -# All rights reserved. -# -# /etc/init.d/boot.proc -# -### BEGIN INIT INFO -# Provides: boot.proc -# Required-Start: $null -# Required-Stop: $null -# Default-Start: B -# Default-Stop: -# Short-Description: sets some procfs values -# Description: sets some procfs values -### END INIT INFO - -. /etc/rc.status -. /etc/sysconfig/sysctl - -rc_reset - -case "$1" in - start) - # - # check if sysrq should be enabled - # - if test -e /proc/sys/kernel/sysrq ; then - case "$(rc_cmdline sysrq)" in - sysrq=yes|sysrq=1) ENABLE_SYSRQ="yes" ;; - esac - case "$ENABLE_SYSRQ" in - yes) ENABLE_SYSRQ=1 ;; - no) ENABLE_SYSRQ=0 ;; - [0-9]*) ;; - *) ENABLE_SYSRQ=0 ;; - esac - echo "$ENABLE_SYSRQ" > /proc/sys/kernel/sysrq - fi - - # - # check if STOP-A should be enabled - # - if test -e /proc/sys/kernel/stop-a ; then - if test "$ENABLE_STOP_A" = yes ; then - echo "1" > /proc/sys/kernel/stop-a - else - echo "0" > /proc/sys/kernel/stop-a - fi - fi - - # Disable ECN if required. - if test -e /proc/sys/net/ipv4/tcp_ecn; then - test "$DISABLE_ECN" = "yes" && echo "0" > /proc/sys/net/ipv4/tcp_ecn - test "$DISABLE_ECN" = "no" && echo "1" > /proc/sys/net/ipv4/tcp_ecn - fi - - ;; - stop|restart) - # skip / nothing to do - ;; - status) - # assume we have been run - rc_reset - 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/etc/init.d/boot.swap new/aaa_base/files/etc/init.d/boot.swap --- old/aaa_base/files/etc/init.d/boot.swap 2011-05-18 16:20:12.000000000 +0200 +++ new/aaa_base/files/etc/init.d/boot.swap 2011-05-27 15:08:44.000000000 +0200 @@ -20,83 +20,10 @@ . /etc/rc.status . /etc/sysconfig/kernel - -get_swap_id() { - local line dev min type; - type -p fdisk >/dev/null || return - fdisk -l 2>&1 | while read line; do - case "$line" in - /*Linux\ [sS]wap*) - echo "${line%% *}" - ;; - Disk\ /dev/*\ doesn*) - dev="${line##*/}" - dev="${dev%% *}" - type -p parted >/dev/null || continue - while read min type; do - case "$type" in - *type=82|*type=82,*) echo /dev/${dev}${min} - esac - done < <(parted -s /dev/$dev print quit 2>/dev/null) - ;; - esac - done -} - -check_swap_sig () { - local part="$(get_swap_id)" - local where what type rest p c - while read where what type rest ; do - test "$type" = "swap" || continue - c=continue - for p in $part ; do - if test "$p" -ef "$where"; then - c=true - break - fi - done - $c - case "$(dd if=$where bs=1 count=6 skip=4086 2>/dev/null)" in - S1SUSP|S2SUSP|ULSUSP) mkswap $where - esac - done < /etc/fstab -} - -enable_ps3_vram_swap () { - local prop - local ps3vram_swap=/dev/mtdblock0 - if test -f /proc/device-tree/model ; then - read prop < /proc/device-tree/model - case "$prop" in - SonyPS3) - echo "Activating swap to video ram" - modprobe -v ps3vram - modprobe -v mtdblock - sleep 1 - if test -b $ps3vram_swap ; then - mkswap -L ps3_vram_swap $ps3vram_swap - swapon -v -p 42 $ps3vram_swap - fi - ;; - esac - fi -} - rc_reset case "$1" in start) - # - # After mounting we may activate swap files in /etc/fstab - # .. this should work now with the new swapon behavio(u)r - # - # Check for swap signature only if sysfs is not mounted - # (then we have no way of knowing if swsuspend is enabled) - # or if /sys/power exists (then we are sure it is enabled). - if [ ! -d "/sys/devices" ] || [ -d "/sys/power" ]; then - check_swap_sig - fi - enable_ps3_vram_swap echo "Activating remaining swap-devices in /etc/fstab..." swapon -a &> /dev/null rc_status -v1 -r diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/files/etc/init.d/skeleton.compat new/aaa_base/files/etc/init.d/skeleton.compat --- old/aaa_base/files/etc/init.d/skeleton.compat 2011-05-18 16:20:12.000000000 +0200 +++ new/aaa_base/files/etc/init.d/skeleton.compat 2011-05-27 15:08:44.000000000 +0200 @@ -38,7 +38,7 @@ # Should-Start: $time ypbind smtp # Required-Stop: $syslog $remote_fs # Should-Stop: ypbind smtp -# Default-Start: 3 4 5 +# Default-Start: 3 5 # Default-Stop: 0 1 2 6 # Short-Description: FOO XYZ daemon providing ZYX # Description: Start FOO to allow XY and provide YZ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/files/lib/aaa_base/convert_sysctl new/aaa_base/files/lib/aaa_base/convert_sysctl --- old/aaa_base/files/lib/aaa_base/convert_sysctl 1970-01-01 01:00:00.000000000 +0100 +++ new/aaa_base/files/lib/aaa_base/convert_sysctl 2011-05-27 15:08:44.000000000 +0200 @@ -0,0 +1,127 @@ +#!/bin/bash +# read settings from /etc/sysconfig/sysctl and write them to +# /etc/sysctl.conf + +. /etc/sysconfig/sysctl 2>/dev/null || exit 0 + +nofile= +if [ "$1" = "--stdout" ]; then + shift + nofile=1 +fi +if [ -e "$cfg" -a ! -w "$cfg" ]; then + nofile=1 +fi + +cfg=/etc/sysctl.conf + +comment_added='' +_doset() +{ + if [ -z "$nofile" -a -z "$comment_added" ]; then + comment_added=1 + echo + echo "### converted from /etc/sysconfig/sysctl at `date -R`" + fi + echo "$1 = $2" +} + +doset() +{ + if [ -z "$nofile" ]; then + _doset "$@" >> $cfg + else + _doset "$@" + fi +} + +isset() +{ + test -z "$nofile" || return 1 + test -e /etc/sysctl.conf || return 1 + grep -q "$1" /etc/sysctl.conf || return 1 +} + +if ! isset net.ipv4.ip_dynaddr; then + if [ -n "$IP_DYNIP" -a "$IP_DYNIP" != 'no' ]; then + if [ "$IP_DYNIP" = 'yes' ]; then + IP_DYNIP=7 + fi + if [ -z "${IP_DYNIP//[0-9]/}" ]; then + doset net.ipv4.ip_dynaddr "$IP_DYNIP" + fi + fi +fi + + +if ! isset net.ipv4.tcp_syncookies; then + if [ "$IP_TCP_SYNCOOKIES" = "yes" ]; then + doset net.ipv4.tcp_syncookies 1 + fi +fi + +if ! isset net.ipv4.ip_forward; then + if [ "$IP_FORWARD" = "yes" ]; then + doset net.ipv4.ip_forward 1 + else + doset net.ipv4.ip_forward 0 + fi +fi + +if ! isset net.ipv6.conf.all.forwarding; then + if [ "$IPV6_FORWARD" = 'yes' ]; then + doset net.ipv6.conf.all.forwarding 1 + else + doset net.ipv6.conf.all.forwarding 0 + fi +fi + +if ! isset net.ipv6.conf.default.use_tempaddr; then + if [ -n "$IPV6_PRIVACY" ]; then + if [ $IPV6_PRIVACY = yes ]; then + IPV6_PRIVACY=2 + fi + if [ -z "${IPV6_PRIVACY//[0-9]/}" ]; then + doset net.ipv6.conf.default.use_tempaddr $IPV6_PRIVACY + fi + fi +fi + +if ! isset net.ipv6.conf.all.force_mld_version ; then + if [ -n "$IPV6_MLD_VERSION" -a -z "${IPV6_MLD_VERSION//[0-9]/}" ]; then + doset net.ipv6.conf.all.force_mld_version $IPV6_MLD_VERSION + fi +fi + +if ! isset kernel.sysrq; then + if [ "$ENABLE_SYSRQ" = 'yes' ]; then + ENABLE_SYSRQ=1 + elif [ "$ENABLE_SYSRQ" = 'no' -o "$ENABLE_SYSRQ" = '176' ]; then + # 176 is the distro default anyways + ENABLE_SYSRQ='' + fi + if [ -n "$ENABLE_SYSRQ" -a -z "${ENABLE_SYSRQ//[0-9]/}" ]; then + doset kernel.sysrq "$ENABLE_SYSRQ" + fi +fi + +# sparc only +if [ -e /proc/sys/kernel/stop-a ] && ! isset "kernel.stop-a"; then + if [ "$ENABLE_STOP_A" = yes ]; then + doset "kernel.stop-a" 1 + else + doset "kernel.stop-a" 0 + fi +fi + +if ! isset net.ipv4.tcp_ecn; then + if [ "$DISABLE_ECN" = 'yes' ]; then + doset net.ipv4.tcp_ecn 0 + fi +fi + +if ! isset fs.xfs.probe_dmapi; then + if [ "$DMAPI_PROBE" = 'yes' ]; then + doset fs.xfs.probe_dmapi 1 + fi +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/files/var/adm/fillup-templates/sysconfig.clock new/aaa_base/files/var/adm/fillup-templates/sysconfig.clock --- old/aaa_base/files/var/adm/fillup-templates/sysconfig.clock 2011-05-18 16:20:12.000000000 +0200 +++ new/aaa_base/files/var/adm/fillup-templates/sysconfig.clock 2011-05-27 15:08:44.000000000 +0200 @@ -9,8 +9,7 @@ # HWCLOCK="" -## Type: yesno -## Default: yes +## Type: list(yes,no,) ## Description: Write back system time to the hardware clock # # Is set to "yes" write back the system time to the hardware @@ -21,7 +20,12 @@ # skipped because it is rather useless without writing back # the system time to the hardware clock. # -SYSTOHC="yes" +# Note that you need to enable boot.clock for this feature to take +# effect. +# +# defaults to 'yes' if unset +# +SYSTOHC="" ## Type: string(Europe/Berlin,Europe/London,Europe/Paris) ## ServiceRestart: boot.clock diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/files/var/adm/fillup-templates/sysconfig.cron new/aaa_base/files/var/adm/fillup-templates/sysconfig.cron --- old/aaa_base/files/var/adm/fillup-templates/sysconfig.cron 2011-05-18 16:20:12.000000000 +0200 +++ new/aaa_base/files/var/adm/fillup-templates/sysconfig.cron 2011-05-27 15:08:44.000000000 +0200 @@ -19,12 +19,13 @@ MAX_DAYS_IN_LONG_TMP="0" ## Type: string -## Default: "/tmp" # # This variable contains a list of directories, in which old files are to # be searched and deleted. The frequency is determined by MAX_DAYS_IN_TMP # -TMP_DIRS_TO_CLEAR="/tmp" +# Defaults to /tmp if empty +# +TMP_DIRS_TO_CLEAR="" ## Type: string ## Default: "" @@ -43,7 +44,6 @@ OWNER_TO_KEEP_IN_TMP="root" ## Type: string -## Default: no # # "Set this to "yes" to entirely remove (rm -rf) all files and subdirectories # from the temporary directories defined in TMP_DIRS_TO_CLEAR on bootup. @@ -55,7 +55,9 @@ # This can be used to clear directories at boot as well as clearing unused # files out of other directories. # -CLEAR_TMP_DIRS_AT_BOOTUP="no" +# Defaults to 'no' if unset +# +CLEAR_TMP_DIRS_AT_BOOTUP="" ## Type: string ## Default: "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/files/var/adm/fillup-templates/sysconfig.sysctl new/aaa_base/files/var/adm/fillup-templates/sysconfig.sysctl --- old/aaa_base/files/var/adm/fillup-templates/sysconfig.sysctl 2011-05-18 16:20:12.000000000 +0200 +++ new/aaa_base/files/var/adm/fillup-templates/sysconfig.sysctl 1970-01-01 01:00:00.000000000 +0100 @@ -1,104 +0,0 @@ -## Path: Network/General -## Description: -## Type: list(yes,no,) -## ServiceRestart: boot.ipconfig -# Do you want the "dynamic IP patch" to be enabled at bootup? -# -# DEPRECATED -# set net.ipv4.ip_dynaddr in /etc/sysctl.conf instead -# -IP_DYNIP= - -## Type: list(yes,no,) -# -# Enable syn flood protection (see /usr/src/linux/Documentation/Configure.help) -# Built-in kernel default is "yes". -# -# DEPRECATED -# set net.ipv4.tcp_syncookies in /etc/sysctl.conf instead -# -IP_TCP_SYNCOOKIES= - -## Type: list(yes,no,) -# -# Runtime-configurable parameter: forward IP packets. -# Is this host a router? -# -# Note that SuSEfirewall2 may override this if active. -# -# DEPRECATED -# set net.ipv4.ip_forward in /etc/sysctl.conf instead -# -IP_FORWARD= - -## Type: list(yes,no,) -## Default: no -# -# Runtime-configurable parameter: forward IPv6 packets. -# -# DEPRECATED -# set net.ipv6.conf.all.forwarding in /etc/sysctl.conf instead -# -IPV6_FORWARD= - -## Type: list(yes,no,) -# -# Runtime-configurable parameter: use temporary IPv6 addresses -# instead of using the EUI-64 interface identifer -# -# DEPRECATED -# set net.ipv6.conf.default.use_tempaddr in /etc/sysctl.conf instead -# -IPV6_PRIVACY= - -## Type: integer(0:) -# -# Runtime-configurable parameter: send MLD announcements of this -# version. -# -# DEPRECATED -# set net.ipv6.conf.all.force_mld_version in /etc/sysctl.conf instead -# -IPV6_MLD_VERSION= - -## Type: list(yes,no,) -# -# If you have trouble connecting to some machines on the internet, -# this may be due to broken firewalls dropping network packets with -# the ECN (early congestion notification) flag set. -# Set this to yes to have ECN disabled at boot time. -# -DISABLE_ECN="yes" - -## Path: System/Kernel -## Type: yesno -## Default: no -# -# Enable dmapi module probe for the xfs filesystem driver -# (yes/no) -# -DMAPI_PROBE="no" - -## Path: System/Kernel -## Description: -## Type: string -# -# Magic SysRq Keys enable some control over the system even if it -# crashes (e.g. during kernel debugging). -# -# Possible values: -# - no: disable sysrq completely -# - yes: enable all functions of sysrq -# - bitmask of allowed sysrq functions: -# 2 - enable control of console logging level -# 4 - enable control of keyboard (SAK, unraw) -# 8 - enable debugging dumps of processes etc. -# 16 - enable sync command -# 32 - enable remount read-only -# 64 - enable signalling of processes (term, kill, oom-kill) -# 128 - allow reboot/poweroff -# 256 - allow nicing of all RT tasks -# -# For further information see /usr/src/linux/Documentation/sysrq.txt -# -ENABLE_SYSRQ="176" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
