Mailinglist Archive: opensuse-commit (1187 mails)
| < Previous | Next > |
commit mkinitrd
- From: root@xxxxxxx (h_root)
- Date: Fri, 7 Apr 2006 17:07:20 +0200 (CEST)
- Message-id: <20060407150720.51D2B8BE6B@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package mkinitrd
checked in at Fri Apr 7 17:07:20 CEST 2006.
--------
--- mkinitrd/mkinitrd.changes 2006-04-04 15:44:51.000000000 +0200
+++ mkinitrd/mkinitrd.changes 2006-04-07 16:55:32.000000000 +0200
@@ -1,0 +2,10 @@
+Fri Apr 7 12:11:27 CEST 2006 - hare@xxxxxxx
+
+- Use the udevsettle program instead of shell scripts (#163010)
+
+-------------------------------------------------------------------
+Wed Apr 5 12:42:07 CEST 2006 - hare@xxxxxxx
+
+- Fixed typo in s390_dasd_sysfs (#156152)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mkinitrd.spec ++++++
--- /var/tmp/diff_new_pack.gzQsDZ/_old 2006-04-07 17:07:08.000000000 +0200
+++ /var/tmp/diff_new_pack.gzQsDZ/_new 2006-04-07 17:07:08.000000000 +0200
@@ -18,7 +18,7 @@
# bootsplash required only if creating splash initrd's.
Autoreqprov: on
Version: 1.2
-Release: 82
+Release: 83
Summary: Creates an Initial RAM Disk Image for Preloading Modules
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: mkinitrd
@@ -85,6 +85,10 @@
%doc %{_mandir}/man8/mkinitrd.8.gz
%changelog -n mkinitrd
+* Fri Apr 07 2006 - hare@xxxxxxx
+- Use the udevsettle program instead of shell scripts (#163010)
+* Wed Apr 05 2006 - hare@xxxxxxx
+- Fixed typo in s390_dasd_sysfs (#156152)
* Tue Apr 04 2006 - garloff@xxxxxxx
- Put DOMU_INITRD_MODULES into xen initrds and load them rather
than driver_modules in a Xen domU.
++++++ mkinitrd ++++++
--- mkinitrd/mkinitrd 2006-04-04 15:44:51.000000000 +0200
+++ mkinitrd/mkinitrd 2006-04-07 16:55:29.000000000 +0200
@@ -23,7 +23,7 @@
# This file is kept in the following CVS repository:
#
# $Source: /suse/yast2/cvsroot/mkinitrd/mkinitrd,v $
-# $Revision: 1.272 $
+# $Revision: 1.274 $
usage() {
cat<<EOF
@@ -1077,7 +1077,7 @@
;;
DIAG)
add_module dasd_diag_mod
- discipline=1
+ discipline=2
;;
*)
;;
@@ -1343,6 +1343,7 @@
cp_bin /sbin/udevd $tmp_mnt/sbin/
cp_bin /sbin/udevtrigger $tmp_mnt/sbin/
+ cp_bin /sbin/udevsettle $tmp_mnt/sbin/
cp_bin /usr/bin/udevinfo $tmp_mnt/sbin/
mkdir -p $tmp_mnt/etc/udev/rules.d
@@ -1751,12 +1752,7 @@
|
|echo "Creating devices"
|/sbin/udevtrigger
- |loop=300
- |while test -d /dev/.udev/queue; do
- | sleep 0.1;
- | test "\$loop" -gt 0 || break
- | loop=\$((\$loop - 1))
- |done
+ |/sbin/udevsettle timeout=$udev_timeout
|
|# workaround chicken/egg bug in mdadm
|# they do the ioctl on the not yet existing device node...
@@ -2253,26 +2249,6 @@
cat_linuxrc <<-'EOF'
|
- |# Wait for udev to settle
- |udev_settle() {
- | local retval=1
- | local timeout=$udev_timeout
- | [ ! -d /dev/.udev/queue ] && return 0;
- | echo -n "Waiting for udev to settle: "
- | while [ $timeout -gt 0 ]; do
- | if test ! -d /dev/.udev/queue ; then
- | echo " ok"
- | retval=0
- | break;
- | fi
- | sleep 1;
- | echo -n "."
- | timeout=$(( $timeout - 1 ))
- | done
- |
- | return $retval;
- |}
- |
|# Waiting for a device to appear
|# device node will be created by udev
|udev_check_for_device() {
@@ -2355,8 +2331,7 @@
| esac
|done
|
- |# wait udev to settle
- |udev_settle
+ |/sbin/udevsettle --timeout=$udev_timeout
|
EOF
@@ -2407,7 +2382,7 @@
cat_linuxrc <<-EOF
|# Rescan for multipath
|/sbin/multipath -v0
- |udev_settle
+ |/sbin/udevsettle --timeout=$udev_timeout
EOF
fi
@@ -2602,7 +2577,7 @@
cat_linuxrc <<-'EOF'
|# Wait for udev to settle
- |udev_settle
+ |/sbin/udevsettle --timeout=$udev_timeout
|# Check for a resume device
|udev_discover_resume
EOF
@@ -2620,8 +2595,7 @@
|
| # And restart them again
| /sbin/mdadm --assemble --scan \$mdconf
- | # Wait for udev to settle
- | udev_settle
+ | /sbin/udevsettle --timeout=$udev_timeout
|fi
EOF
fi
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
| < Previous | Next > |