initramfs-tools: update to 0.93.2_11.

* Remove usplash stuff from all code, I won't use it.
* Print log_msg messages in bold.
* Use dmesg from busybox and set it to -n1 to avoid polluting
  the console with unwanted messages.

--HG--
extra : convert_revision : 53c9d6628bb9649f148e77c358578494db0d01da
This commit is contained in:
Juan RP 2009-10-12 01:31:46 +02:00
parent f4988f23c7
commit 9cc9dd7ad4
4 changed files with 18 additions and 28 deletions

View File

@ -1,15 +1,18 @@
#!/bin/sh
echo "Loading, please wait..."
echo "Starting up the initramfs, please wait..."
# Create some required busybox symlinks.
if [ -x /bin/busybox ]; then
for f in cut touch tr grep awk tail basename ls cp rm \
head expr du; do
head expr du sed rmdir; do
busybox ln -s /bin/busybox /bin/${f}
done
rm -f /bin/dmesg
busybox ln -s /bin/busybox /bin/dmesg
busybox ln -s /bin/busybox /sbin/pkill
fi
dmesg -n1
[ -d /dev ] || mkdir -m 0755 /dev
[ -d /root ] || mkdir -m 0700 /root
@ -189,14 +192,14 @@ fi
depmod -a
maybe_break top
# Don't do log messages here to avoid confusing usplash
[ "$quiet" != "y" ] && log_begin_msg "Running /scripts/init-top"
run_scripts /scripts/init-top
[ "$quiet" != "y" ] && log_end_msg
maybe_break modules
log_begin_msg "Loading essential drivers"
[ "$quiet" != "y" ] && log_begin_msg "Loading essential drivers"
load_modules
log_end_msg
[ "$quiet" != "y" ] && log_end_msg
maybe_break premount
[ "$quiet" != "y" ] && log_begin_msg "Running /scripts/init-premount"
@ -204,12 +207,12 @@ run_scripts /scripts/init-premount
[ "$quiet" != "y" ] && log_end_msg
maybe_break mount
log_begin_msg "Mounting root file system"
[ "$quiet" != "y" ] && log_begin_msg "Mounting root file system"
. /scripts/${BOOT}
parse_numeric ${ROOT}
maybe_break mountroot
mountroot
log_end_msg
[ "$quiet" != "y" ] && log_end_msg
maybe_break bottom
[ "$quiet" != "y" ] && log_begin_msg "Running /scripts/init-bottom"
@ -263,5 +266,5 @@ unset resume
unset resume_offset
# Chain to real filesystem
exec run-init ${rootmnt} ${init} "$@" <${rootmnt}/dev/console >${rootmnt}/dev/console
exec run-init ${rootmnt} ${init} "$@"
panic "Could not execute run-init."

View File

@ -2,8 +2,10 @@
_log_msg()
{
if [ "$quiet" = "y" ]; then return; fi
[ "$quiet" = "y" ] && return
printf "\033[1m"
printf "$@"
printf "\033[m\n"
}
log_success_msg()
@ -23,25 +25,16 @@ log_warning_msg()
log_begin_msg()
{
if [ -x /sbin/usplash_write ]; then
/sbin/usplash_write "TEXT $@"
fi
_log_msg "Begin: $@ ... "
_log_msg "$@ ..."
}
log_end_msg()
{
if [ -x /sbin/usplash_write ]; then
/sbin/usplash_write "SUCCESS ok"
fi
_log_msg "done.\n"
:
}
panic()
{
if [ -x /sbin/usplash_write ]; then
/sbin/usplash_write "QUIT"
fi
# Disallow console access
if [ -n "${panic}" ]; then
sleep ${panic}

View File

@ -49,9 +49,6 @@ pre_mountroot()
else
slumber=${ROOTDELAY}
fi
if [ -x /sbin/usplash_write ]; then
/sbin/usplash_write "TIMEOUT ${slumber}" || true
fi
slumber=$(( ${slumber} * 10 ))
while [ ! -e "${ROOT}" ] \
@ -66,9 +63,6 @@ pre_mountroot()
else
log_end_msg 1 || true
fi
if [ -x /sbin/usplash_write ]; then
/sbin/usplash_write "TIMEOUT 15" || true
fi
fi
# We've given up, but we'll let the user fix matters if they can

View File

@ -1,7 +1,7 @@
# Template file for 'initramfs-tools'
pkgname=initramfs-tools
version=0.93.2
revision=10
revision=11
build_style=custom-install
short_desc="Tools for generating an initramfs"
maintainer="Juan RP <xtraeme@gmail.com>"