r394 - in lvm2/trunk/debian: . initramfs-tools initramfs-tools/hooks initramfs-tools/scripts initramfs-tools/scripts/local-top

[Bastian Blank]

Author: waldi
Date: Sat Dec  2 18:11:58 2006
New Revision: 394

Added:
   lvm2/trunk/debian/initramfs-tools/
   lvm2/trunk/debian/initramfs-tools/hooks/
   lvm2/trunk/debian/initramfs-tools/hooks/lvm2
   lvm2/trunk/debian/initramfs-tools/scripts/
   lvm2/trunk/debian/initramfs-tools/scripts/local-top/
   lvm2/trunk/debian/initramfs-tools/scripts/local-top/lvm2
Modified:
   lvm2/trunk/debian/changelog
   lvm2/trunk/debian/rules
Log:
* debian/changelog: Update.
* debian/rules: Install debian/initramfs-tools into lvm2.
* debian/initramfs-tools: Add.


Modified: lvm2/trunk/debian/changelog
==============================================================================
--- lvm2/trunk/debian/changelog	(original)
+++ lvm2/trunk/debian/changelog	Sat Dec  2 18:11:58 2006
@@ -4,8 +4,9 @@
     - German
     - Norwegian Bokmål
     - Swedish
+  * Add initramfs-tools hooks.
 
- -- Bastian Blank <waldi at debian.org>  Mon, 23 Oct 2006 08:51:36 +0000
+ -- Bastian Blank <waldi at debian.org>  Sat,  2 Dec 2006 17:11:12 +0000
 
 lvm2 (2.02.06-3) unstable; urgency=low
 

Added: lvm2/trunk/debian/initramfs-tools/hooks/lvm2
==============================================================================
--- (empty file)
+++ lvm2/trunk/debian/initramfs-tools/hooks/lvm2	Sat Dec  2 18:11:58 2006
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+PREREQ=""
+
+prereqs()
+{
+	echo "$PREREQ"
+}
+
+case $1 in
+prereqs)
+	prereqs
+	exit 0
+	;;
+esac
+
+if [ ! -x /sbin/vgchange -a ! -d /lib/lvm-200 ]; then
+	exit 0
+fi
+
+. /usr/share/initramfs-tools/hook-functions
+
+copy_exec /lib/lvm-200/vgchange /sbin
+
+for x in dm_mod dm_snapshot dm_mirror; do
+	manual_add_modules ${x}
+done

Added: lvm2/trunk/debian/initramfs-tools/scripts/local-top/lvm2
==============================================================================
--- (empty file)
+++ lvm2/trunk/debian/initramfs-tools/scripts/local-top/lvm2	Sat Dec  2 18:11:58 2006
@@ -0,0 +1,70 @@
+#!/bin/sh
+
+PREREQ="mdadm mdrun"
+
+prereqs()
+{
+	echo "$PREREQ"
+}
+
+case $1 in
+# get pre-requisites
+prereqs)
+	prereqs
+	exit 0
+	;;
+esac
+
+activate_vg()
+{
+	local vg="$1"
+
+	# Make sure that we have a non-empty argument
+	if [ -z "${vg}" ]; then
+		return 1
+	fi
+
+	# Take care of lilo boot arg, risky activating of all vg
+	case $vg in
+	fe[0-9]*)
+		vgchange -ay
+		exit 0
+		;;
+	# FIXME: check major
+	/dev/root)
+		vgchange -ay
+		exit 0
+		;;
+	esac
+
+	# Make sure that we have a d-m path
+	vg=${vg#/dev/mapper/}
+	if [ "$vg" = "$1" ]; then
+		return 1
+	fi
+
+	# Make sure that the device includes at least one dash
+	if [ "$(echo -n "$vg" | tr -d -)" = "$vg" ]; then
+		return 1
+	fi
+
+	# Split volume group from logical volume.
+	vg=$(echo ${vg} | sed -e 's#\(.*\)\([^-]\)-[^-].*#\1\2#')
+	# Reduce padded --'s to -'s
+	vg=$(echo ${vg} | sed -e 's#--#-#g')
+
+	vgchange -ay ${vg}
+}
+
+if [ ! -e /sbin/vgchange ]; then
+	exit 0
+fi
+
+modprobe -q dm-mod
+modprobe -q dm-snapshot
+modprobe -q dm-mirror
+
+activate_vg "$ROOT"
+activate_vg "$resume"
+
+exit 0

Modified: lvm2/trunk/debian/rules
==============================================================================
--- lvm2/trunk/debian/rules	(original)
+++ lvm2/trunk/debian/rules	Sat Dec  2 18:11:58 2006
@@ -102,6 +102,7 @@
 	$(MAKE) -C $(DIR) install DESTDIR=$(CURDIR)/$(INSTALL_DIR)
 
 	dh_install $(DH_OPTIONS) --sourcedir=$(INSTALL_DIR)
+	cp -a debian/initramfs-tools debian/lvm2/usr/share
 
 install-udeb: DH_OPTIONS = $(addprefix -p,$(PACKAGES_UDEB))
 install-udeb: DIR = $(BUILD_DIR)/build-udeb