From d3bff0fc1a69eb487b5d45b168c018f44a53b223 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Sun, 6 Oct 2013 02:15:56 -0700
Subject: Sun Oct  6 02:13:39 PDT 2013

---
 core/cryptsetup/PKGBUILD   | 11 +++++++----
 core/cryptsetup/sd-encrypt | 42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 4 deletions(-)
 create mode 100644 core/cryptsetup/sd-encrypt

(limited to 'core/cryptsetup')

diff --git a/core/cryptsetup/PKGBUILD b/core/cryptsetup/PKGBUILD
index 54d20aec7..47d9cb4a3 100644
--- a/core/cryptsetup/PKGBUILD
+++ b/core/cryptsetup/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193404 2013-08-19 17:24:16Z thomas $
+# $Id: PKGBUILD 195910 2013-10-05 07:30:48Z thomas $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 pkgname=cryptsetup
 pkgver=1.6.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt"
 arch=(i686 x86_64)
 license=('GPL')
@@ -13,11 +13,13 @@ options=('!libtool' '!emptydirs')
 source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2
         http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2.asc
         encrypt_hook
-        encrypt_install)
+        encrypt_install
+        sd-encrypt)
 md5sums=('cd834da49fbe92dd66df02cc5c61280f'
          'SKIP'
          'c279d86d6dc18322c054d2272ebb9e90'
-         '21c45f9cab3e0b5165f68358884fbd0f')
+         '21c45f9cab3e0b5165f68358884fbd0f'
+         '6cf7e170ecd13e42fe829209628fdb4d')
 
 build() {
   cd "${srcdir}"/$pkgname-${pkgver}
@@ -31,6 +33,7 @@ package() {
   # install hook
   install -D -m644 "${srcdir}"/encrypt_hook "${pkgdir}"/usr/lib/initcpio/hooks/encrypt
   install -D -m644 "${srcdir}"/encrypt_install "${pkgdir}"/usr/lib/initcpio/install/encrypt
+  install -D -m644 "${srcdir}"/sd-encrypt "${pkgdir}"/usr/lib/initcpio/install/sd-encrypt
 
   # usrmove
   cd "$pkgdir"/usr
diff --git a/core/cryptsetup/sd-encrypt b/core/cryptsetup/sd-encrypt
new file mode 100644
index 000000000..c18fd2f24
--- /dev/null
+++ b/core/cryptsetup/sd-encrypt
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+build() {
+    local mod
+
+    add_module dm-crypt
+    if [[ $CRYPTO_MODULES ]]; then
+        for mod in $CRYPTO_MODULES; do
+            add_module "$mod"
+        done
+    else
+        add_all_modules '/crypto/'
+    fi
+
+    add_binary "dmsetup"
+    add_file "/usr/lib/udev/rules.d/10-dm.rules"
+    add_file "/usr/lib/udev/rules.d/13-dm-disk.rules"
+    add_file "/usr/lib/udev/rules.d/95-dm-notify.rules"
+    add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules"
+
+    add_systemd_unit cryptsetup.target
+    add_binary /usr/lib/systemd/system-generators/systemd-cryptsetup-generator
+    add_binary /usr/lib/systemd/systemd-cryptsetup
+
+    add_systemd_unit systemd-ask-password-console.path
+    add_systemd_unit systemd-ask-password-console.service
+
+    [[ -f /etc/crypttab.initramfs ]] && add_file /etc/crypttab.initramfs /etc/crypttab
+}
+
+help() {
+    cat <<HELPEOF
+This hook allows for an encrypted root device with systemd initramfs.
+
+See the manpage of systemd-cryptsetup-generator(8) for available kernel
+command line options. Alternatively, if the file /etc/crypttab.initramfs
+exists, it will be added to the initramfs as /etc/crypttab. See the
+crypttab(5) manpage for more information on crypttab syntax.
+HELPEOF
+}
+
+# vim: set ft=sh ts=4 sw=4 et:
-- 
cgit v1.2.3-54-g00ecf