Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at Wed Jun 1 09:12:03 CEST 2011. -------- --- aaa_base/aaa_base.changes 2011-05-30 21:26:35.000000000 +0200 +++ /mounts/work_src_done/STABLE/aaa_base/aaa_base.changes 2011-05-31 16:55:38.000000000 +0200 @@ -1,0 +2,12 @@ +Tue May 31 14:54:38 UTC 2011 - werner@suse.de + +- Enable container check for devtmpfs (bnc#696026) to be able + to use a static /dev within the container + +------------------------------------------------------------------- +Tue May 31 14:10:09 UTC 2011 - lnussel@suse.de + +- add back telinit q call +- fix group and mode of /var/lock + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.tRYG4p/_old 2011-06-01 09:02:18.000000000 +0200 +++ /var/tmp/diff_new_pack.tRYG4p/_new 2011-06-01 09:02:18.000000000 +0200 @@ -21,7 +21,7 @@ Name: aaa_base Version: 11.5 -Release: 85 +Release: 87 License: GPLv2+ Group: System/Fhs Url: http://gitorious.org/opensuse/aaa_base ++++++ aaa_base.tar.bz2 ++++++ 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-27 15:08:44.000000000 +0200 +++ new/aaa_base/files/etc/init.d/boot 2011-05-31 16:53:20.000000000 +0200 @@ -79,28 +79,32 @@ # mount usual filesystems if not already done by initramfs or the kernel # 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 +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 while read dev type ; do - test "$type" = "debugfs" && HAVE_DEBUGFS=1 + test "$type" = "debugfs" && HAVE_DEBUGFS=1 test "$type" = "devtmpfs" && HAVE_DEVTMPFS=1 done < /proc/filesystems -DTYPE=$(stat -f -c "%T" /dev 2>/dev/null) -if test "$DTYPE" != "tmpfs" ; then - if test "$HAVE_DEVTMPFS" = "0" ; then - echo "************************* FATAL ERROR *************************" - echo "******* CONFIG_DEVTMPFS missing from kernel, cannot continue..." - echo "***************************************************************" - /sbin/halt -f +if test "$container" != "lxc" ; then + DTYPE=$(stat -f -c "%T" /dev 2>/dev/null) + if test "$DTYPE" != "tmpfs" ; then + if test "$HAVE_DEVTMPFS" = "0" ; then + echo "************************* FATAL ERROR *************************" + echo "******* CONFIG_DEVTMPFS missing from kernel, cannot continue..." + echo "***************************************************************" + /sbin/halt -f + fi + echo -n "Mounting devtmpfs at /dev" + mount -n -t devtmpfs -o mode=0755 devtmpfs /dev + rc_status -v -r fi - echo -n "Mounting devtmpfs at /dev" - mount -n -t devtmpfs -o mode=0755 devtmpfs /dev - rc_status -v -r + cp -axT --remove-destination /lib/udev/devices /dev + test -c /dev/null || /bin/mknod -m 666 /dev/null c 1 3 fi DTYPE=$(stat -f -c "%T" /run 2>/dev/null) @@ -109,9 +113,8 @@ echo -n "Mounting tmpfs at /run" mount -n -t tmpfs -o mode=0755,nodev,noexec,nosuid tmpfs /run fi -mkdir /run/lock - -cp -axT --remove-destination /lib/udev/devices /dev +mkdir -m 0775 /run/lock +chgrp 54 /run/lock # lock if test -d /sys/kernel/debug -a "$HAVE_DEBUGFS" = "1" ; then mount -n -t debugfs debugfs /sys/kernel/debug > /dev/null 2>&1 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-27 15:08:44.000000000 +0200 +++ new/aaa_base/files/etc/init.d/boot.cleanup 2011-05-31 16:53:20.000000000 +0200 @@ -42,6 +42,9 @@ 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 + # 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 "/" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de