Skip to Content.
Sympa Menu

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

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 (94066dc01f792d4b163923eec17fd2666e9f6d58)
  • Date: Sat, 8 Sep 2007 21:20:49 -0500

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

smgl/linux-initramfs/DETAILS | 2 -
smgl/linux-initramfs/HISTORY | 5 +++
smgl/linux-initramfs/mkinitrd | 67
+++++++++++++++++++++++++++++++-----------
3 files changed, 57 insertions(+), 17 deletions(-)

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

linux-initramfs updated mkinitrd to use cpio instead of gen_init_cpio
from the kernel

diff --git a/smgl/linux-initramfs/DETAILS b/smgl/linux-initramfs/DETAILS
index b380c17..4236b9c 100755
--- a/smgl/linux-initramfs/DETAILS
+++ b/smgl/linux-initramfs/DETAILS
@@ -1,5 +1,5 @@
SPELL=linux-initramfs
- VERSION=0.2
+ VERSION=0.3
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 3a179c8..0f63be8 100644
--- a/smgl/linux-initramfs/HISTORY
+++ b/smgl/linux-initramfs/HISTORY
@@ -1,3 +1,8 @@
+2007-09-08 David Brown <dmlb2000 AT gmail.com>
+ * mkinitrd: updated to not use the gen_init_cpio and to use the
regular
+ cpio executable
+ * DETAILS: version++
+
2007-04-15 David Brown <dmlb2000 AT gmail.com>
* examples/pre_kinit.sh.klibc: added for the default klibc supported
resume ip and nfsmount configurations
diff --git a/smgl/linux-initramfs/mkinitrd b/smgl/linux-initramfs/mkinitrd
index 69e0c8a..fac0794 100755
--- a/smgl/linux-initramfs/mkinitrd
+++ b/smgl/linux-initramfs/mkinitrd
@@ -30,6 +30,8 @@ REMOVE_OLD_INITRD=${REMOVE_OLD_INITRD:=false}
MODULES=${MODULES:=}
KVERSION=$(uname -r)
INITRD_FILE=${INITRD_FILE:=/boot/initrd.img-$KVERSION}
+CPIO_TMP_ROOT=$(mktemp -d -p ${TMP_DIR:-/tmp})
+

function usage()
{
@@ -103,6 +105,7 @@ function dir_parts()
cat <<-EOF
slink /sbin bin 0755 0 0
dir /bin 0755 0 0
+dir /usr 0755 0 0
slink /usr/sbin bin 0755 0 0
dir /usr/bin 0755 0 0
dir /lib 0755 0 0
@@ -635,6 +638,40 @@ function fill_modules()
fill_root_filesystem
}

+function gen_cpio_root()
+{
+ local line args
+ while read line
+ do
+ args=($line)
+ case ${args[0]} in
+ slink)
+ ln -s ${args[2]} ${CPIO_TMP_ROOT}/${args[1]}
+ ;;
+ file)
+ cat ${args[2]} > ${CPIO_TMP_ROOT}/${args[1]}
+ chmod ${args[3]} ${CPIO_TMP_ROOT}/${args[1]}
+ ;;
+ dir)
+ mkdir ${CPIO_TMP_ROOT}/${args[1]}
+ chmod ${args[2]} ${CPIO_TMP_ROOT}/${args[1]}
+ ;;
+ nod)
+ mknod ${CPIO_TMP_ROOT}/${args[1]} ${args[5]}
${args[6]} ${args[7]}
+ chmod ${args[2]} ${CPIO_TMP_ROOT}/${args[1]}
+
+ ;;
+ esac
+ done
+}
+
+function gen_cpio_image()
+{
+ pushd $CPIO_TMP_ROOT
+ find . | cpio --quiet -H newc -o | gzip -9c > $INITRD_FILE
+ popd
+}
+
function check_raid()
{
if [[ -f /etc/mdadm.conf && -x /sbin/mdadm.static ]]
@@ -663,6 +700,10 @@ do
usage
exit 0
;;
+ -h|--help)
+ usage
+ exit 0
+ ;;
--enable-raid)
FORCE_RAID=true
;;
@@ -707,6 +748,13 @@ check_raid
check_lvm
fill_modules
(
+ linuxrc_pre
+ linuxrc_raid
+ linuxrc_lvm
+ linuxrc_pre_kinit
+ linuxrc_post
+) > /tmp/linuxrc
+(
default_parts
dev_parts
dir_parts
@@ -715,27 +763,14 @@ fill_modules
raid_parts
lvm_parts
user_parts
-) > /tmp/initrd.lst
-(
- linuxrc_pre
- linuxrc_raid
- linuxrc_lvm
- linuxrc_pre_kinit
- linuxrc_post
-) > /tmp/linuxrc
-if ! [[ -x /lib/modules/$KVERSION/build/usr/gen_init_cpio ]]
-then
- echo "Bah!!! can't find the gen_init_cpio file is your kernel built?"
- usage
- exit -1
-fi &&
+) | gen_cpio_root
if [[ -f $INITRD_FILE && ! $REMOVE_OLD_INITRD ]]
then
echo "Refusing to blow away original initrd"
usage
exit -1
-fi &&
-/lib/modules/$KVERSION/build/usr/gen_init_cpio /tmp/initrd.lst | gzip -c >
$INITRD_FILE
+fi &&
+gen_cpio_image

#---------------------------------------------------------------------
##=back



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

Archive powered by MHonArc 2.6.24.

Top of Page