From: Tollef Fog Heen <tfheen@err.no>
Date: Sun, 16 Jan 2011 08:56:30 +0000 (+0100)
Subject: Use the built-in cryptsetup support in systemd
X-Git-Tag: 16-1~14
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4a35aa806ebbb85bf5d5296a3630779ba61b89c;p=systemd

Use the built-in cryptsetup support in systemd
---

diff --git a/debian/changelog b/debian/changelog
index c2469f14..f05001a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ systemd (16-1) experimental; urgency=low
 
   * New upstream release.
   * Get rid of now obsolete patches that are upstream.
+  * Use the built-in cryptsetup support in systemd.
 
  -- Tollef Fog Heen <tfheen@debian.org>  Sat, 15 Jan 2011 07:30:14 +0100
 
diff --git a/debian/control b/debian/control
index 5da7d850..2e3bb354 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Standards-Version: 3.9.1
 Vcs-Git: git://git.err.no/systemd/
 Vcs-Browser: http://git.err.no/cgi-bin/gitweb.cgi?p=systemd;a=summary
 Homepage: http://www.freedesktop.org/wiki/Software/systemd
-Build-Depends: debhelper (>= 7.0.50), libcap-dev, pkg-config, libudev-dev (>= 160), libdbus-1-dev (>= 1.3.2~), libdbus-glib-1-dev, libgtk2.0-dev, valac (>= 0.9), xsltproc, docbook-xsl, docbook-xml, m4, libpam0g-dev, libnotify-dev, libaudit-dev, dh-autoreconf
+Build-Depends: debhelper (>= 7.0.50), libcap-dev, pkg-config, libudev-dev (>= 160), libdbus-1-dev (>= 1.3.2~), libdbus-glib-1-dev, libgtk2.0-dev, valac (>= 0.9), xsltproc, docbook-xsl, docbook-xml, m4, libpam0g-dev, libnotify-dev, libaudit-dev, dh-autoreconf, libcryptsetup-dev
 
 Package: systemd
 Architecture: linux-any
diff --git a/debian/rules b/debian/rules
index a9a891a6..3e4c0242 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,8 +4,10 @@
 #export DEB_BUILD_OPTIONS="nostrip"
 
 override_dh_auto_configure:
-	dh_auto_configure -- --with-rootdir= --with-udevrulesdir=/lib/udev/rules.d --with-gtk \
-		--disable-libcryptsetup
+	dh_auto_configure -- --with-rootdir= \
+		--with-udevrulesdir=/lib/udev/rules.d \
+		--enable-gtk \
+		--enable-libcryptsetup
 
 override_dh_auto_clean:
 	dh_auto_clean
diff --git a/debian/systemd.links b/debian/systemd.links
index f7b2e48e..4f9f04a8 100644
--- a/debian/systemd.links
+++ b/debian/systemd.links
@@ -36,6 +36,10 @@
 # We need checkroot as synchronisation point, so symlink it to remount-rootfs
 /lib/systemd/system/remount-rootfs.service /lib/systemd/system/checkroot.service
 
+# We use the built-in cryptsetup support
+/dev/null /lib/systemd/system/cryptdisks.service
+/dev/null /lib/systemd/system/cryptdisks-early.service
+
 # Mount /lib/init/rw during early startup
 /lib/systemd/system/lib-init-rw.automount /lib/systemd/system/local-fs.target.wants/lib-init-rw.automount