mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-19 19:40:37 +02:00
'fixed md devices shown as partition'
This commit is contained in:
parent
2c6e9a5174
commit
21655e67c2
1 changed files with 2 additions and 2 deletions
|
@ -247,7 +247,7 @@ findpartitions() {
|
||||||
done
|
done
|
||||||
# include none partitionable raid md devices
|
# include none partitionable raid md devices
|
||||||
for devpath in $(ls -d /dev/md* | grep md[0-9]); do
|
for devpath in $(ls -d /dev/md* | grep md[0-9]); do
|
||||||
if [ "$(cat /proc/mdstat 2>/dev/null | grep -qw $(echo $devpath | sed -e 's|/dev/||g'))" ]; then
|
if [ "$(cat /proc/mdstat 2>/dev/null | grep -w $(basename $devpath)" ]; then
|
||||||
echo "$devpath"
|
echo "$devpath"
|
||||||
[ "$1" ] && echo $1
|
[ "$1" ] && echo $1
|
||||||
fi
|
fi
|
||||||
|
@ -1961,7 +1961,7 @@ auto_hwdetect()
|
||||||
DIALOG --yesno "PRECONFIGURATION?\n-----------------\n\nDo you want to use 'hwdetect' for:\n'/etc/rc.conf' and '/etc/mkinitcpio.conf'?\n\nThis ensures consistent ordering of your hard disk / usb controllers, network and sound devices.\n\nIt is recommended to say 'YES' here." 18 70 && HWDETECT="yes"
|
DIALOG --yesno "PRECONFIGURATION?\n-----------------\n\nDo you want to use 'hwdetect' for:\n'/etc/rc.conf' and '/etc/mkinitcpio.conf'?\n\nThis ensures consistent ordering of your hard disk / usb controllers, network and sound devices.\n\nIt is recommended to say 'YES' here." 18 70 && HWDETECT="yes"
|
||||||
if [ "$HWDETECT" = "yes" ]; then
|
if [ "$HWDETECT" = "yes" ]; then
|
||||||
[ "$(vmware-detect)" ] && HWPARAMETER="$HWPARAMETER --vmware"
|
[ "$(vmware-detect)" ] && HWPARAMETER="$HWPARAMETER --vmware"
|
||||||
[ "$(grep -qw ide-legacy /proc/cmdline)" ] && HWPARAMETER="$HWPARAMETER --ide-legacy"
|
[ "$(grep -w ide-legacy /proc/cmdline)" ] && HWPARAMETER="$HWPARAMETER --ide-legacy"
|
||||||
! [ "$(grep '^KEYMAP="us"' $DESTDIR/etc/rc.conf)" ] && HWPARAMETER="$HWPARAMETER --keymap"
|
! [ "$(grep '^KEYMAP="us"' $DESTDIR/etc/rc.conf)" ] && HWPARAMETER="$HWPARAMETER --keymap"
|
||||||
[ "$(cat /proc/modules | grep hid)" ] && HWPARAMETER="$HWPARAMETER --usbinput"
|
[ "$(cat /proc/modules | grep hid)" ] && HWPARAMETER="$HWPARAMETER --usbinput"
|
||||||
if [ "$(cat /proc/modules | grep usb_storage)" ]; then
|
if [ "$(cat /proc/modules | grep usb_storage)" ]; then
|
||||||
|
|
Loading…
Reference in a new issue