Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: David Brown <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by David Brown (b862655dff2765e1a256301987aba9f4def9583f)
  • Date: Sun, 28 Jan 2007 21:56:56 -0600

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

kernels/linux/HISTORY | 3 ++
kernels/linux/INSTALL | 2 -
smgl/linux-initramfs/HISTORY | 4 +++
smgl/linux-initramfs/installkernel | 27 ++++++++++++++++++++
smgl/linux-initramfs/mkinitrd | 49
++++++++++++++++++++++++++++++++++++-
5 files changed, 83 insertions(+), 2 deletions(-)

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

linux added --force to making the initrd so that it will blow away any
old initrd

commit 03167ace02e55070e4de857b2e86b7963183fe62
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

linux-initramfs adding some documentation and gpl/copyright stuff to the
script

diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 9b6a612..245abd1 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,6 @@
+2007-01-29 David Brown <dmlb2000 AT gmail.com>
+ * INSTALL: called mkinitrd with --force so it will blow away old
initrd
+
2007-01-28 David Brown <dmlb2000 AT gmail.com>
* mkinitrd: moved to linux-initramfs spell
* installkernel: moved to linux-initramfs spell
diff --git a/kernels/linux/INSTALL b/kernels/linux/INSTALL
index 26518c2..46866d1 100755
--- a/kernels/linux/INSTALL
+++ b/kernels/linux/INSTALL
@@ -62,7 +62,7 @@ if [[ -z "$INTERNAL_ISO_VAR" ]] ; then
ln -sfn . ${INSTALL_ROOT}/boot/boot &&
if is_depends_enabled $SPELL linux-initramfs
then
- mkinitrd --ignore-missing -o
${INSTALL_ROOT}/boot/initrd.img-${VERSION} ${VERSION}
+ mkinitrd --force --ignore-missing -o
${INSTALL_ROOT}/boot/initrd.img-${VERSION} ${VERSION}
fi
fi &&
ln -sfn `basename ${LINUX_SOURCE_DIRECTORY}` ${BUILD_DIRECTORY}/linux
diff --git a/smgl/linux-initramfs/HISTORY b/smgl/linux-initramfs/HISTORY
index 4c0c673..24e8d21 100644
--- a/smgl/linux-initramfs/HISTORY
+++ b/smgl/linux-initramfs/HISTORY
@@ -1,3 +1,7 @@
+2007-01-29 David Brown <dmlb2000 AT gmail.com>
+ * mkinitrd: added the gpl stuff and copyright stuff to the script
+ * installkernel: added the gpl stuff and copyright stuff to the script
+
2007-01-28 David Brown <dmlb2000 AT gmail.com>
* mkinitrd: the last commit I did didn't grep modules.dep file right

diff --git a/smgl/linux-initramfs/installkernel
b/smgl/linux-initramfs/installkernel
index f16dd81..6542e7e 100755
--- a/smgl/linux-initramfs/installkernel
+++ b/smgl/linux-initramfs/installkernel
@@ -1,4 +1,11 @@
#!/bin/bash
+#====================================================================
+# This is a Source Mage script for installing kernels to a Source
+# Mage system
+#
+# @Copyright Source Mage GNU/Linux Developers
+#
+#====================================================================

VERSION=$1
IMAGE=$2
@@ -47,3 +54,23 @@ ln -sf config-${VERSION} ${BOOT_DIR}/con
ln -sfn . ${BOOT_DIR}/boot
ln -sfn $(pwd) ${BUILD_DIRECTORY}/linux

+#---------------------------------------------------------------------
+##=back
+##
+##=head1 LICENSE
+##
+## This software is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This software is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this software; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+#---------------------------------------------------------------------
diff --git a/smgl/linux-initramfs/mkinitrd b/smgl/linux-initramfs/mkinitrd
index 22ffee2..4eed1e0 100755
--- a/smgl/linux-initramfs/mkinitrd
+++ b/smgl/linux-initramfs/mkinitrd
@@ -1,4 +1,24 @@
#!/bin/bash
+#====================================================================
+# This is a Source Mage script for generating initial ramdisks to be
+# loaded by the kernel
+#
+# @Copyright Source Mage GNU/Linux Developers
+#
+# USAGE:
+#
+# # mkinitrd -o /boot/initrd.img-2.6.20 2.6.20
+#
+# -v|--version displays usage version and exits
+# --enable-raid force the usage of raid
+# --enable-lvm force the usage of lvm
+# --disable-raid don't use raid
+# --disable-lvm don't use lvm
+# -f|--force if initrd file exists blow it away
+# --ignore-missing ignore missing modules that may show up
+# -m|--with-module add module to the initrd
+# -o|--output output file
+#====================================================================

FORCE_RAID=${FORCE_RAID:=false}
FORCE_LVM=${FORCE_LVM:=false}
@@ -680,5 +700,32 @@ then
echo "Bah!!! can't find the gen_init_cpio file is your kernel built?"
usage
exit -1
-fi
+fi &&
+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
+
+#---------------------------------------------------------------------
+##=back
+##
+##=head1 LICENSE
+##
+## This software is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This software is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this software; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+#---------------------------------------------------------------------



  • [SM-Commit] GIT changes to master grimoire by David Brown (b862655dff2765e1a256301987aba9f4def9583f), David Brown, 01/28/2007

Archive powered by MHonArc 2.6.24.

Top of Page