From 0024a01a52d968376c0af9d75d7c11badf0b1eaa Mon Sep 17 00:00:00 2001
From: Pascal Terjan <pterjan@mandriva.org>
Date: Fri, 12 Jun 2009 13:54:45 +0000
Subject: use blkid instead of vol_id which we no longer ship

---
 rescue/Makefile | 2 +-
 rescue/NEWS     | 4 ++++
 rescue/list.xml | 5 +----
 3 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'rescue')

diff --git a/rescue/Makefile b/rescue/Makefile
index afdca195b..f1aa69240 100644
--- a/rescue/Makefile
+++ b/rescue/Makefile
@@ -1,6 +1,6 @@
 include ../Makefile.config
 
-VERSION=1.14
+VERSION=1.15
 PRODUCT=drakx-installer-rescue
 
 RESCUE = rescue.sqfs
diff --git a/rescue/NEWS b/rescue/NEWS
index 0f28dd4b4..0d4f5460a 100644
--- a/rescue/NEWS
+++ b/rescue/NEWS
@@ -1,3 +1,7 @@
+Version 1.15 - 12 June 2009, by Pascal Terjan
+
+- use blkid instead of vol_id which we no longer ship
+
 Version 1.14 - 27 May 2009, by Olivier "blino" Blin
 
 - adapt to new extipl location in x86_64
diff --git a/rescue/list.xml b/rescue/list.xml
index 11d2ab6ff..05d140f40 100644
--- a/rescue/list.xml
+++ b/rescue/list.xml
@@ -25,10 +25,6 @@
 
   df du
 
-  <mode copy="dereference">
-    vol_id <!-- needed by libDrakX -->
-  </mode>
-
   packdrake
   cpio ftp tar
   rsync
@@ -183,6 +179,7 @@
   </if>
 
   /sbin/mount.ntfs-3g <!-- can not be expanded as binary, not executable for all users -->
+  /sbin/blkid
 </from>
 
 <from dir="/usr/lib/rpm" expand="glob">
-- 
cgit v1.2.1