From 65f691b1921522e80a8513f22894762cc80f879e Mon Sep 17 00:00:00 2001 From: Your Name Date: Sat, 4 Apr 2020 11:52:47 +0000 Subject: [PATCH] config ekledim --- src/addons/01-extra-modules.sh | 4 +++- src/addons/99-config.sh | 8 ++++++++ src/functions.sh | 2 +- src/scripts/02-modules.sh | 2 +- src/vars.sh | 2 +- 5 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 src/addons/99-config.sh diff --git a/src/addons/01-extra-modules.sh b/src/addons/01-extra-modules.sh index f5c806e..c743935 100644 --- a/src/addons/01-extra-modules.sh +++ b/src/addons/01-extra-modules.sh @@ -11,7 +11,9 @@ add_extra_module(){ do name=$(basename $line) echo -e " \033[34;1mInstall:\033[;0m $name" - cat $line > ${WORKDIR}/$MODDIR/extra/$name + mkdir -p ${WORKDIR}/$line + rmdir ${WORKDIR}/$line + cat $line > ${WORKDIR}/$line done } for i in $EXTRA_MODULES diff --git a/src/addons/99-config.sh b/src/addons/99-config.sh new file mode 100644 index 0000000..c377a7e --- /dev/null +++ b/src/addons/99-config.sh @@ -0,0 +1,8 @@ +[ "$CONFIG" != "" ] || CONFIG=/etc/initrd.conf +echo -e " \033[34;1mUsing config:\033[;0m $CONFIG" +mkdir -p ${WORKDIR}/etc +if [ -f $CONFIG ] ; then + cat ${CONFIG} > ${WORKDIR}/etc/initrd.conf +else + echo > ${WORKDIR}/etc/initrd.conf +fi diff --git a/src/functions.sh b/src/functions.sh index e8047b6..d26fdc9 100644 --- a/src/functions.sh +++ b/src/functions.sh @@ -38,7 +38,7 @@ parse_cmdline(){ is_file_avaiable(){ disktmp=$(mktemp) rm -f $disktmp - mkdir -p $disktmp || true + mkdir -p $disktmp || true mount -t auto "$1" $disktmp 2>/dev/null [ -f "$disktmp/$2" ] && [ -b "$1" ] status=$? diff --git a/src/scripts/02-modules.sh b/src/scripts/02-modules.sh index 739b90b..6293117 100644 --- a/src/scripts/02-modules.sh +++ b/src/scripts/02-modules.sh @@ -2,5 +2,5 @@ debug "Listing kernel modules" find /lib/modules/ | sed "s/.*\///g" | grep "\.ko$" | sed "s/.ko$//g" | sed "s/^/modprobe /g"> /load_modules.sh msg "Loading kernel modules" -sh /load_modules.sh 2> /dev/null | cat > /dev/null +sh /load_modules.sh 2> /dev/null | cat > /dev/null || fallback_shell diff --git a/src/vars.sh b/src/vars.sh index 5dfa6ec..29e37b9 100644 --- a/src/vars.sh +++ b/src/vars.sh @@ -1,6 +1,5 @@ PATH=/bin:/usr/bin:/usr/sbin:/sbin TERM=linux -EXTRA_MODULES="" rootfstype=ext4 if [ -t 0 ];then C_BLACK='\e[1;30m' @@ -25,3 +24,4 @@ warn() { err() { echo -e " ${C_RED}*${C_CLEAR} ${@}" } +. /etc/initrd.conf -- 2.18.1