Hello community, here is the log from the commit of package mkinitrd for openSUSE:Factory checked in at Thu Apr 21 13:40:27 CEST 2011.
-------- --- mkinitrd/mkinitrd.changes 2010-11-24 16:00:10.000000000 +0100 +++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes 2011-03-29 23:42:08.000000000 +0200 @@ -1,0 +2,21 @@ +Tue Mar 29 21:37:28 UTC 2011 - [email protected] + +- Change from /dev/.run to /run (bnc#678270#c2). + +------------------------------------------------------------------- +Mon Mar 14 21:38:37 UTC 2011 - [email protected] + +- Create /dev/.run tmpfs mountpoint (bnc#678270). +- version 2.7.0. + +------------------------------------------------------------------- +Fri Dec 17 14:40:56 UTC 2010 - [email protected] + +- Survive dangling symlinks in /lib/mkinitrd/setup. + +------------------------------------------------------------------- +Fri Dec 17 14:20:15 UTC 2010 - [email protected] + +- Really check mtime when determining whether to run mkinitrd_setup. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.jdwLIT/_old 2011-04-21 13:40:03.000000000 +0200 +++ /var/tmp/diff_new_pack.jdwLIT/_new 2011-04-21 13:40:03.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package mkinitrd (Version 2.6.0) +# spec file for package mkinitrd # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -30,8 +30,8 @@ Requires: sysvinit %endif AutoReqProv: on -Version: 2.6.0 -Release: 6 +Version: 2.7.0 +Release: 1 Conflicts: udev < 118 Requires: dhcpcd Summary: Creates an Initial RAM Disk Image for Preloading Modules ++++++ mkinitrd.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.6.0/mkinitrd.changes new/mkinitrd-2.7.0/mkinitrd.changes --- old/mkinitrd-2.6.0/mkinitrd.changes 2010-11-24 15:58:30.000000000 +0100 +++ new/mkinitrd-2.7.0/mkinitrd.changes 2011-03-29 23:38:07.000000000 +0200 @@ -1,4 +1,25 @@ ------------------------------------------------------------------- +Tue Mar 29 21:37:28 UTC 2011 - [email protected] + +- Change from /dev/.run to /run (bnc#678270#c2). + +------------------------------------------------------------------- +Mon Mar 14 21:38:37 UTC 2011 - [email protected] + +- Create /dev/.run tmpfs mountpoint (bnc#678270). +- version 2.7.0. + +------------------------------------------------------------------- +Fri Dec 17 14:40:56 UTC 2010 - [email protected] + +- Survive dangling symlinks in /lib/mkinitrd/setup. + +------------------------------------------------------------------- +Fri Dec 17 14:20:15 UTC 2010 - [email protected] + +- Really check mtime when determining whether to run mkinitrd_setup. + +------------------------------------------------------------------- Wed Nov 24 15:55:31 CET 2010 - [email protected] - Fix for new coreutils (bnc#654364). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.6.0/sbin/mkinitrd new/mkinitrd-2.7.0/sbin/mkinitrd --- old/mkinitrd-2.6.0/sbin/mkinitrd 2010-11-24 15:58:30.000000000 +0100 +++ new/mkinitrd-2.7.0/sbin/mkinitrd 2011-03-29 23:38:07.000000000 +0200 @@ -25,7 +25,7 @@ # git://git.opensuse.org/projects/mkinitrd.git # -VERSION=2.6.0 +VERSION=2.7.0 LOGDIR=/var/log/YaST2 LOGFILE=$LOGDIR/mkinitrd.log declare -a cmd_option @@ -471,11 +471,13 @@ for setupfile in $INITRD_PATH/setup/*.sh; do [ -d "$tmp_mnt" ] && cd "$tmp_mnt" # process setup files in the initrd root dir - if [ ! -d "$setupfile" ]; then + if [ -f "$setupfile" ]; then curscript="${setupfile##*-}" # echo "[$curscript] $blockdev" source $setupfile [ $? -ne 0 ] && oops 1 "Script $setupfile failed!" + else + echo "warning: skipping non-regular file $setupfile" fi done cd "$oldpwd" @@ -494,9 +496,9 @@ initrd_images=( $initrd_images ) kernel_images=( $kernel_images ) -scripts_mtime=$( stat -c "%X" "$INITRD_PATH/scripts" ) -setup_mtime=$( stat -c "%X" "$INITRD_PATH/setup" ) -boot_mtime=$( stat -c "%X" "$INITRD_PATH/boot" ) +scripts_mtime=$( stat -c "%Y" "$INITRD_PATH/scripts" ) +setup_mtime=$( stat -c "%Y" "$INITRD_PATH/setup" ) +boot_mtime=$( stat -c "%Y" "$INITRD_PATH/boot" ) scripts_mtime=${scripts_mtime%.*} setup_mtime=${setup_mtime%.*} boot_mtime=${boot_mtime%.*} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.6.0/scripts/boot-boot.sh new/mkinitrd-2.7.0/scripts/boot-boot.sh --- old/mkinitrd-2.6.0/scripts/boot-boot.sh 2010-11-24 15:58:30.000000000 +0100 +++ new/mkinitrd-2.7.0/scripts/boot-boot.sh 2011-03-29 23:38:07.000000000 +0200 @@ -80,6 +80,11 @@ # Move device nodes /bin/mount --move /dev /root/dev /bin/mount -t proc proc /root/proc +if [ -d /root/run ]; then + mount --move /run /root/run +else + umount -l /run +fi # SELinux load policy selinux_load_policy "/root" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.6.0/scripts/boot-start.sh new/mkinitrd-2.7.0/scripts/boot-start.sh --- old/mkinitrd-2.6.0/scripts/boot-start.sh 2010-11-24 15:58:30.000000000 +0100 +++ new/mkinitrd-2.7.0/scripts/boot-start.sh 2011-03-29 23:38:07.000000000 +0200 @@ -50,6 +50,8 @@ fi mkdir -m 1777 /dev/shm mount -t tmpfs -o mode=1777 tmpfs /dev/shm +mkdir /run +mount -t tmpfs -o mode=0755,nodev,noexec,nosuid tmpfs /run mkdir -m 0755 /dev/pts mount -t devpts -o mode=0620,gid=5 devpts /dev/pts ln -s /proc/self/fd /dev/fd diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.6.0/scripts/setup-storage.sh new/mkinitrd-2.7.0/scripts/setup-storage.sh --- old/mkinitrd-2.6.0/scripts/setup-storage.sh 2010-11-24 15:58:30.000000000 +0100 +++ new/mkinitrd-2.7.0/scripts/setup-storage.sh 2011-03-29 23:38:07.000000000 +0200 @@ -59,6 +59,10 @@ return fi local retval=$(cat /proc/partitions | egrep "^[ ]*$major[ ]*$minor ") + if [ -z "$retval" ]; then + echo "WARNING: Partition $major:$minor not available" >&2 + return + fi echo /dev/${retval##* } } @@ -136,7 +140,7 @@ } dm_resolvedeps_recursive() { - local dm_uuid dm_deps dm_dep bd + local dm_uuid dm_deps dm_dep dm_dep_name bd local bds="$@" [ ! "$bds" ] && bds=$blockdev # resolve dependencies @@ -150,7 +154,10 @@ dm_deps=${dm_deps//(/} dm_deps=${dm_deps//)/} for dm_dep in $dm_deps; do - dm_resolvedeps $(majorminor2blockdev $dm_dep) + dm_dep_name=$(majorminor2blockdev $dm_dep) + if [ -n "$dm_dep_name" ]; then + dm_resolvedeps "$dm_dep_name" + fi done else echo -n "$bd " @@ -272,6 +279,9 @@ if [ $((rootmajor)) -gt 0 -a -z "$rootdev" ] ; then # don't check for non-device mounts rootdev="$(majorminor2blockdev $rootmajor $rootminor)" + if [ -z "$rootdev" ]; then + error 1 "Cannot determine the root device" + fi update_blockdev $rootdev rootdev="$(beautify_blockdev $rootdev)" fi ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
