Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (47e063bf28cbed49d347dcf8fb97097ae0cf2e0a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (47e063bf28cbed49d347dcf8fb97097ae0cf2e0a)
  • Date: Thu, 24 Jul 2008 14:53:34 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

crypto/loop-aes/DEPENDS | 4 +---
crypto/loop-aes/HISTORY | 5 +++++
crypto/loop-aes/INSTALL | 18 ++++++++++--------
crypto/loop-aes/init.d/losetup | 1 +
smgl/init.d/BUILD | 4 ++--
smgl/init.d/DETAILS | 2 +-
smgl/init.d/HISTORY | 10 ++++++++++
smgl/init.d/init.d/facilities.conf | 2 ++
smgl/init.d/init.d/mountall.sh | 2 +-
smgl/init.d/init.d/smgl-default-crypt-fs | 9 +++++++++
10 files changed, 42 insertions(+), 15 deletions(-)

New commits:
commit 47e063bf28cbed49d347dcf8fb97097ae0cf2e0a
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

loop-aes: use new crypt_fs facility, cleaned up a bit

commit 74bf4e60e5bce6aa93afda473470222cad6bcef4
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

init.d: => 2.2.4, fixed a bug about non-starting unexistent losetup
service, added new facility: crypt_fs for the
things like loop-aes, dm-crypt, ecryptfs, etc.

diff --git a/crypto/loop-aes/DEPENDS b/crypto/loop-aes/DEPENDS
index 69bdcba..f2691d3 100755
--- a/crypto/loop-aes/DEPENDS
+++ b/crypto/loop-aes/DEPENDS
@@ -3,6 +3,4 @@ depends -sub STATIC gnupg &&
depends -sub STATIC aespipe &&
depends -sub AES util-linux &&

-suggest_depends dietlibc \
- "" "" \
- "for encryption of the root partition support?"
+suggest_depends dietlibc "" "" "for encryption of a root partition support"
diff --git a/crypto/loop-aes/HISTORY b/crypto/loop-aes/HISTORY
index 2367562..6df37c9 100644
--- a/crypto/loop-aes/HISTORY
+++ b/crypto/loop-aes/HISTORY
@@ -1,3 +1,8 @@
+2008-07-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * init.d/losetup: use crypt_fs provider
+ * INSTALL: quoting the paths!
+ * DEPENDS: cleaned up
+
2008-06-21 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: added third mirror

diff --git a/crypto/loop-aes/INSTALL b/crypto/loop-aes/INSTALL
index 2fe3c2d..e1fcfdf 100755
--- a/crypto/loop-aes/INSTALL
+++ b/crypto/loop-aes/INSTALL
@@ -8,17 +8,19 @@ fi &&

make_normal &&

-install -vm 755 $SOURCE_DIRECTORY/loop-aes-keygen $INSTALL_ROOT/usr/bin &&
-install -vm 644 $SOURCE_DIRECTORY/loop-aes-keygen.1
$INSTALL_ROOT/usr/share/man/man1 &&
+install -vm 755 "$SOURCE_DIRECTORY/loop-aes-keygen" \
+ "$INSTALL_ROOT/usr/bin" &&
+install -vm 644 "$SOURCE_DIRECTORY/loop-aes-keygen.1" \
+ "$INSTALL_ROOT/usr/share/man/man1" &&

if [[ $INIT_INSTALLED ]]; then
- install_config_file $SPELL_DIRECTORY/init.d/loop-aes.conf \
- $INSTALL_ROOT/etc/sysconfig/loop-aes &&
- chmod 600 $INSTALL_ROOT/etc/sysconfig/loop-aes
+ install_config_file "$SPELL_DIRECTORY/init.d/loop-aes.conf" \
+ "$INSTALL_ROOT/etc/sysconfig/loop-aes" &&
+ chmod 600 "$INSTALL_ROOT/etc/sysconfig/loop-aes"
fi &&

if is_depends_enabled $SPELL dietlibc; then
- install -vm 755 -d $INSTALL_ROOT/usr/share/$SPELL &&
- install -vm 755 $SOURCE_DIRECTORY/build-initrd.sh \
- $INSTALL_ROOT/usr/share/$SPELL
+ install -vm 755 -d "$INSTALL_ROOT/usr/share/$SPELL" &&
+ install -vm 755 "$SOURCE_DIRECTORY/build-initrd.sh" \
+ "$INSTALL_ROOT/usr/share/$SPELL"
fi
diff --git a/crypto/loop-aes/init.d/losetup b/crypto/loop-aes/init.d/losetup
index 6ce07b2..a6a21ea 100755
--- a/crypto/loop-aes/init.d/losetup
+++ b/crypto/loop-aes/init.d/losetup
@@ -2,6 +2,7 @@

PROGRAM=/bin/false
NEEDS="+root_fs"
+PROVIDES=crypt_fs
RUNLEVEL=S

. /etc/init.d/smgl_init
diff --git a/smgl/init.d/BUILD b/smgl/init.d/BUILD
index 801d1fe..b465d9a 100755
--- a/smgl/init.d/BUILD
+++ b/smgl/init.d/BUILD
@@ -1,2 +1,2 @@
-mkdir -p $INSTALL_ROOT/etc/init.d/runlevels/%2 &&
-touch $INSTALL_ROOT/etc/init.d/runlevels/%2/sorbus-aria
+install -vm 755 -d "$INSTALL_ROOT/etc/init.d/runlevels/%2" &&
+touch "$INSTALL_ROOT/etc/init.d/runlevels/%2/sorbus-aria"
diff --git a/smgl/init.d/DETAILS b/smgl/init.d/DETAILS
index 3ee7055..ed9a675 100755
--- a/smgl/init.d/DETAILS
+++ b/smgl/init.d/DETAILS
@@ -1,5 +1,5 @@
SPELL=init.d
- VERSION=2.2.3
+ VERSION=2.2.4
LICENSE[0]=GPL
GATHER_DOCS=off
KEYWORDS="smgl"
diff --git a/smgl/init.d/HISTORY b/smgl/init.d/HISTORY
index 47bbb4c..194f642 100644
--- a/smgl/init.d/HISTORY
+++ b/smgl/init.d/HISTORY
@@ -1,3 +1,13 @@
+2008-07-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: 2.2.4, added new facility crypt_fs, for the things like
+ loop-aes, ecryptfs, dm-crypt, etc.
+ * init.d/facilities.conf: added empty crypt_fs facility line
+ * init.d/mountall.sh: use new crypt_fs facility, it needs to be done
+ before mounting all partitions
+ * init.d/smgl-default-crypt-fs: empty crypt_fs provider for no
encrypted
+ fs usage
+ * BUILD: use `install -d', quoting the paths!
+
2008-07-14 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: bump version to 2.2.3 for loop-AES' losetup detection in
mountall.sh (since loop-AES considered as quite stable for a long)
diff --git a/smgl/init.d/init.d/facilities.conf
b/smgl/init.d/init.d/facilities.conf
index 1e504d7..68026c0 100644
--- a/smgl/init.d/init.d/facilities.conf
+++ b/smgl/init.d/init.d/facilities.conf
@@ -8,6 +8,8 @@ syslog=

local_fs=

+crypt_fs=
+
remote_fs=

identd=
diff --git a/smgl/init.d/init.d/mountall.sh b/smgl/init.d/init.d/mountall.sh
index 73dc7b5..7755aca 100755
--- a/smgl/init.d/init.d/mountall.sh
+++ b/smgl/init.d/init.d/mountall.sh
@@ -4,7 +4,7 @@
PROGRAM=/bin/false
RUNLEVEL=S
NEEDS="+root_fs"
-WANTS="+modules losetup"
+WANTS="+modules +crypt_fs"
PROVIDES=local_fs
ESSENTIAL=yes

diff --git a/smgl/init.d/init.d/smgl-default-crypt-fs
b/smgl/init.d/init.d/smgl-default-crypt-fs
new file mode 100755
index 0000000..7788f31
--- /dev/null
+++ b/smgl/init.d/init.d/smgl-default-crypt-fs
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+RUNLEVEL=S
+PROVIDES=crypt_fs
+RECOMMENDED=yes
+
+. /etc/init.d/smgl_init
+
+exit 0



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (47e063bf28cbed49d347dcf8fb97097ae0cf2e0a), Vlad Glagolev, 07/24/2008

Archive powered by MHonArc 2.6.24.

Top of Page