Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory 
checked in at 2013-10-31 10:21:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mkinitrd (Old)
 and      /work/SRC/openSUSE:Factory/.mkinitrd.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "mkinitrd"

Changes:
--------
--- /work/SRC/openSUSE:Factory/mkinitrd/mkinitrd.changes        2013-10-29 
09:28:30.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes   2013-10-31 
10:21:11.000000000 +0100
@@ -1,0 +2,5 @@
+Tue Oct 29 18:25:41 CET 2013 - [email protected]
+
+- Fix code which handles missing or incomplete fstab (bnc#848038)
+
+-------------------------------------------------------------------

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

Other differences:
------------------
++++++ mkinitrd.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.8.1/mkinitrd.changes 
new/mkinitrd-2.8.1/mkinitrd.changes
--- old/mkinitrd-2.8.1/mkinitrd.changes 2013-10-27 21:29:16.000000000 +0100
+++ new/mkinitrd-2.8.1/mkinitrd.changes 2013-10-29 18:31:03.000000000 +0100
@@ -1,4 +1,9 @@
 -------------------------------------------------------------------
+Tue Oct 29 18:25:41 CET 2013 - [email protected]
+
+- Fix code which handles missing or incomplete fstab (bnc#848038)
+
+-------------------------------------------------------------------
 Sun Oct 27 21:24:20 CET 2013 - [email protected]
 
 - Resolve also library dependencies of libnss (bnc#847785)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mkinitrd-2.8.1/scripts/setup-storage.sh 
new/mkinitrd-2.8.1/scripts/setup-storage.sh
--- old/mkinitrd-2.8.1/scripts/setup-storage.sh 2013-10-27 21:29:16.000000000 
+0100
+++ new/mkinitrd-2.8.1/scripts/setup-storage.sh 2013-10-29 18:31:03.000000000 
+0100
@@ -308,6 +308,13 @@
         dev="${!var_dev}"
     fi
 
+    #if any of the above fails, use whats currently in use for the mountpoint
+    if [ -z "$fstype" -a -z "$dev" ] ; then
+        grep -E "^[^[:space:]]+ $mountpoint " < /proc/mounts | tail -n 1 > 
"$work_dir/pipe"
+        # get device, type and options from current state
+        read dev dummy fstype fsopts dummy < "$work_dir/pipe"
+    fi
+
     #if we don't know where the device belongs to
     if [ -z "$fstype" ] ; then
       # get type from /etc/fstab or /proc/mounts (actually not needed)

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to