Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fw-initramfs.git;a=commitdiff;h=47dc3098650d5f90ea92588c7f7808851182f152
commit 47dc3098650d5f90ea92588c7f7808851182f152 Author: bouleetbil <bouleet...@frogdev.info> Date: Sun Nov 8 00:00:50 2009 +0100 init_functions.sh *clean up diff --git a/init_functions.sh b/init_functions.sh index 13f782c..f56a318 100644 --- a/init_functions.sh +++ b/init_functions.sh @@ -29,7 +29,7 @@ backup() { # $1 string # $2 hide flag -good_msg() { +good_msg() { msg_string=$1 msg_string="${msg_string:-...}" [ "$2" != 1 ] && echo -e "${GOOD}>>${NORMAL}${BOLD} ${msg_string} ${NORMAL}" @@ -42,7 +42,7 @@ bad_msg() { then echo -e "${BAD}!!${NORMAL}${BOLD} ${msg_string} ${NORMAL}" fi -} +} warn_msg() { msg_string=$1 @@ -97,21 +97,13 @@ load_modules() { [ -n "${DEBUG}" ] && echo -ne "${BOLD} ::${NORMAL} Checking for ${x}..." # find -name does not work since the return status is always zero ModuleFile=`find "/lib/modules/${KV}" | grep ${module}${MOD_EXT}` - if [ -e $ModuleFile ] + if [ -e $ModuleFile ] then echo -ne "${BOLD} ::${NORMAL} Scanning for ${module}..." - #modprobe ${module} >> /log.txt modprobe ${module} 2>/dev/null 1> /dev/null if [ $? == 0 ]; then echo "${module} module loaded" fi -#if [ $? == 0 ]; then -# echo "$dev module loaded" -#fi -#do modprobe $dev 2>/dev/null 1> /dev/null -#if [ $? == 0 ]; then -# echo "$dev module loaded" -#fi backup echo -ne "${NORMAL}" fi @@ -158,15 +150,15 @@ setup_md_device() { } startVolumes() { - + # Here, we check for /dev/device-mapper, and if it exists, we setup a - # a symlink, which should hopefully fix bug #142775 and bug #147015 + # a symlink, which should hopefully if [ -e /dev/device-mapper ] && [ ! -e /dev/mapper/control ] then mkdir -p /dev/mapper ln -sf /dev/device-mapper /dev/mapper/control fi - + if [ "${USE_LVM_NORMAL}" = '1' ] then if [ -e '/bin/vgscan' -a -e '/bin/vgchange' ] _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git