summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuuso Alasuutari2007-02-14 13:21:14 +0200
committerJaka Kranjc2007-02-15 15:42:44 +0100
commit1bf02f21965407dc96fb4a1a2b890d1319fbbec6 (patch)
treee6c3368ebb27dd8db1cf43377336908a08e6d923
parent80ccfbb61d8cd4acd40a2527c471d09318adda5a (diff)
udev: Added sub-dependency VOLUME_ID for bug #13500
(cherry picked from commit 3bea1c088af3c5643263b46c00b0e3600b177277)
-rw-r--r--disk/udev/HISTORY4
-rwxr-xr-xdisk/udev/PRE_SUB_DEPENDS4
-rwxr-xr-xdisk/udev/SUB_DEPENDS13
3 files changed, 21 insertions, 0 deletions
diff --git a/disk/udev/HISTORY b/disk/udev/HISTORY
index cf8e3406fc..ea6c59683c 100644
--- a/disk/udev/HISTORY
+++ b/disk/udev/HISTORY
@@ -1,3 +1,7 @@
+2007-02-14 Juuso Alasuutari <iuso@sourcemage.org>
+ * PRE_SUB_DEPENDS, SUB_DEPENDS: Added, new sub-dependency
+ VOLUME_ID for bug #13500.
+
2007-01-30 Juuso Alasuutari <iuso@sourcemage.org>
* CONFIGURE: Prompt to dispel hotplug instead of just bootdisable.
* FINAL: Changed bootdisable hotplug to dispel.
diff --git a/disk/udev/PRE_SUB_DEPENDS b/disk/udev/PRE_SUB_DEPENDS
new file mode 100755
index 0000000000..3eb5384e0d
--- /dev/null
+++ b/disk/udev/PRE_SUB_DEPENDS
@@ -0,0 +1,4 @@
+case $THIS_SUB_DEPENDS in
+ VOLUME_ID) list_find "$_EXTRAS_TARG" "extras/volume_id" && return 0 ;;
+esac
+return 1
diff --git a/disk/udev/SUB_DEPENDS b/disk/udev/SUB_DEPENDS
new file mode 100755
index 0000000000..4fa5143196
--- /dev/null
+++ b/disk/udev/SUB_DEPENDS
@@ -0,0 +1,13 @@
+case "$THIS_SUB_DEPENDS" in
+ VOLUME_ID) if ! list_find "$_EXTRAS_TARG" "extras/volume_id"
+ then
+ echo "Sub-dependency VOLUME_ID requested, adding build" \
+ "target 'extras/volume_id'." &&
+ _EXTRAS_TARG="$_EXTRAS_TARG extras/volume_id" &&
+ persistent_add _EXTRAS_TARG
+ fi
+ ;;
+ *) echo "Unknown sub-dependency $THIS_SUB_DEPENDS!"
+ return 1
+ ;;
+esac