kernel
/
dracut
mirror of https://git.kernel.org/pub/scm/boot/dracut/dracut.git/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

get rid of "basename"

master
Harald Hoyer 2012-07-24 14:12:36 +02:00
parent f2271428d4
commit c072e13162
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dracut-functions.sh
View File

@ -710,12 +710,12 @@ inst_rule_programs() {
_bin=${udevdir}/$_prog _bin=${udevdir}/$_prog
else else
_bin=$(find_binary "$_prog") || { _bin=$(find_binary "$_prog") || {
dinfo "Skipping program $_prog using in udev rule $(basename $1) as it cannot be found" dinfo "Skipping program $_prog using in udev rule $(${1##*/}) as it cannot be found"
continue; continue;
} }
fi fi


#dinfo "Installing $_bin due to it's use in the udev rule $(basename $1)" #dinfo "Installing $_bin due to it's use in the udev rule $(${1##*/})"
dracut_install "$_bin" dracut_install "$_bin"
done done
fi fi
@ -725,12 +725,12 @@ inst_rule_programs() {
_bin=${udevdir}/$_prog _bin=${udevdir}/$_prog
else else
_bin=$(find_binary "$_prog") || { _bin=$(find_binary "$_prog") || {
dinfo "Skipping program $_prog using in udev rule $(basename $1) as it cannot be found" dinfo "Skipping program $_prog using in udev rule $(${1##*/}) as it cannot be found"
continue; continue;
} }
fi fi


#dinfo "Installing $_bin due to it's use in the udev rule $(basename $1)" #dinfo "Installing $_bin due to it's use in the udev rule $(${1##*/})"
dracut_install "$_bin" dracut_install "$_bin"
done done
fi fi
@ -740,12 +740,12 @@ inst_rule_programs() {
_bin=${udevdir}/$_prog _bin=${udevdir}/$_prog
else else
_bin=$(find_binary "$_prog") || { _bin=$(find_binary "$_prog") || {
dinfo "Skipping program $_prog using in udev rule $(basename $1) as it cannot be found" dinfo "Skipping program $_prog using in udev rule $(${1##*/}) as it cannot be found"
continue; continue;
} }
fi fi


#dinfo "Installing $_bin due to it's use in the udev rule $(basename $1)" #dinfo "Installing $_bin due to it's use in the udev rule $(${1##*/})"
dracut_install "$_bin" dracut_install "$_bin"
done done
fi fi

2
lsinitrd.sh
View File

@ -21,7 +21,7 @@


usage() usage()
{ {
echo "Usage: $(basename $0) [-s] [<initramfs file> [<filename>]]" echo "Usage: $(${0##*/}) [-s] [<initramfs file> [<filename>]]"
} }


[[ $# -le 2 ]] || { usage ; exit 1 ; } [[ $# -le 2 ]] || { usage ; exit 1 ; }

2
modules.d/95udev-rules/module-setup.sh
View File

@ -8,7 +8,7 @@ install() {
# Fixme: would be nice if we didn't have to know which rules to grab.... # Fixme: would be nice if we didn't have to know which rules to grab....
# ultimately, /lib/initramfs/rules.d or somesuch which includes links/copies # ultimately, /lib/initramfs/rules.d or somesuch which includes links/copies
# of the rules we want so that we just copy those in would be best # of the rules we want so that we just copy those in would be best
dracut_install udevadm cat uname basename blkid \ dracut_install udevadm cat uname blkid \
/etc/udev/udev.conf /etc/group /etc/udev/udev.conf /etc/group


[ -d ${initdir}/lib/systemd ] || mkdir -p ${initdir}/lib/systemd [ -d ${initdir}/lib/systemd ] || mkdir -p ${initdir}/lib/systemd