Mailinglist Archive: opensuse-commit (1081 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package mkinitrd
checked in at Tue May 22 19:01:12 CEST 2007.

--------
--- mkinitrd/mkinitrd.changes   2007-05-21 17:22:31.000000000 +0200
+++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes      2007-05-22 18:58:37.000000000 +0200
@@ -1,0 +2,7 @@
+Tue May 22 18:57:30 CEST 2007 - agraf@xxxxxxx
+
+- Fixed sysconfig/kernel support again
+- Made mkinitrd abort more often if anything goes wrong
+- Always set md's start_ro flag to 1 
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ mkinitrd.spec ++++++
--- /var/tmp/diff_new_pack.f31800/_old  2007-05-22 19:01:04.000000000 +0200
+++ /var/tmp/diff_new_pack.f31800/_new  2007-05-22 19:01:04.000000000 +0200
@@ -18,7 +18,7 @@
 Requires:       coreutils modutils util-linux grep gzip sed gawk cpio udev pciutils sysvinit file
 Autoreqprov:    on
 Version:        2.0
-Release:        6
+Release:        8
 Summary:        Creates an Initial RAM Disk Image for Preloading Modules
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source0:        mkinitrd.tgz
@@ -92,6 +92,10 @@
 %doc %{_mandir}/man8/mkinitrd.8.gz
 
 %changelog
+* Tue May 22 2007 - agraf@xxxxxxx
+- Fixed sysconfig/kernel support again
+- Made mkinitrd abort more often if anything goes wrong
+- Always set md's start_ro flag to 1
 * Mon May 21 2007 - agraf@xxxxxxx
 - Added a warning if fsck was not found
 - Fixed to load sysconfig/kernel modules

++++++ mkinitrd.tgz ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.0/lib/mkinitrd/boot/01-start.sh new/mkinitrd-2.0/lib/mkinitrd/boot/01-start.sh
--- old/mkinitrd-2.0/lib/mkinitrd/boot/01-start.sh      2007-05-21 17:04:36.000000000 +0200
+++ new/mkinitrd-2.0/lib/mkinitrd/boot/01-start.sh      2007-05-22 18:51:26.000000000 +0200
@@ -1,6 +1,6 @@
 #!/bin/bash
 #%programs: bash umount test mount mknod mkdir ln /sbin/blogd date sleep echo cat /bin/sed /sbin/insmod /sbin/modprobe expr kill /sbin/killall5 /sbin/halt /sbin/reboot /sbin/showconsole cp /sbin/pidof mv chmod rm true /bin/grep ls /lib/mkinitrd/bin/*
-#%modules: $modules
+#%modules: $INITRD_MODULES
 #%dontshow
 #
 ##### Initrd initialization
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.0/lib/mkinitrd/boot/176-md.sh new/mkinitrd-2.0/lib/mkinitrd/boot/176-md.sh
--- old/mkinitrd-2.0/lib/mkinitrd/boot/176-md.sh        2007-05-02 16:11:14.000000000 +0200
+++ new/mkinitrd-2.0/lib/mkinitrd/boot/176-md.sh        2007-05-22 18:54:29.000000000 +0200
@@ -26,6 +26,13 @@
     md_dev="/dev/md$md_minor"
 fi
 
+# Always start md devices read/only. They will get set to rw as soon
+# as the first write occurs. This way we can guarantee that no
+# restore occurs before resume.
+if [ -f /sys/module/md_mod/parameters/start_ro ]; then
+    echo 1 > /sys/module/md_mod/parameters/start_ro
+fi
+
 if [ -n "$need_mdadm" ]; then
        
        if [ -f /etc/mdadm.conf ] ; then
@@ -58,21 +65,3 @@
        fi
 fi
 
-# TODO: this was after the resume code - does this hurt?
-
-if [ -n "$need_mdadm" ]; then
-       if [ -n "$resume_minor" ] ; then
-           # Stop all arrays
-           /sbin/mdadm --stop
-           # Switch md back to read-write mode
-           if [ -f /sys/module/md_mod/parameters/start_ro ]; then
-               # maybe should switch all arrays to rw/ but not really necessary
-               echo 0 > /sys/module/md_mod/parameters/start_ro
-           fi
-       
-           # And restart them again
-           /sbin/mdadm $mdarg --auto=md $md_dev
-           /sbin/udevsettle --timeout=$udev_timeout
-       fi
-fi
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.0/lib/mkinitrd/setup/01-start.sh new/mkinitrd-2.0/lib/mkinitrd/setup/01-start.sh
--- old/mkinitrd-2.0/lib/mkinitrd/setup/01-start.sh     2007-05-07 15:18:40.000000000 +0200
+++ new/mkinitrd-2.0/lib/mkinitrd/setup/01-start.sh     2007-05-22 18:51:18.000000000 +0200
@@ -2,8 +2,6 @@
 
 shebang=/bin/bash
 
-save_var INITRD_MODULES
-save_var DOMU_INITRD_MODULES
 save_var arg
 save_var blogd_pid
 save_var build_day
@@ -103,5 +101,6 @@
 root="$rootdev"
 save_var root
 
-save_var modules
+INITRD_MODULES="$modules"
+save_var INITRD_MODULES
 save_var domu_modules
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.0/mkinitrd new/mkinitrd-2.0/mkinitrd
--- old/mkinitrd-2.0/mkinitrd   2007-05-11 14:01:56.000000000 +0200
+++ new/mkinitrd-2.0/mkinitrd   2007-05-22 18:50:45.000000000 +0200
@@ -365,9 +365,7 @@
 }
 
 oops() {
-    exit_code=$1
-    shift
-    echo "$@" >&2
+    error "$@"
 }
 
 ##################################################


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx