Skip to Content.
Sympa Menu

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

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 (1fdcb9ed1806dccc3b1385bca7b7e7897c5d913f)
  • Date: Thu, 20 Sep 2007 23:28:51 -0500

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

smgl/linux-initramfs/DETAILS | 2 +-
smgl/linux-initramfs/HISTORY | 4 ++++
smgl/linux-initramfs/mkinitrd | 30 ++++++++++++++----------------
3 files changed, 19 insertions(+), 17 deletions(-)

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

linux-initramfs swapped out symlinks for hard links and removed some of
the symlinked dirs... no more /sbin or /usr/sbin just /bin and /usr/bin

diff --git a/smgl/linux-initramfs/DETAILS b/smgl/linux-initramfs/DETAILS
index 1012d87..bf41249 100755
--- a/smgl/linux-initramfs/DETAILS
+++ b/smgl/linux-initramfs/DETAILS
@@ -1,5 +1,5 @@
SPELL=linux-initramfs
- VERSION=0.3
+ VERSION=0.4
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 f735277..5dc3fdd 100644
--- a/smgl/linux-initramfs/HISTORY
+++ b/smgl/linux-initramfs/HISTORY
@@ -1,3 +1,7 @@
+2007-09-20 David Brown <dmlb2000 AT gmail.com>
+ * mkinitrd: make the initrd a little simpler with no symlinks...
+ * DETAILS: version++
+
2007-09-09 David Brown <dmlb2000 AT gmail.com>
* mkinitrd: forgot to blow away the cpio tmp root and quiet the
pushd/popd's
diff --git a/smgl/linux-initramfs/mkinitrd b/smgl/linux-initramfs/mkinitrd
index a663c00..4087159 100755
--- a/smgl/linux-initramfs/mkinitrd
+++ b/smgl/linux-initramfs/mkinitrd
@@ -48,7 +48,7 @@ function linuxrc_pre()

for module in \`cat /modules.lst\`
do
-/sbin/insmod \$module
+/bin/insmod \$module
done
EOF
}
@@ -58,7 +58,7 @@ function linuxrc_raid()
if $USE_RAID || $FORCE_RAID
then
cat <<-EOF
-/sbin/mdadm --assemble --scan
+/bin/mdadm --assemble --scan
EOF
fi
}
@@ -68,10 +68,10 @@ function linuxrc_lvm()
if $USE_LVM || $FORCE_LVM
then
cat <<-EOF
-/sbin/mount -t proc proc /proc
-/sbin/dmsetup mknodes
-/sbin/vgscan --ignorelockingfailure --mknodes
-/sbin/vgchange -ay --ignorelockingfailure
+/bin/mount -t proc proc /proc
+/bin/dmsetup mknodes
+/bin/vgscan --ignorelockingfailure --mknodes
+/bin/vgchange -ay --ignorelockingfailure
EOF
fi
}
@@ -95,18 +95,16 @@ function default_parts()
dir /dev 0755 0 0
nod /dev/console 0600 0 0 c 5 1
dir /root 0700 0 0
-slink /init linuxrc 0755 0 0
file /linuxrc /tmp/linuxrc 0755 0 0
+link /init /linuxrc 0755 0 0
EOF
}

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
dir /proc 0755 0 0
@@ -539,7 +537,7 @@ function raid_parts()
if $USE_RAID || $FORCE_RAID
then
cat <<-EOF
-file /sbin/mdadm /sbin/mdadm.static 0755 0 0
+file /bin/mdadm /sbin/mdadm.static 0755 0 0
file /etc/mdadm.conf /etc/mdadm.conf 0644 0 0
EOF
fi
@@ -552,7 +550,7 @@ function lvm_parts()
cat <<-EOF
dir /etc/lvm 0755 0 0
file /etc/lvm/lvm.conf /etc/lvm/lvm.conf 0644 0 0
-file /sbin/lvm /usr/sbin/lvm.static 0755 0 0
+file /bin/lvm /usr/sbin/lvm.static 0755 0 0
EOF
local link
for link in lvs pvs vgs vgck lvconvert lvdisplay pvchange pvcreate \
@@ -563,9 +561,9 @@ EOF
vgremove vgconvert vgcfgbackup lvreduce lvrename lvremove \
lvresize vgdisplay
do
- echo "slink /sbin/$link lvm 0755 0 0"
+ echo "link /bin/$link /bin/lvm 0755 0 0"
done
- echo "file /sbin/dmsetup /sbin/dmsetup.static 0755 0 0"
+ echo "file /bin/dmsetup /sbin/dmsetup.static 0755 0 0"
fi
}

@@ -645,8 +643,8 @@ function gen_cpio_root()
do
args=($line)
case ${args[0]} in
- slink)
- ln -s ${args[2]} ${CPIO_TMP_ROOT}/${args[1]}
+ link)
+ ln ${CPIO_TMP_ROOT}/${args[2]}
${CPIO_TMP_ROOT}/${args[1]}
;;
file)
cat ${args[2]} > ${CPIO_TMP_ROOT}/${args[1]}
@@ -668,7 +666,7 @@ function gen_cpio_root()
function gen_cpio_image()
{
pushd $CPIO_TMP_ROOT > /dev/null 2>&1
- find . | cpio --quiet -H newc -o | gzip -9c > $INITRD_FILE
+ find . | cpio --quiet -H newc -o | gzip -c > $INITRD_FILE
popd > /dev/null 2>&1
rm -rf $CPIO_TMP_ROOT
}



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

Archive powered by MHonArc 2.6.24.

Top of Page