[Pkg-sysvinit-commits] r1788 - in sysvinit/trunk/debian: . src/initscripts/lib/init

[Petter Reinholdtsen]

Author: pere
Date: 2009-09-30 08:43:16 +0000 (Wed, 30 Sep 2009)
New Revision: 1788

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/src/initscripts/lib/init/usplash-fsck-functions.sh
Log:
Rewrite /lib/init/usplash-fsck-functions.sh to use blkid instead of
the now obsolete vol_id.  Patch from Martin Pitt and Ubuntu.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2009-09-30 08:36:11 UTC (rev 1787)
+++ sysvinit/trunk/debian/changelog	2009-09-30 08:43:16 UTC (rev 1788)
@@ -15,6 +15,8 @@
     is a better way to do it.
   * Rewrite init.d/mtab.sh to not use /usr/bin/which, as it is running
     before /usr/ is guaranteed to be available.
+  * Rewrite /lib/init/usplash-fsck-functions.sh to use blkid instead of
+    the now obsolete vol_id.  Patch from Martin Pitt and Ubuntu.
 
   [ Henrique de Moraes Holschuh ]
   * invoke-rc.d: return exit status 4 when action "status" is denied,

Modified: sysvinit/trunk/debian/src/initscripts/lib/init/usplash-fsck-functions.sh
===================================================================
--- sysvinit/trunk/debian/src/initscripts/lib/init/usplash-fsck-functions.sh	2009-09-30 08:36:11 UTC (rev 1787)
+++ sysvinit/trunk/debian/src/initscripts/lib/init/usplash-fsck-functions.sh	2009-09-30 08:43:16 UTC (rev 1788)
@@ -75,7 +75,7 @@
                 unset CLEAN
             fi
 
-            LABEL=$(vol_id --label $DEV)
+            LABEL=$(blkid $DEV | sed -rn '/LABEL="([^"]+)"/ { s/^.*LABEL="//; s/".*$//; p }')
             [ -z "$NAME" ] || NAME="$NAME, "
             if [ -n "$LABEL" ]; then
                 NAME="$NAME$LABEL ($DEV)"