Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by David Brown (b8ed976b0c4456d51953d320b11bd43544d0e2c9)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: David Brown <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by David Brown (b8ed976b0c4456d51953d320b11bd43544d0e2c9)
  • Date: Sun, 23 Sep 2007 21:43:37 -0500

GIT changes to master grimoire by David Brown <dmlb2000 AT gmail.com>:

smgl/linux-initramfs/DEPENDS | 2 +
smgl/linux-initramfs/DETAILS | 4 +--
smgl/linux-initramfs/HISTORY | 6 ++++
smgl/linux-initramfs/INSTALL | 3 +-
smgl/linux-initramfs/mkinitrd | 53
++++++++++++++++++++++++++++++++++++++++++
5 files changed, 65 insertions(+), 3 deletions(-)

New commits:
commit b8ed976b0c4456d51953d320b11bd43544d0e2c9
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

mkinitrd added support for cryptsetup additions for root crypto support

diff --git a/smgl/linux-initramfs/DEPENDS b/smgl/linux-initramfs/DEPENDS
index 98416db..4184244 100755
--- a/smgl/linux-initramfs/DEPENDS
+++ b/smgl/linux-initramfs/DEPENDS
@@ -1 +1,3 @@
depends klibc
+optional_depends lvm
+optional_depends cryptsetup-luks
diff --git a/smgl/linux-initramfs/DETAILS b/smgl/linux-initramfs/DETAILS
index bf41249..979ecae 100755
--- a/smgl/linux-initramfs/DETAILS
+++ b/smgl/linux-initramfs/DETAILS
@@ -1,5 +1,5 @@
- SPELL=linux-initramfs
- VERSION=0.4
+ SPELL=linux-initramf
+ VERSION=0.5
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
WEB_SITE="http://www.sourcemage.org/";
ENTERED=20030803
diff --git a/smgl/linux-initramfs/HISTORY b/smgl/linux-initramfs/HISTORY
index 5dc3fdd..cf3c3ab 100644
--- a/smgl/linux-initramfs/HISTORY
+++ b/smgl/linux-initramfs/HISTORY
@@ -1,3 +1,9 @@
+2007-09-23 David Brown <dmlb2000 AT gmail.com>
+ * mkinitrd: added hooks to do luks root filesystem encryption
+ * DEPENDS: added some optional dependencies for easy user knowledge
+ * INSTALL: added crypttab for initrd crypto support
+ * HISTORY: version++
+
2007-09-20 David Brown <dmlb2000 AT gmail.com>
* mkinitrd: make the initrd a little simpler with no symlinks...
* DETAILS: version++
diff --git a/smgl/linux-initramfs/INSTALL b/smgl/linux-initramfs/INSTALL
index a306c9a..bfcfad1 100755
--- a/smgl/linux-initramfs/INSTALL
+++ b/smgl/linux-initramfs/INSTALL
@@ -25,4 +25,5 @@ done
install -vm 755 -o root -g root ${SPELL_DIRECTORY}/mkinitrd
${INSTALL_ROOT}/sbin/ &&
install -vm 755 -o root -g root ${SPELL_DIRECTORY}/installkernel
${INSTALL_ROOT}/sbin/
mkdir -p ${INSTALL_ROOT}/etc/linux-initramfs &&
-touch ${INSTALL_ROOT}/etc/linux-initramfs/modules.lst
+touch ${INSTALL_ROOT}/etc/linux-initramfs/modules.lst &&
+touch ${INSTALL_ROOT}/etc/crypttab
diff --git a/smgl/linux-initramfs/mkinitrd b/smgl/linux-initramfs/mkinitrd
index 4087159..c406d75 100755
--- a/smgl/linux-initramfs/mkinitrd
+++ b/smgl/linux-initramfs/mkinitrd
@@ -22,8 +22,10 @@

FORCE_RAID=${FORCE_RAID:=false}
FORCE_LVM=${FORCE_LVM:=false}
+FORCE_CRYPTO=${FORCE_CRYPTO:=false}
USE_RAID=${USE_RAID:=false}
USE_LVM=${USE_LVM:=false}
+USE_CRYPTO=${USE_CRYPTO:=false}
BREAK_ON_MISSING=${BREAK_ON_MISSING:=true}
REMOVE_OLD_INITRD=${REMOVE_OLD_INITRD:=false}

@@ -53,6 +55,22 @@ done
EOF
}

+function linuxrc_crypto()
+{
+ if $USE_CRYPTO || $FORCE_CRYPTO
+ then
+ cat <<-EOF
+/bin/mount -t proc proc /proc
+/bin/dmsetup mknodes
+cat /crypttab |
+while read line
+do
+eval "/bin/cryptsetup luksOpen \$line" < /dev/console > /dev/console 2>&1
+done
+EOF
+ fi
+}
+
function linuxrc_raid()
{
if $USE_RAID || $FORCE_RAID
@@ -567,6 +585,13 @@ EOF
fi
}

+function crypto_parts()
+{
+ echo "file /crypttab /etc/crypttab 0644 0 0"
+ echo "file /bin/cryptsetup /usr/sbin/cryptsetup.static 0755 0 0"
+ echo "file /bin/dmsetup /sbin/dmsetup.static 0755 0 0"
+}
+
function rec_fill_modules()
{
local dep_modules
@@ -632,6 +657,15 @@ function fill_modules()
then
rec_fill_modules dm-mod
fi
+ if $USE_CRYPTO || $FORCE_CRYPTO
+ then
+ rec_fill_modules dm-mod
+ rec_fill_modules sha256
+ rec_fill_modules sha512
+ rec_fill_modules aes-i586
+ rec_fill_modules aes
+ rec_fill_modules dm-crypt
+ fi
fill_root_driver
fill_root_filesystem
}
@@ -691,6 +725,16 @@ function check_lvm()
fi
}

+function check_crypto()
+{
+ if [[ -f /etc/crypttab && -x /usr/sbin/cryptsetup.static && -x
/sbin/dmsetup.static ]]
+ then
+ USE_CRYPTO=true
+ else
+ USE_CRYPTO=false
+ fi
+}
+
while [[ $1 ]]
do
case $1 in
@@ -709,12 +753,18 @@ do
--enable-lvm)
FORCE_LVM=true
;;
+ --enable-crypto)
+ FORCE_CRYPTO=true
+ ;;
--disable-raid)
FORCE_RAID=false
;;
--disable-lvm)
FORCE_LVM=false
;;
+ --disable-crypto)
+ FORCE_CRYPTO=false
+ ;;
-f|--force)
REMOVE_OLD_INITRD=true
;;
@@ -745,11 +795,13 @@ done
depmod -a $KVERSION
check_raid
check_lvm
+check_crypto
fill_modules
(
linuxrc_pre
linuxrc_raid
linuxrc_lvm
+ linuxrc_crypto
linuxrc_pre_kinit
linuxrc_post
) > /tmp/linuxrc
@@ -760,6 +812,7 @@ fill_modules
module_parts
klibc_parts
raid_parts
+ crypto_parts
lvm_parts
user_parts
) | gen_cpio_root



  • [SM-Commit] GIT changes to master grimoire by David Brown (b8ed976b0c4456d51953d320b11bd43544d0e2c9), David Brown, 09/23/2007

Archive powered by MHonArc 2.6.24.

Top of Page