Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at Thu Apr 15 23:37:06 CEST 2010. -------- --- aaa_base/aaa_base.changes 2010-03-29 14:15:46.000000000 +0200 +++ /mounts/work_src_done/STABLE/aaa_base/aaa_base.changes 2010-04-15 14:29:19.000000000 +0200 @@ -1,0 +2,26 @@ +Thu Apr 15 14:28:46 CEST 2010 - ro@suse.de + +- boot.rootfsck: do not use /dev/shm/root as fallback but /dev/root + +------------------------------------------------------------------- +Thu Apr 15 12:28:24 CEST 2010 - ro@suse.de + +- boot.localfs: update Should-Stop dependencies + +------------------------------------------------------------------- +Thu Apr 15 11:53:40 CEST 2010 - ro@suse.de + +- removed /etc/rc.d.README as well + +------------------------------------------------------------------- +Wed Apr 14 09:45:51 CEST 2010 - werner@suse.de + +- Use feature of pidof(1) of new sysvinit 2.88dsf + +------------------------------------------------------------------- +Thu Apr 8 15:33:52 CEST 2010 - ro@suse.de + +- drop /sbin/init.d.README and /etc/init.d/README + the manpage is "man 7 init.d" + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.rq76NQ/_old 2010-04-15 23:36:11.000000000 +0200 +++ /var/tmp/diff_new_pack.rq76NQ/_new 2010-04-15 23:36:11.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 AutoReqProv: on Version: 11.2 -Release: 67 +Release: 68 Summary: SUSE Linux Base Package BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: aaa_base.tar.bz2 @@ -96,15 +96,6 @@ ## do arch specific patches END # # -# generate README from init-manpage -# -test -s $RPM_BUILD_ROOT/usr/share/man/man7/init.d.7 || exit 1 -cat $RPM_BUILD_ROOT/usr/share/man/man7/init.d.7 | \ - troff -Tlatin1 -t -mandoc | grotty -cbou > \ - $RPM_BUILD_ROOT/etc/init.d/README -cp $RPM_BUILD_ROOT/etc/init.d/README $RPM_BUILD_ROOT/sbin/init.d.README -# -# # mark these as ghost for i in passwd group shadow gshadow ; do touch $RPM_BUILD_ROOT/var/adm/fillup-templates/$i.aaa_base ++++++ aaa_base.tar.bz2 ++++++ 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-03-11 14:55:11.000000000 +0100 +++ new/aaa_base/etc/init.d/boot.localfs 2010-04-15 12:28:14.000000000 +0200 @@ -10,7 +10,7 @@ # Required-Start: boot.udev boot.rootfsck # Should-Start: boot.md boot.lvm dasd_devfs_compat boot.multipath boot.evms boot.loadmodules # Required-Stop: boot.udev -# Should-Stop: boot.lvm dasd_devfs_compat boot.multipath +# Should-Stop: boot.md boot.lvm dasd_devfs_compat boot.multipath boot.evms # Default-Start: B # Default-Stop: # Short-Description: check and mount local filesystems except / @@ -193,7 +193,7 @@ else FSCK_OPTS="$FSCK_OPTS -V" fi - preload=$(pidof preload) + preload=$(PIDOF_NETFS=yes pidof preload) test -n "$preload" && kill -STOP $preload echo "Checking file systems..." fsck $FSCK_OPTS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/etc/init.d/boot.rootfsck new/aaa_base/etc/init.d/boot.rootfsck --- old/aaa_base/etc/init.d/boot.rootfsck 2010-03-08 16:47:44.000000000 +0100 +++ new/aaa_base/etc/init.d/boot.rootfsck 2010-04-15 14:28:36.000000000 +0200 @@ -45,15 +45,18 @@ ROOTFS_BLKDEV=$ROOTFS_REALDEV fi else - # if not booted via initrd, /dev is empty. - # use private devnode with proper permissions - ROOTFS_BLKDEV="/dev/shm/root" - rootcpio=`echo / | /bin/cpio --quiet -o -H newc` - rootmajor=0x${rootcpio:62:8} - rootminor=0x${rootcpio:70:8} - if [ $((rootmajor)) -ne 0 ] ; then - echo /bin/mknod -m600 $ROOTFS_BLKDEV b $((rootmajor)) $((rootminor)) - /bin/mknod -m600 $ROOTFS_BLKDEV b $((rootmajor)) $((rootminor)) + # if not booted via initrd, udev should still have + # created /dev/root already + # if not, create it + ROOTFS_BLKDEV="/dev/root" + if test ! -e /dev/root ; then + rootcpio=`echo / | /bin/cpio --quiet -o -H newc` + rootmajor=0x${rootcpio:62:8} + rootminor=0x${rootcpio:70:8} + if [ $((rootmajor)) -ne 0 ] ; then + echo /bin/mknod -m600 $ROOTFS_BLKDEV b $((rootmajor)) $((rootminor)) + /bin/mknod -m600 $ROOTFS_BLKDEV b $((rootmajor)) $((rootminor)) + fi fi fi # common options for file system check diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/etc/rc.d.README new/aaa_base/etc/rc.d.README --- old/aaa_base/etc/rc.d.README 2002-05-21 17:01:33.000000000 +0200 +++ new/aaa_base/etc/rc.d.README 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ - -Hi! - -Some people expect the system startup scripts in /etc/rc.d/. -We use a slightly different structure for better LSB compliance. -You can find the equivalent files in /etc/init.d/. -The behaviour of the scripts can be configured in the files -below the directory /etc/sysconfig/. - -For detailed information please have a look into the SuSE Linux manual. -If you don't have a printed manual, you can find the electronic version -in /docu on the first CDROM or in the package 'books.rpm'. - -You may also want to read /etc/init.d/README for more information. - -Have a lot of fun - - Your SuSE Team - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org