Mailinglist Archive: opensuse-commit (1003 mails)
| < Previous | Next > |
commit mkinitrd
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Sun, 03 Jun 2007 21:51:39 +0200
- Message-id: <20070603195139.53463678188@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package mkinitrd
checked in at Sun Jun 3 21:51:39 CEST 2007.
--------
--- mkinitrd/mkinitrd.changes 2007-05-31 12:24:15.000000000 +0200
+++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes 2007-06-01 15:39:38.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Jun 1 15:34:27 CEST 2007 - hare@xxxxxxx
+
+- Handle built-in filesystems correctly (#278981)
+- Fixup handling of xfs (#278192)
+- Update NFS mount handling
+
+-------------------------------------------------------------------
@@ -10 +16,0 @@
-- Build rpm from git repository
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mkinitrd.spec ++++++
--- /var/tmp/diff_new_pack.pJ7026/_old 2007-06-03 21:50:35.000000000 +0200
+++ /var/tmp/diff_new_pack.pJ7026/_new 2007-06-03 21:50:35.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: 14
+Release: 16
Summary: Creates an Initial RAM Disk Image for Preloading Modules
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: mkinitrd.tgz
@@ -85,6 +85,10 @@
%doc %{_mandir}/man8/mkinitrd.8.gz
%changelog
+* Fri Jun 01 2007 - hare@xxxxxxx
+- Handle built-in filesystems correctly (#278981)
+- Fixup handling of xfs (#278192)
+- Update NFS mount handling
* Wed May 30 2007 - hare@xxxxxxx
- Simplify shared library detection
- Revamp module setup
@@ -92,7 +96,6 @@
- Fix cciss detection
- Fix typo in lvm2 setup
- Fix module detection
-- Build rpm from git repository
* Tue May 29 2007 - agraf@xxxxxxx
- Include optional busybox support (activate with -f busybox)
(#276555)
++++++ mkinitrd.tgz ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.0/lib/mkinitrd/boot/171-nfs.sh new/mkinitrd-2.0/lib/mkinitrd/boot/171-nfs.sh
--- old/mkinitrd-2.0/lib/mkinitrd/boot/171-nfs.sh 2007-05-31 12:22:45.000000000 +0200
+++ new/mkinitrd-2.0/lib/mkinitrd/boot/171-nfs.sh 2007-06-01 15:39:32.000000000 +0200
@@ -40,15 +40,12 @@
# load the nfs module before using it
load_modules
- opt="-t nfs -o ro,nolock"
- # mount the actual nfs root device on /root
- echo "Mounting root $rootdev"
- [ -n "$rootflags" ] && opt="${opt},$rootflags"
-
- mount $opt $rootdev /root || die 1
-
- # keep the mount module from mounting the root device again
- [ "$(cat /proc/mounts | grep /root)" ] && root_already_mounted=1
+ rootfsmod=
+ if [ -n "$rootflags" ] ; then
+ rootflags="${rootflags},nolock"
+ else
+ rootflags="nolock"
+ fi
else
dont_load_modules
fi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.0/lib/mkinitrd/boot/20-mount.sh new/mkinitrd-2.0/lib/mkinitrd/boot/20-mount.sh
--- old/mkinitrd-2.0/lib/mkinitrd/boot/20-mount.sh 2007-05-31 12:22:45.000000000 +0200
+++ new/mkinitrd-2.0/lib/mkinitrd/boot/20-mount.sh 2007-06-01 15:39:32.000000000 +0200
@@ -1,7 +1,7 @@
#!/bin/bash
#%requires: resume
#%programs: /sbin/fsck $rootfsck
-#%modules: $rootfstype
+#%modules: $rootfsmod
#%if: ! "$root_already_mounted"
#%dontshow
#
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.0/lib/mkinitrd/setup/070-storage.sh new/mkinitrd-2.0/lib/mkinitrd/setup/070-storage.sh
--- old/mkinitrd-2.0/lib/mkinitrd/setup/070-storage.sh 2007-05-31 12:22:45.000000000 +0200
+++ new/mkinitrd-2.0/lib/mkinitrd/setup/070-storage.sh 2007-06-01 15:39:32.000000000 +0200
@@ -244,8 +244,15 @@
error 1 "Could not find the filesystem type for root device $rootdev"
fi
+# Check if we have to load a module for the rootfs type
if ! modprobe --set-version $kernel_version -q $rootfstype; then
- error 1 "Could not find the filesystem module for root device $rootdev ($rootfstype)"
+ if ! grep -q $rootfstype /proc/filesystems ; then
+ error 1 "Could not find the filesystem module for root device $rootdev ($rootfstype)"
+ else
+ rootfsmod=
+ fi
+else
+ rootfsmod=$rootfstype
fi
# blockdev is the current block device depending on the layered storage script we are in
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.0/lib/mkinitrd/setup/16-mount.sh new/mkinitrd-2.0/lib/mkinitrd/setup/16-mount.sh
--- old/mkinitrd-2.0/lib/mkinitrd/setup/16-mount.sh 2007-05-31 12:22:45.000000000 +0200
+++ new/mkinitrd-2.0/lib/mkinitrd/setup/16-mount.sh 2007-06-01 15:39:32.000000000 +0200
@@ -4,7 +4,7 @@
rootfsck="/sbin/fsck.${rootfstype}"
if [ ! -x "$rootfsck" ]; then
rootfsck=
- if [ "$rootfstype" != "nfs" ]; then
+ if [ "$rootfstype" != "nfs" ] || [ "$rootfstype" != "xfs" ]; then
echo "****************************"
echo "* WARNING "
echo "* No fsck for your rootfs "
@@ -18,4 +18,4 @@
verbose "[MOUNT] Root:\t$rootdev"
save_var rootdev
-save_var rootfsck
\ No newline at end of file
+save_var rootfsck
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.0/mkinitrd.changes new/mkinitrd-2.0/mkinitrd.changes
--- old/mkinitrd-2.0/mkinitrd.changes 2007-05-31 12:22:45.000000000 +0200
+++ new/mkinitrd-2.0/mkinitrd.changes 2007-06-01 15:39:32.000000000 +0200
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Fri Jun 1 15:34:27 CEST 2007 - hare@xxxxxxx
+
+- Handle built-in filesystems correctly (#278981)
+- Fixup handling of xfs (#278192)
+- Update NFS mount handling
+
+-------------------------------------------------------------------
Wed May 30 16:38:44 CEST 2007 - hare@xxxxxxx
- Simplify shared library detection
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |