[Lunar-commits] r14728 - in lunar-iso/trunk: initrd initrd/template/sbin isolinux scripts
Auke Kok
sofar at lunar-linux.org
Sun May 15 14:36:37 UTC 2005
Author: sofar
Date: 2005-05-15 14:36:36 +0000 (Sun, 15 May 2005)
New Revision: 14728
Modified:
lunar-iso/trunk/initrd/initrd.list
lunar-iso/trunk/initrd/initrd.list-2.4
lunar-iso/trunk/initrd/template/sbin/init
lunar-iso/trunk/isolinux/isolinux.cfg
lunar-iso/trunk/scripts/initrd
lunar-iso/trunk/scripts/ldd-gather
Log:
Committing a whole bunch of bugfixes:
- modprobe seems to fail on stripped modules, so we don't strip em
- compensate for the wrappers: don't wrap them at all
- modify ldd-gather script to discard junk at EOL (parm $2)
- increase initrd size due to increased size needs
- fix initrd init: several serious hiccups removed
- forgot devfsd on initrd
Modified: lunar-iso/trunk/initrd/initrd.list
===================================================================
--- lunar-iso/trunk/initrd/initrd.list 2005-05-15 13:09:45 UTC (rev 14727)
+++ lunar-iso/trunk/initrd/initrd.list 2005-05-15 14:36:36 UTC (rev 14728)
@@ -6,6 +6,7 @@
bin/ls
bin/mkdir
bin/mount
+bin/more
bin/pgrep
bin/pkill
bin/rm
@@ -27,9 +28,8 @@
usr/bin/e3em
usr/bin/e3vi
usr/bin/ldd
-usr/bin/less
+usr/bin/lddlibc4
usr/bin/nano
-usr/bin/touch
usr/lib/libexpat.so
usr/lib/libexpat.so.0
usr/lib/libexpat.so.0.5.0
Modified: lunar-iso/trunk/initrd/initrd.list-2.4
===================================================================
--- lunar-iso/trunk/initrd/initrd.list-2.4 2005-05-15 13:09:45 UTC (rev 14727)
+++ lunar-iso/trunk/initrd/initrd.list-2.4 2005-05-15 14:36:36 UTC (rev 14728)
@@ -1,17 +1,8 @@
etc/devfsd.conf
-sbin/depmod
sbin/devfsd
-sbin/insmod
-sbin/lsmod
-sbin/modprobe
-sbin/rmmod
-lib/modutils/sbin/depmod
-lib/modutils/sbin/insmod
-lib/modutils/sbin/insmod.static
-lib/modutils/sbin/lsmod
-lib/modutils/sbin/lsmod.static
-lib/modutils/sbin/modinfo
-lib/modutils/sbin/modprobe
-lib/modutils/sbin/modprobe.static
-lib/modutils/sbin/rmmod
-lib/modutils/sbin/rmmod.static
+lib/modutils/sbin/depmod sbin/
+lib/modutils/sbin/insmod sbin/
+lib/modutils/sbin/lsmod sbin/
+lib/modutils/sbin/modinfo sbin/
+lib/modutils/sbin/modprobe sbin/
+lib/modutils/sbin/rmmod sbin/
Modified: lunar-iso/trunk/initrd/template/sbin/init
===================================================================
--- lunar-iso/trunk/initrd/template/sbin/init 2005-05-15 13:09:45 UTC (rev 14727)
+++ lunar-iso/trunk/initrd/template/sbin/init 2005-05-15 14:36:36 UTC (rev 14728)
@@ -58,7 +58,7 @@
done
if [ -z "$1" ]; then
echo "Finished loading modules!"
- sleep 5
+ sleep 2
fi
}
@@ -81,8 +81,8 @@
if [ -f "$CHOICE" ]; then
MODULE=`basename $MODULE | sed -e "s/\.o$//" -e "s/\.ko$//"`
PARAMETERS=`input_module_parameters` &&
- modprobe $CHOICE $PARAMETERS
- sleep 5
+ modprobe $MODULE $PARAMETERS
+ sleep 2
elif [ -d "$CHOICE" ]; then
cd "$CHOICE"
fi
@@ -225,6 +225,9 @@
KERNEL=`uname -r`
DEVICE="/dev/cdroms/cdrom"
+# short timeout, we really need to be able to see debug info
+sleep 2
+
# fastboot or not?
if cat /proc/cmdline | grep -q 'skipinitrd=1'; then
echo ""
Modified: lunar-iso/trunk/isolinux/isolinux.cfg
===================================================================
--- lunar-iso/trunk/isolinux/isolinux.cfg 2005-05-15 13:09:45 UTC (rev 14727)
+++ lunar-iso/trunk/isolinux/isolinux.cfg 2005-05-15 14:36:36 UTC (rev 14728)
@@ -13,14 +13,14 @@
F9 f1.txt
LABEL install
KERNEL linux
- APPEND vga=ask load_ramdisk=1 ramdisk_size=9216 initrd=initrd root=/dev/ram0 prompt_ramdisk=0 skipinitrd=1
+ APPEND vga=ask load_ramdisk=1 ramdisk_size=9600 initrd=initrd root=/dev/ram0 prompt_ramdisk=0 skipinitrd=1
LABEL linux
KERNEL linux
- APPEND vga=ask load_ramdisk=1 ramdisk_size=9216 initrd=initrd root=/dev/ram0 prompt_ramdisk=0 skipinitrd=0
+ APPEND vga=ask load_ramdisk=1 ramdisk_size=9600 initrd=initrd root=/dev/ram0 prompt_ramdisk=0 skipinitrd=0
# safer mode, IDE DMA disabled
LABEL safe
KERNEL safe
- APPEND vga=normal load_ramdisk=1 ramdisk_size=9216 initrd=initrd root=/dev/ram0 prompt_ramdisk=0 skipinitrd=0
+ APPEND vga=normal load_ramdisk=1 ramdisk_size=9600 initrd=initrd root=/dev/ram0 prompt_ramdisk=0 skipinitrd=0
# memtest86 activation
LABEL memtest
KERNEL memtest
Modified: lunar-iso/trunk/scripts/initrd
===================================================================
--- lunar-iso/trunk/scripts/initrd 2005-05-15 13:09:45 UTC (rev 14727)
+++ lunar-iso/trunk/scripts/initrd 2005-05-15 14:36:36 UTC (rev 14728)
@@ -13,7 +13,7 @@
# template first
cp -a --no-dereference template BUILD
-find BUILD -type d -name .svn -exec rm -rf {} \;
+find BUILD -type d -name '.svn' -exec rm -rf {} \; >/dev/null 2>&1
mkdir -p BUILD/{mnt,proc,var/lib/discover}
echo "+ copying binaries and required files"
@@ -75,14 +75,6 @@
mkdir -p $ISO_SOURCE/aaa_dev
tar cj -C BUILD -f $ISO_SOURCE/aaa_dev/aaa_dev.tar.bz2 dev/
-echo "+ stripping everything"
-for ITEM in $(find BUILD -type f); do
- strip $ITEM > /dev/null 2>&1
-done
-for ITEM in $(find BUILD -type d -name ".svn" | tac); do
- rm -rf $ITEM
-done
-
# compile the initrd image
echo "+ installing initrd kernels"
for KERNEL in linux safe ; do
@@ -92,8 +84,11 @@
cd TMP
tar xjf $ISO_SOURCE/kernels/TAR/$KVER.tar.bz2
mkdir -p $ISO_SOURCE/initrd/BUILD/lib/modules/$KVER/kernel/drivers/
+ echo "+ cp -a --no-dereference lib/modules/$KVER/kernel/drivers/{ide,scsi} $ISO_SOURCE/initrd/BUILD/lib/modules/$KVER/kernel/drivers/"
cp -a --no-dereference lib/modules/$KVER/kernel/drivers/{ide,scsi} $ISO_SOURCE/initrd/BUILD/lib/modules/$KVER/kernel/drivers/
+ echo "+ cp lib/modules/$KVER/modules.* $ISO_SOURCE/initrd/BUILD/lib/modules/$KVER/"
cp lib/modules/$KVER/* $ISO_SOURCE/initrd/BUILD/lib/modules/$KVER/
+ echo "+ depmod -b $ISO_SOURCE/initrd/BUILD -a -F $ISO_SOURCE/kernels/$KERNEL.map $KVER"
depmod -b $ISO_SOURCE/initrd/BUILD -a -F $ISO_SOURCE/kernels/$KERNEL.map $KVER
)
rm -rf TMP
@@ -106,10 +101,14 @@
cp $ISO_SOURCE/discover/conffile.dtd BUILD/usr/share/discover/dtd/
cp $ISO_SOURCE/discover/discover.dtd BUILD/usr/share/discover/dtd/
cp $ISO_SOURCE/discover/data/* BUILD/usr/share/discover/
-# make sure this is absolutely minimal:
-for file in $(find BUILD/{lib,bin,sbin,usr}); do
- strip $file 2> /dev/null
+
+echo "+ stripping everything"
+for ITEM in BUILD/{bin,sbin,usr/bin,usr/sbin,lib,usr/lib}/* ; do
+ strip $ITEM > /dev/null 2>&1
done
+for ITEM in $(find BUILD -type d -name ".svn" | tac); do
+ rm -rf $ITEM
+done
chown -R root:root BUILD/*
Modified: lunar-iso/trunk/scripts/ldd-gather
===================================================================
--- lunar-iso/trunk/scripts/ldd-gather 2005-05-15 13:09:45 UTC (rev 14727)
+++ lunar-iso/trunk/scripts/ldd-gather 2005-05-15 14:36:36 UTC (rev 14728)
@@ -42,24 +42,23 @@
fi
fi
-cat $1 | while read binary ; do
- if [ -x $binary ] ; then
- ldd $binary
+cat $1 | while read FILE JUNK ; do
+ if [ -x $FILE ] ; then
+ ldd $FILE
fi
done | grep "=> /" | cut -d" " -f3 | sort | uniq | while read lib ; do
echo $lib
- symlinked=`readlink $lib`
- dir=`dirname $lib`
+ LINK=`readlink $lib`
+ DIR=`dirname $lib`
- symlink=$dir/$symlinked
- if [ -e "$symlink" ]; then
- echo "$symlink"
+ if [ -e "$DIR/$LINK" ]; then
+ echo "$DIR/$LINK"
fi
- stripped=${symlink%%.[0-9]*}
- if [ -e ${stripped} ]; then
- echo "${stripped}"
+ STRIPPED=$DIR/${LINK%%.[0-9]*}
+ if [ -e "$STRIPPED" ]; then
+ echo "$STRIPPED"
fi
done
More information about the Lunar-commits
mailing list