Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at Fri Jan 14 03:04:25 CET 2011. -------- --- aaa_base/aaa_base.changes 2011-01-11 16:58:49.000000000 +0100 +++ aaa_base/aaa_base.changes 2011-01-12 13:09:14.000000000 +0100 @@ -1,0 +2,10 @@ +Wed Jan 12 12:06:32 UTC 2011 - lnussel@suse.de + +- rc.status: initialize terminal settings only once +- boot.cgroup: add init script to mount cgroups +- boot.localnet: remove useless use of cat and avoid ifup +- boot.localfs: don't update mtab if mtab is a link anyways +- boot.localfs: don't consider nofail mounts as missing +- boot: reorder and simplify mounting of file systems + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.ImzYWR/_old 2011-01-14 02:58:53.000000000 +0100 +++ /var/tmp/diff_new_pack.ImzYWR/_new 2011-01-14 02:58:53.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package aaa_base (Version 11.4) +# spec file for package aaa_base # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,7 +20,7 @@ Name: aaa_base Version: 11.4 -Release: 18 +Release: 19 License: GPLv2+ Group: System/Fhs Provides: bin bootutls etc skeleng skelger @@ -166,6 +166,7 @@ /etc/hushlogins /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 ++++++ aaa_base.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/etc/init.d/boot new/aaa_base/etc/init.d/boot --- old/aaa_base/etc/init.d/boot 2010-10-22 01:39:19.000000000 +0200 +++ new/aaa_base/etc/init.d/boot 2011-01-12 13:05:40.000000000 +0100 @@ -66,19 +66,10 @@ # # mount usual filesystems if not already done by initramfs or the kernel # -DTYPE=$(stat -f -c "%T" /proc 2>/dev/null) -if test "$DTYPE" != "proc" ; then - echo -n "Mounting procfs at /proc" - mount -n -t proc proc /proc - rc_status -v -r -fi - -DTYPE=$(stat -f -c "%T" /sys 2>/dev/null) -if test "$DTYPE" != "sysfs" ; then - echo -n "Mounting sysfs at /sys" - mount -n -t sysfs sysfs /sys - rc_status -v -r -fi +echo -n "mounting mandatory file systems ..." +test -c /dev/null || /bin/mknod -m 666 /dev/null c 1 3 +test -e /proc/mounts || /bin/mount -n -t proc proc /proc >/dev/null 2>&1 +test -e /sys/class || /bin/mount -n -t sysfs sysfs /sys >/dev/null 2>&1 HAVE_DEBUGFS=0 HAVE_DEVTMPFS=0 @@ -87,15 +78,6 @@ test "$type" = "devtmpfs" && HAVE_DEVTMPFS=1 done < /proc/filesystems -if test -d /sys/kernel/debug ; then - DTYPE=$(stat -f -c "%T" /sys/kernel/debug 2>/dev/null) - if test "$DTYPE" = "sysfs" -a "$HAVE_DEBUGFS" = "1" ; then - echo -n "Mounting debugfs at /sys/kernel/debug" - mount -n -t debugfs debugfs /sys/kernel/debug - rc_status -v -r - fi -fi - DTYPE=$(stat -f -c "%T" /dev 2>/dev/null) if test "$DTYPE" != "tmpfs" ; then if test "$HAVE_DEVTMPFS" = "0" ; then @@ -109,25 +91,25 @@ rc_status -v -r fi -echo -n "Copying static /dev content" cp -axT --remove-destination /lib/udev/devices /dev -rc_status -v -r -if test "$(stat -Lc %d /dev/shm 2>/dev/null)" = "$(stat -Lc %d /dev/shm/.. 2>/dev/null)" ; then - echo -n "Mounting tmpfs at /dev/shm" +if test -d /sys/kernel/debug -a "$HAVE_DEBUGFS" = "1" ; then + mount -n -t debugfs debugfs /sys/kernel/debug > /dev/null 2>&1 +fi + +if ! test -d /dev/shm; then mkdir -p -m 1777 /dev/shm mount -t tmpfs -o mode=1777 tmpfs /dev/shm - rc_status -v -r fi -DTYPE=$(stat -f -c "%T" /dev/pts 2>/dev/null) -if test "$DTYPE" != "devpts" ; then - echo -n "Mounting devpts at /dev/pts" +if ! test -d /dev/pts; then mkdir -p -m 755 /dev/pts mount -n -t devpts -o mode=0620,gid=5 devpts /dev/pts - rc_status -v -r fi +rc_failed 0 +rc_status -v + # # Set I/O of this script and its childs to console # @@ -159,8 +141,8 @@ if test "$ENFORCE_BLOGD" = yes ; then DO_BLOGD=yes fi -test -z "$CONFIRM_PROMPT_TIMEOUT" && CONFIRM_PROMPT_TIMEOUT=5 if test "$PROMPT_FOR_CONFIRM" = "yes" -a "$DO_CONFIRM" != "yes" ; then + test -z "$CONFIRM_PROMPT_TIMEOUT" && CONFIRM_PROMPT_TIMEOUT=5 echo -en "${extd}Enter Interactive startup mode?${norm}" rc_timer_on "$CONFIRM_PROMPT_TIMEOUT" 37 read -t "$CONFIRM_PROMPT_TIMEOUT" -n 1 \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/etc/init.d/boot.cgroup new/aaa_base/etc/init.d/boot.cgroup --- old/aaa_base/etc/init.d/boot.cgroup 1970-01-01 01:00:00.000000000 +0100 +++ new/aaa_base/etc/init.d/boot.cgroup 2011-01-12 16:47:22.000000000 +0100 @@ -0,0 +1,70 @@ +#!/bin/bash +# +# Copyright (c) 2010 SuSE Linux Products GmbH, Nuernberg, Germany. +# +# /etc/init.d/boot.cgroup +# +### BEGIN INIT INFO +# Provides: boot.cgroup +# Required-Start: boot.udev +# Should-Start: boot.loadmodules +# Required-Stop: $null +# Should-Stop: $null +# Default-Start: B +# Default-Stop: +# Short-Description: mount /sys/fs/cgroup +# Description: mount /sys/fs/cgroup +### END INIT INFO + +. /etc/rc.status + +rc_reset + +case "$1" in + start) + echo -n "mounting cgroup file systems..." + if [ ! -e /sys/fs/cgroup -o ! -e /proc/cgroups ]; then + rc_status -u + rc_exit + fi + if ! /bin/mountpoint -q /sys/fs/cgroup; then + if ! mount -t tmpfs tmpfs -o mode=755,nosuid,nodev,noexec /sys/fs/cgroup; then + rc_status -v1 + rc_exit + fi + fi + + while read name h num enabled rest; do + [ "${name###}" = "$name" ] || continue + [ "$enabled" -eq 1 ] || continue + d="/sys/fs/cgroup/$name" + /bin/mountpoint -q "$d" && continue + [ -e "$d" ] || mkdir "$d" + if mount -t cgroup -o nosuid,nodev,noexec,$name cgroup "$d"; then + echo -n " $name" + else + rc_failed 1 + fi + done < <(cat /proc/cgroups) + rc_status -v + ;; + stop) + echo -n "umounting cgroup file systems..." + rc_status -s + ;; + restart) + rc_failed 3 + rc_status -v + ;; + status) + echo -n "Checking if boot.cgroup has 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/etc/init.d/boot.localfs new/aaa_base/etc/init.d/boot.localfs --- old/aaa_base/etc/init.d/boot.localfs 2010-12-15 12:21:01.000000000 +0100 +++ new/aaa_base/etc/init.d/boot.localfs 2011-01-12 13:05:40.000000000 +0100 @@ -82,7 +82,7 @@ list_missed () { local dev line - local mount_opts="-t $nofs -O no_netdev" + local mount_opts="-t $nofs -O no_netdev -O nonofail" mount -afnv $mount_opts 2> /dev/null | while read line ; do dev="${line%% *}" @@ -259,27 +259,29 @@ # for / and /proc). # echo "Mounting local file systems..." - mount -fv -t proc proc /proc - mount -fv -t sysfs sysfs /sys - # - HAVE_DEBUGFS=0 - DEVTMPFS=tmpfs - while read dev type ; do - test "$type" = "debugfs" && HAVE_DEBUGFS=1 - test "$type" = "devtmpfs" && DEVTMPFS=devtmpfs - done < /proc/filesystems + if ! test -L /etc/mtab; then + mount -fv -t proc proc /proc + mount -fv -t sysfs sysfs /sys + # + HAVE_DEBUGFS=0 + DEVTMPFS=tmpfs + while read dev type ; do + test "$type" = "debugfs" && HAVE_DEBUGFS=1 + test "$type" = "devtmpfs" && DEVTMPFS=devtmpfs + done < /proc/filesystems - if test -d /sys/kernel/debug -a "$HAVE_DEBUGFS" = "1" ; then - mount -fv -t debugfs debugfs /sys/kernel/debug - fi - if test ! -d /sys/block/loop0 ; then - /sbin/modprobe loop + if test -d /sys/kernel/debug -a "$HAVE_DEBUGFS" = "1" ; then + mount -fv -t debugfs debugfs /sys/kernel/debug + fi + if test ! -d /sys/block/loop0 ; then + /sbin/modprobe loop + fi + mount -fv -t $DEVTMPFS -o mode=0755 $DEVTMPFS /dev + rc_status + mount -fv -t tmpfs -o mode=1777 tmpfs /dev/shm + mount -fv -t devpts -o mode=0620,gid=5 devpts /dev/pts + rc_status fi - mount -fv -t $DEVTMPFS -o mode=0755 $DEVTMPFS /dev - rc_status - mount -fv -t tmpfs -o mode=1777 tmpfs /dev/shm - mount -fv -t devpts -o mode=0620,gid=5 devpts /dev/pts - rc_status # remount to make sure options from fstab are honoured mount -oremount /proc mount -oremount /sys diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/etc/init.d/boot.localnet new/aaa_base/etc/init.d/boot.localnet --- old/aaa_base/etc/init.d/boot.localnet 2010-03-08 16:46:58.000000000 +0100 +++ new/aaa_base/etc/init.d/boot.localnet 2011-01-12 13:05:40.000000000 +0100 @@ -30,7 +30,7 @@ # XHOSTNAME="" test -f /etc/HOSTNAME && { - XHOSTNAME=`cat /etc/HOSTNAME` + read XHOSTNAME < /etc/HOSTNAME } test -n "$HOSTNAME" -a "$HOSTNAME" != '(none)' && { echo Using boot-specified hostname \'${HOSTNAME}\' @@ -44,7 +44,7 @@ XDOMAINNAME="" test -f /etc/defaultdomain && { - XDOMAINNAME=`cat /etc/defaultdomain` + read XDOMAINNAME < /etc/defaultdomain } test -n "$XDOMAINNAME" && { echo -n Setting up NIS domainname \'$XDOMAINNAME\' @@ -57,11 +57,11 @@ unset XHOSTNAME unset XDOMAINNAME - test -x /sbin/ifup -a -f /etc/sysconfig/network/ifcfg-lo && { - echo -n "Setting up loopback interface " - /sbin/ifup lo -o rc manual - rc_status -v -r - } + echo -n "Setting up loopback interface " + #/sbin/ifconfig lo 127.0.0.1 up + /sbin/ip addr add 127.0.0.1/8 brd + dev lo + /sbin/ip link set lo up + rc_status -v -r ;; stop|restart) # skip / nothing to do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/etc/rc.status new/aaa_base/etc/rc.status --- old/aaa_base/etc/rc.status 2010-09-16 12:43:07.000000000 +0200 +++ new/aaa_base/etc/rc.status 2011-01-12 13:05:40.000000000 +0100 @@ -41,16 +41,19 @@ if test -n "$REDIRECT" ; then set -- $(stty size < "$REDIRECT" 2> /dev/null || echo 0 0) else - set -- $(stty size <&1 2> /dev/null || echo 0 0) + set -- $(stty size 2> /dev/null || echo 0 0) fi LINES=$1 COLUMNS=$2 - test $LINES -eq 0 && LINES=24 - test $COLUMNS -eq 0 && COLUMNS=80 - export LINES COLUMNS + if test $LINES -eq 0 -o $COLUMNS -eq 0; then + LINES=24 + COLUMNS=80 + TERM=dumb + fi } trap 'rc_lc' SIGWINCH -rc_lc +test -n "$COLUMNS" -a -n "$LINES" || rc_lc +export LINES COLUMNS # Make sure we have /sbin and /usr/sbin in PATH case ":$PATH:" in @@ -62,7 +65,7 @@ ;; esac -if test -t 1 -a "$TERM" != "raw" -a "$TERM" != "dumb" && stty size <&1 > /dev/null 2>&1 ; then +if test -t 1 -a "$TERM" != "raw" -a "$TERM" != "dumb"; then esc=`echo -en "\033"` extd="${esc}[1m" warn="${esc}[1;31m" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org