root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-19 19:40:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

'fixed findpartitions'

Browse source
This commit is contained in:
Tobias Powalowski 2009-01-01 20:50:48 +01:00
parent 9fa6e1f3f4
commit ba22993973
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
usr/share/archboot/installer/setup
View file

@ -138,14 +138,14 @@ finddisks() {
block=/sys/block block=/sys/block
# ide devices # ide devices
for dev in $(ls $block | egrep '^hd'); do for dev in $(ls $block | egrep '^hd'); do
if [ "$(cat $dev/device/media)" = "disk" ]; then if [ "$(cat $block/$dev/device/media)" = "disk" ]; then
echo "/dev/$dev" echo "/dev/$dev"
[ "$1" ] && echo $1 [ "$1" ] && echo $1
fi fi
done done
#scsi/sata devices #scsi/sata devices
for dev in $(ls $block | egrep '^sd'); do for dev in $(ls $block | egrep '^sd'); do
if ! [ "$(cat $dev/device/type)" = "5" ]; then if ! [ "$(cat $block/$dev/device/type)" = "5" ]; then
echo "/dev/$dev" echo "/dev/$dev"
[ "$1" ] && echo $1 [ "$1" ] && echo $1
fi fi
@ -184,10 +184,10 @@ findpartitions() {
block=/sys/block block=/sys/block
for devpath in $(finddisks); do for devpath in $(finddisks); do
disk=$(echo $devpath | sed 's|.*/||') disk=$(echo $devpath | sed 's|.*/||')
for part in $(ls $block/$disk*); do for part in $(ls $block/$disk | egrep ^$disk); do
# check if not already assembled to a raid device # check if not already assembled to a raid device
if ! [ "$(cat /proc/mdstat 2>/dev/null | grep $part)" -o "$(fstype 2>/dev/null </dev/$part | grep "lvm2")" -o "$(sfdisk -c /dev/$disk $(echo $part | sed -e "s#$disk##g") 2>/dev/null | grep "5")" ]; then if ! [ "$(cat /proc/mdstat 2>/dev/null | grep $part)" -o "$(fstype 2>/dev/null </dev/$part | grep "lvm2")" -o "$(sfdisk -c /dev/$disk $(echo $part | sed -e "s#$disk##g") 2>/dev/null | grep "5")" ]; then
if [ -d $part ]; then if [ -d $block/$disk/$part ]; then
echo "/dev/$part" echo "/dev/$part"
[ "$1" ] && echo $1 [ "$1" ] && echo $1
fi fi
@ -1530,7 +1530,7 @@ do_pacmanmirror()
sed -i -e 's/^Server/#Server/g' "$mirrorlist" sed -i -e 's/^Server/#Server/g' "$mirrorlist"
# add our new entry at the end of the file # add our new entry at the end of the file
echo "# Setup-configured entry" >> "$mirrorlist" echo "# Setup-configured entry" >> "$mirrorlist"
echo Server = $(egrep -o "$PAC_SYNC_SERVER.*" "$mirrorlist") >> "$mirrorlist" echo "Server = $PAC_SYNC_SERVER" >> "$mirrorlist"
} }
auto_hwdetect() auto_hwdetect()
@ -1658,7 +1658,7 @@ configure_system()
else else
DEFAULT="" DEFAULT=""
fi fi
DIALOG $DEFAULT --menu "Configuration" 19 80 16 \ DIALOG $DEFAULT --menu "Configuration" 20 80 16 \
"/etc/rc.conf" "System Config" \ "/etc/rc.conf" "System Config" \
"/etc/fstab" "Filesystem Mountpoints" \ "/etc/fstab" "Filesystem Mountpoints" \
"/etc/mkinitcpio.conf" "Initramfs Config" \ "/etc/mkinitcpio.conf" "Initramfs Config" \
@ -1715,7 +1715,7 @@ configure_system()
# /etc/locale.gen # /etc/locale.gen
# #
chroot ${DESTDIR} locale-gen chroot ${DESTDIR} locale-gen > /dev/null 2>&1
## END POSTPROCESSING ## ## END POSTPROCESSING ##