From e4a6cec294db4380a737d57d1fa63cf4b42ff03f Mon Sep 17 00:00:00 2001
From: illiliti <illiliti@protonmail.com>
Date: Sat, 8 Feb 2020 23:05:03 +0300
Subject: [PATCH] bring back LVM config

---
 config   |  2 +-
 generate | 23 ++++++++++++-----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/config b/config
index 0afbeb5..a99c33d 100644
--- a/config
+++ b/config
@@ -33,7 +33,7 @@ binaries="./busybox findfs blkid mount modprobe umount"
 use_lvm=1
 
 # LVM include config
-#use_lvmconf=0
+#lvm_conf=1
 
 # LVM issue_discards
 lvm_discard=1
diff --git a/generate b/generate
index 5a0cbb7..f0f7859 100755
--- a/generate
+++ b/generate
@@ -23,9 +23,9 @@ remove_tmpdir() {
 
 # change current directory to script directory if user haven't do it
 check_currentdir() {
-    msg info "changing directory to script dir"
     script_dir=$(dirname $(readlink -f -- "$0"))
     [ "$PWD" = "$script_dir" ] || {
+	msg info "changing directory to script dir"
 	cd "$script_dir" || msg panic "failed to change directory"
     }
 }
@@ -113,16 +113,17 @@ install_lvm() {
 	done
     }
 
-    # FIXME this code doesn't working with udev
-    #mkdir "$tmpdir/etc/lvm"
-    # use_lvmetad = 0 - avoid lvmetad missing warning message
-    #cat <<EOF > "$tmpdir/etc/lvm/lvmlocal.conf"
-    #local {
-    #	issue_discards = ${lvm_discard:-0}
-    #	use_lvmetad = 0
-    #}
-    #EOF
-    # TODO implement use_lvmconf
+    if [ "$lvm_conf" = 1 ]; then
+	install -Dm644 /etc/lvm/*.conf -t "${tmpdir}/etc/lvm" || msg panic "failed to install LVM config"
+    else
+	mkdir "${tmpdir}/etc/lvm"
+	cat <<EOF > "${tmpdir}/etc/lvm/lvmlocal.conf"
+local {
+    issue_discards = ${lvm_discard:-0}
+    use_lvmetad = 0
+}
+EOF
+    fi
 }
 
 # handle luks