lvm2: moduled synced from old moonbase

Ratler · Jul 3, 2012 · 1698f84 · 1698f84
1 parent 782a59d
commit 1698f84
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 2 deletions.
diff --git a/filesys/lvm2/BUILD b/filesys/lvm2/BUILD
@@ -1,16 +1,29 @@
 (
 
   CFLAGS+=" -fPIE "
-  LDFLAGS+="  -pie "
+  LDFLAGS+=" -pie "
+
+  if module_installed systemd; then
+    OPTS+=" --with-udev_prefix=/usr \
+            --with-systemdsystemunitdir=$(pkg-config systemd --variable=systemdsystemunitdir)"
+  else
+    OPTS+=" --with-udev_prefix=/"
+  fi &&
+
+
   ./configure  --sbindir=/sbin                \
                --libdir=/lib                  \
                --enable-cmdlib                \
                --enable-pkgconfig             \
                --with-optimisation="$CFLAGS"  \
                --enable-fsadm                 \
                --enable-dmeventd              \
+               --enable-applib                \
+               --enable-udev_sync             \
+               --enable-udev_rules            \
                --enable-static_link           \
                $OPTS                         &&
+
   default_make
 
 ) > $C_FIFO 2>&1
diff --git a/filesys/lvm2/BUILD.x86_64 b/filesys/lvm2/BUILD.x86_64
@@ -1,14 +1,25 @@
 (
 
+  if module_installed systemd; then
+    OPTS+=" --with-udev_prefix=/usr \
+            --with-systemdsystemunitdir=$(pkg-config systemd --variable=systemdsystemunitdir)"
+  else
+    OPTS+=" --with-udev_prefix=/"
+  fi &&
+
   ./configure  --sbindir=/sbin                \
                --libdir=/lib                  \
                --enable-cmdlib                \
                --enable-pkgconfig             \
                --with-optimisation="$CFLAGS"  \
                --enable-fsadm                 \
                --enable-dmeventd              \
+               --enable-applib                \
+               --enable-udev_sync             \
+               --enable-udev_rules            \
                --enable-static_link           \
                $OPTS                         &&
+
   default_make
 
 ) > $C_FIFO 2>&1
diff --git a/filesys/lvm2/DETAILS b/filesys/lvm2/DETAILS
@@ -8,8 +8,8 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/LVM2.$VERSION
         WEB_SITE=http://sources.redhat.com/lvm2
          ENTERED=20040511
          UPDATED=20120611
-           PSAFE=no
            SHORT="Logical volume manager"
+PSAFE=no
 
 cat << EOF
 The Logical Volume Manager (LVM) is a subsystem for online disk storage

diff --git a/filesys/lvm2/systemd.d/lvm.service b/filesys/lvm2/systemd.d/lvm.service
@@ -0,0 +1,17 @@
+[Unit]
+Description=Linux Volume Manager Activation
+DefaultDependencies=no
+Requires=systemd-udev-settle.service
+After=systemd-udev-settle.service
+Before=basic.target shutdown.target
+Conflicts=shutdown.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+TimeoutSec=0
+ExecStart=/sbin/vgchange --sysinit --available y
+ExecStop=/sbin/vgchange --sysinit --available n
+
+[Install]
+WantedBy=basic.target