r125 - in lvm-common/trunk: . debian

[Bastian Blank]

Author: waldi
Date: Mon Aug  1 19:49:44 2005
New Revision: 125

Modified:
   lvm-common/trunk/debian/README
   lvm-common/trunk/debian/changelog
   lvm-common/trunk/debian/control
   lvm-common/trunk/debian/init
   lvm-common/trunk/default
   lvm-common/trunk/lvmiopversion.c
Log:
Import lvm-common-1.5.19.


Modified: lvm-common/trunk/debian/README
==============================================================================
--- lvm-common/trunk/debian/README	(original)
+++ lvm-common/trunk/debian/README	Mon Aug  1 19:49:44 2005
@@ -20,7 +20,11 @@
 are either not running devfs OR you are running devfs and your VGs are called
 "vg" followed by some numbers. If you want the permissions to be set as above
 and your VGs have some other name then you may need to edit the regexp in
-/etc/devfsd/conf.d/50lvm.
+/etc/devfsd/conf.d/50lvm. 
+
+If you are running a 2.6 kernel then a better way to set the protection of 
+your LVs is to use udev and add a file into /etc/udev/permissions.d - this
+is now the preferred method of setting LV protection.
 
 
 Selection of LVM version
@@ -37,4 +41,4 @@
 however, if it detects that you already have active LVM1 volumes then it will
 use LVM1 instead.
 
-For more details see the source package to lvm-common.
\ No newline at end of file
+For more details see the source package to lvm-common.

Modified: lvm-common/trunk/debian/changelog
==============================================================================
--- lvm-common/trunk/debian/changelog	(original)
+++ lvm-common/trunk/debian/changelog	Mon Aug  1 19:49:44 2005
@@ -1,9 +1,22 @@
+lvm-common (1.5.19) unstable; urgency=low
+
+  * look for "vgchange" rather than "vgscan" as initrds only contain the former.
+    Closes: #310479
+
+ -- Patrick Caulfield <patrick at debian.org>  Wed, 25 May 2005 09:02:08 +0100
+
 lvm-common (1.5.18) unstable; urgency=low
 
-  * New maintainer.
-  * Remove references to ext2resize.
+  * The "Oh 'eck, I'm still the maintainer of this one" release.
+  * Dereference symlinks when setting ownership on device files
+    Closes: #279683
+  * Mention permissions setting is subject to complicated rules, and that
+    Udev is the preferred method of doing it.
+    Closes: #300193
+  * Don't run LVM1 e2fsadm for LVM2
+    Closes: #281925
 
- -- Bastian Blank <waldi at debian.org>  Tue, 29 Mar 2005 20:09:25 +0200
+ -- Patrick Caulfield <patrick at debian.org>  Wed, 25 May 2005 09:01:03 +0100
 
 lvm-common (1.5.17) unstable; urgency=low
 

Modified: lvm-common/trunk/debian/control
==============================================================================
--- lvm-common/trunk/debian/control	(original)
+++ lvm-common/trunk/debian/control	Mon Aug  1 19:49:44 2005
@@ -1,13 +1,13 @@
 Source: lvm-common
 Section: admin
 Priority: optional
-Maintainer: Debian LVM Team <pkg-lvm-maintainers at lists.alioth.debian.org>
-Uploaders: Bastian Blank <waldi at debian.org>
+Maintainer: Patrick Caulfield <patrick at debian.org>
 Standards-Version: 3.5.5
 
 Package: lvm-common
 Architecture: any
 Depends: ${shlibs:Depends}, module-init-tools|modutils (>> 2.3.11-2)
+Suggests: ext2resize
 Recommends: logrotate
 Replaces: lvm
 Conflicts: lvm, lvm5 (<= 0.8i-4), lvm6 (<= 0.8.final-2), lvm10 (<= 0.9-1)

Modified: lvm-common/trunk/debian/init
==============================================================================
--- lvm-common/trunk/debian/init	(original)
+++ lvm-common/trunk/debian/init	Mon Aug  1 19:49:44 2005
@@ -54,7 +54,7 @@
                         MOD=${MODE#* }
                         OWN=${MODE% *}
                         chmod $MOD $DEV
-                        chown $OWN $DEV
+                        chown --dereference $OWN $DEV
                 done
 		;;
 	

Modified: lvm-common/trunk/default
==============================================================================
--- lvm-common/trunk/default	(original)
+++ lvm-common/trunk/default	Mon Aug  1 19:49:44 2005
@@ -3,7 +3,7 @@
 # of the LVM device nodes in /dev.
 #
 # The default for LVs not mentioned in this file
-# is "root:disk 660".
+# depends on your version of LVM and whether devfs or udev is installed.
 #
 # This file is run as a shell script in the init script
 # for lvm-common.

Modified: lvm-common/trunk/lvmiopversion.c
==============================================================================
--- lvm-common/trunk/lvmiopversion.c	(original)
+++ lvm-common/trunk/lvmiopversion.c	Mon Aug  1 19:49:44 2005
@@ -36,6 +36,14 @@
 
 const char *cmd = "lvmiopversion";
 
+/* vgchange is the program we look for to determine that LVM is
+ * installed in that directory. This prevents the situation where
+ * (eg) LVM1 has a command that LVM2 doesn't and LVM2 is the currently
+ * running system. Under the old lvmiopversion, the LVM1 command
+ * would be run.
+ */
+const char *defcmd = "vgchange";
+
 int main(int argc, char *argv[])
 {
     struct stat st;
@@ -56,14 +64,14 @@
         return 0;
     }
 
-    snprintf(prog, sizeof(prog), "/lib/lvm-%d/%s", version, name);
+    snprintf(prog, sizeof(prog), "/lib/lvm-%d/%s", version, defcmd);
     if (stat(prog, &st) != 0 && version >= 200) {
         /* LVM2 kernel is loaded, but userspace is unavailable; try LVM1 */
         version = check_lvm1();
         if (version)
             snprintf(prog, sizeof(prog), "/lib/lvm-%d/%s", version, name);
     }
-    
+
     /* Let missing driver error messages come from the tools themselves */
     if (!version || stat(prog, &st) != 0)
         snprintf(prog, sizeof(prog), "/lib/lvm-default/%s", name);
@@ -73,7 +81,10 @@
         fprintf(stderr, "%s -- Unsupported LVM driver/module in kernel, please upgrade!\n\n", cmd);
         return LVM_EINVALID_IOP;
     }
- 
+
+    /* Now try for the real prog */
+    snprintf(prog, sizeof(prog), "/lib/lvm-%d/%s", version, name);
+
     /* and attempt to execute program.. */
     execv(prog, argv);
     if (errno == ENOENT) {