February 2011 - Arch-releng - lists.archlinux.org

[arch-releng] [PATCH] Rewrite of finddisks and findblockdevices. Rename findblockdevices to find_usable_devices
by pyther＠pyther.net 02 Mar '11

02 Mar '11

find_usable_devs returns a list of partitioned and non-partitioned block devices. These devices include SCSI/Sata, CCISS, IDA, LVM, SOFT RAID devices. Devices in LVM and SOFT RAID configurations are excluded from this list. --- src/core/libs/lib-blockdevices-filesystems.sh | 165 +++++++++++++------------ src/core/libs/lib-ui-interactive.sh | 4 +- 2 files changed, 88 insertions(+), 81 deletions(-) diff --git a/src/core/libs/lib-blockdevices-filesystems.sh b/src/core/libs/lib-blockdevices-filesystems.sh index ac749a3..c74b938 100644 --- a/src/core/libs/lib-blockdevices-filesystems.sh +++ b/src/core/libs/lib-blockdevices-filesystems.sh @@ -206,99 +206,106 @@ getlabel() { # find partitionable blockdevices # $1 extra things to echo for each device (optional) (backslash escapes will get interpreted) finddisks() { - workdir="$PWD" - if cd /sys/block 2>/dev/null - then - # ide devices - for dev in $(ls | egrep '^hd') - do - if [ "$(cat $dev/device/media)" = "disk" ] - then - echo -ne "/dev/$dev $1" - fi - done - #scsi/sata devices, and virtio blockdevices (/dev/vd*) - for dev in $(ls | egrep '^[sv]d') - do - # TODO: what is the significance of 5? ASKDEV - if [ "$(cat $dev/device/type)" != "5" ] - then - echo -ne "/dev/$dev $1" + shopt -s nullglob + + # Block Devices + for dev in /sys/block/*; do + if [[ -f $dev/device/type ]]; then + local type + read type < /sys/block/${dev##*/}/device/type + # Block Devices with size =< 0 may be an empty card reader + read size < /sys/block/${dev##*/}/size + # Type 5 is a ROM Device - Optical Drives + if [[ $type != 5 ]] && (( $size > 0 )); then + source "$dev/uevent" + echo -ne "/dev/$DEVNAME $1" + unset DEVNAME fi - done - fi + fi + done + # cciss controllers - if cd /dev/cciss 2>/dev/null - then - for dev in $(ls | egrep -v 'p') - do - echo -ne "/dev/cciss/$dev $1" - done - fi - # Smart 2 controllers - if cd /dev/ida 2>/dev/null - then - for dev in $(ls | egrep -v 'p') - do - echo -ne "/dev/ida/$dev $1" - done - fi - cd "$workdir" + for dev in /dev/cciss/*; do + if [[ $dev != *[[:digit:]]p[[:digit:]]* ]]; then + echo "$dev $1" + fi + done + + # Smart 2 Controller + for dev in /dev/ida/*; do + if [[ $dev != *[[:digit:]]p[[:digit:]]* ]]; then + echo "$dev $1" + fi + done + + shopt -u nullglob } -# find block devices, both partionable or not (i.e. partitions themselves) + +# find usable devices, both partionable or not (i.e. partitions themselves) # $1 extra things to echo for each partition (optional) (backslash escapes will get interpreted) -findblockdevices() { - workdir="$PWD" - for devpath in $(finddisks) - do - disk=$(basename $devpath) - echo -ne "/dev/$disk $1" - cd /sys/block/$disk - shopt -s nullglob - for part in $disk* - do - # check if not already assembled to a raid device. TODO: what is the significance of the 5? ASKDEV - if [ -n "$part" ] && ! grep -q $part /proc/mdstat 2>/dev/null && ! fstype 2>/dev/null </dev/$part | grep -q lvm2 && ! sfdisk -c /dev/$disk $(echo $part | sed -e "s#$disk##g") 2>/dev/null | grep -q '5' - then - if [ -d $part ] - then - echo -ne "/dev/$part $1" - fi +find_usable_blockdevices() { + shopt -s nullglob + + local parts + + # Cycle through all root block devices (sda, sdb, etc...) + # Look for partitions and include them only if they are not part of a + # RAID or LVM configuration. Also, exclude extended partitions + for devpath in $(finddisks); do + hidebldev= + unset parts + + # Glob allows for following matches: + # /dev/sda -> /dev/sda1 + # /dev/cciss/c0d1 -> /dev/cciss/c0d1p1 + for dev in ${devpath}*[[:digit:]]*; do + local disk="${dev%%[[:digit:]]*}" + local partnum="${dev##*[[:alpha:]]}" + + # Don't display extened partition (not logical parts) + [ "$(sfdisk -c "$disk" "$partnum" 2>/dev/null)" = 5 ] && continue; + + # Don't list parts that are part of RAID or LVM volumes + # Although we strongly encourage users to setup LVM in AIF, we want to make + # life a bit easier for those who have setup LVM/softraid before running AIF + if grep -qsw "${dev##*/}" /proc/mdstat || { pvscan -s 2>/dev/null | grep -q "$dev"; }; then + hidebldev="True" + else + parts+=("$dev") fi done - shopt -u nullglob + + # If hidebldev is not set and we have no partitions then + # Echo root block device if root block device is not part of a LVM or RAID configuration + # Otherwise echo the partitions + if [[ -z $hidebldev ]] && (( ! ${#parts[@]} )); then + if ! grep -qsw "${devpath##*/}" /proc/mdstat && ! pvscan -s 2>/dev/null | grep -q "$devpath"; then + echo -ne "$devpath $1" + fi + elif (( ${#parts[@]} )); then + for part in ${parts[@]}; do + echo -ne "$part $1" + done + fi done + # mapped devices - for devpath in $(ls /dev/mapper 2>/dev/null | grep -v control) - do - echo -ne "/dev/mapper/$devpath $1" + for devpath in /dev/mapper/*; do + # Exclude /control directory and other non-block files + if [[ -b $devpath ]]; then + echo -ne "$devpath $1" + fi done + # raid md devices - for devpath in $(ls -d /dev/md* | grep '[0-9]' 2>/dev/null) - do - if grep -qw $(echo $devpath /proc/mdstat | sed -e 's|/dev/||g') - then + for devpath in /dev/md[0-9]*; do + if grep -qw "${devpath//\/dev\//}" /proc/mdstat; then echo -ne "$devpath $1" fi done - # cciss controllers - if cd /dev/cciss 2>/dev/null - then - for dev in $(ls | egrep 'p') - do - echo -ne "/dev/cciss/$dev $1" - done - fi - # Smart 2 controllers - if cd /dev/ida 2>/dev/null - then - for dev in $(ls | egrep 'p') - do - echo -ne "/dev/ida/$dev $1" - done - fi - cd "$workdir" + + shopt -u nullglob } diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh index b244a6e..64be570 100644 --- a/src/core/libs/lib-ui-interactive.sh +++ b/src/core/libs/lib-ui-interactive.sh @@ -557,7 +557,7 @@ interactive_filesystems() { if [ ! -f $TMP_BLOCKDEVICES ] || ! ask_yesno "Previous blockdevice definitions found:\n`cat $TMP_BLOCKDEVICES`\n\ Use these as a starting point? Make sure your disk(s) are partitioned correctly so your definitions can be applied. Pick 'no' when in doubt to start from scratch" no then - findblockdevices 'raw no_label no_fs\n' > $TMP_BLOCKDEVICES + find_usable_blockdevices 'raw no_label no_fs\n' > $TMP_BLOCKDEVICES fi [ -z "$PART_ACCESS" ] && PART_ACCESS=dev @@ -885,7 +885,7 @@ interactive_grub() { # Create and edit the grub menu.lst interactive_grub_menulst - DEVS="$(findblockdevices '_ ')" + DEVS="$(find_usable_blockdevices '_ ')" if [ "$DEVS" = " " ]; then notify "No hard drives were found" return 1 -- 1.7.4.1

3 10

[arch-releng] [PATCH 1/3] Rename interactive_grub_menulst to interactive_bootloader_menu
by pyther＠pyther.net 02 Mar '11

02 Mar '11

Update function to be flexible with the use of multiple bootloaders --- src/core/libs/lib-ui-interactive.sh | 26 ++++++++++++++++---------- 1 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh index b244a6e..062c420 100644 --- a/src/core/libs/lib-ui-interactive.sh +++ b/src/core/libs/lib-ui-interactive.sh @@ -883,7 +883,7 @@ interactive_grub() { fi fi # Create and edit the grub menu.lst - interactive_grub_menulst + interactive_bootloader_menu "grub" $grubmenu DEVS="$(findblockdevices '_ ')" if [ "$DEVS" = " " ]; then @@ -1070,15 +1070,6 @@ initrd $subdir/kernel26-fallback.img EOF } -interactive_grub_menulst () { - generate_grub_menulst - local helptext= - grep -q '^/dev/mapper' $TMP_FSTAB && helptext=" /dev/mapper/ users: Pay attention to the kernel line!" - notify "Before installing GRUB, you must review the configuration file. You will now be put into the editor. After you save your changes and exit the editor, you can install GRUB.$helptext" - seteditor || return 1 - $EDITOR $grubmenu -} - interactive_grub_install () { debug FS "interactive_grub_install called. P1 = $1, P2 = $2, P3 = $3" # $1 = bootpart @@ -1120,6 +1111,21 @@ EOF fi } +# $1 - Bootloader Name +# $2 - Bootloader Configuration Files +interactive_bootloader_menu() { + if [[ $1 = grub ]]; then + generate_grub_menulst + fi + + grep -q '^/dev/mapper' $TMP_FSTAB && local helptext=" /dev/mapper/ users: Pay attention to the kernel line!" + notify "Before installing $1, you must review the configuration file. You will now be put into the editor. After you save your changes and exit the editor, you can install $1.$helptext" + + seteditor || return 1 + + $EDITOR $2 +} + get_kernel_parameters() { get_device_with_mount '/' || return 1 local rootpart="$ANSWER_DEVICE" -- 1.7.4.1

3 6

[arch-releng] [PATCH] Adding function for automated script start up at boot
by Charles Vejnar 01 Mar '11

01 Mar '11

--- .../overlay/etc/functions.d/automated_script | 26 +++++++++++ configs/syslinux-iso/overlay/etc/inittab | 45 ++++++++++++++++++++ configs/syslinux-iso/overlay/usr/bin/autologin | 2 + 3 files changed, 73 insertions(+), 0 deletions(-) create mode 100644 configs/syslinux-iso/overlay/etc/functions.d/automated_script create mode 100644 configs/syslinux-iso/overlay/etc/inittab create mode 100755 configs/syslinux-iso/overlay/usr/bin/autologin diff --git a/configs/syslinux-iso/overlay/etc/functions.d/automated_script b/configs/syslinux-iso/overlay/etc/functions.d/automated_script new file mode 100644 index 0000000..5ada69e --- /dev/null +++ b/configs/syslinux-iso/overlay/etc/functions.d/automated_script @@ -0,0 +1,26 @@ +. /etc/archiso/functions + +automated_script () +{ + script="$(cmdline_param script)" + if [ -n $script ] ; then + stat_busy "Configuring $script" + if [[ $script =~ ^http:// || $script =~ ^ftp:// ]] ; then + wget "$script" -q -O /tmp/startup_script >/dev/null + rt=$? + else + cp $script /tmp/startup_script + rt=$? + fi + if [ $rt -eq 0 ] ; then + chmod +x /tmp/startup_script + echo -e "\nif [ \`tty\` = \"/dev/tty1\" ] ; then\n /tmp/startup_script\nfi\n" >> /root/.bash_profile + stat_done + else + stat_fail + fi + fi +} + +add_hook multi_end automated_script + diff --git a/configs/syslinux-iso/overlay/etc/inittab b/configs/syslinux-iso/overlay/etc/inittab new file mode 100644 index 0000000..aff6d72 --- /dev/null +++ b/configs/syslinux-iso/overlay/etc/inittab @@ -0,0 +1,45 @@ +# +# /etc/inittab +# + +# Runlevels: +# 0 Halt +# 1(S) Single-user +# 2 Not used +# 3 Multi-user +# 4 Not used +# 5 X11 +# 6 Reboot + +## Only one of the following two lines can be uncommented! +# Boot to console +id:3:initdefault: +# Boot to X11 +#id:5:initdefault: + +rc::sysinit:/etc/rc.sysinit +rs:S1:wait:/etc/rc.single +rm:2345:wait:/etc/rc.multi +rh:06:wait:/etc/rc.shutdown +su:S:wait:/sbin/sulogin -p + +# -8 options fixes umlauts problem on login +c1:2345:respawn:/sbin/agetty -n -l /usr/bin/autologin -8 38400 tty1 linux +c2:2345:respawn:/sbin/agetty -8 38400 tty2 linux +c3:2345:respawn:/sbin/agetty -8 38400 tty3 linux +c4:2345:respawn:/sbin/agetty -8 38400 tty4 linux +c5:2345:respawn:/sbin/agetty -8 38400 tty5 linux +c6:2345:respawn:/sbin/agetty -8 38400 tty6 linux + +# Hypervisor Virtual Console for Xen and KVM +#h0:2345:respawn:/sbin/agetty -8 38400 hvc0 linux + +ca::ctrlaltdel:/sbin/shutdown -t3 -r now + +# Example lines for starting a login manager +x:5:respawn:/usr/bin/xdm -nodaemon +#x:5:respawn:/usr/sbin/gdm -nodaemon +#x:5:respawn:/usr/bin/kdm -nodaemon +#x:5:respawn:/usr/bin/slim >/dev/null 2>&1 + +# End of file diff --git a/configs/syslinux-iso/overlay/usr/bin/autologin b/configs/syslinux-iso/overlay/usr/bin/autologin new file mode 100755 index 0000000..c124f9e --- /dev/null +++ b/configs/syslinux-iso/overlay/usr/bin/autologin @@ -0,0 +1,2 @@ +#!/bin/bash +/bin/login -f root -- 1.7.4

2 3

[arch-releng] [PATCH] syslinux*.cfg: Use INITRD statement instead of initrd= on the APPEND line.
by Thomas Bächler 28 Feb '11

28 Feb '11

This newer format improves configuration file readability. --- archiso2dual/syslinux_arch32.cfg | 3 ++- archiso2dual/syslinux_arch64.cfg | 3 ++- .../syslinux-iso/boot-files/syslinux/syslinux.cfg | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/archiso2dual/syslinux_arch32.cfg b/archiso2dual/syslinux_arch32.cfg index f912874..ad3c1b4 100644 --- a/archiso2dual/syslinux_arch32.cfg +++ b/archiso2dual/syslinux_arch32.cfg @@ -5,6 +5,7 @@ perform system maintenance. ENDTEXT MENU LABEL Boot Arch Linux (i686) LINUX /%INSTALL_DIR%/boot/i686/vmlinuz26 -APPEND initrd=/%INSTALL_DIR%/boot/i686/archiso.img archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% rw_branch_size=75% locale=en_US.UTF-8 +APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% rw_branch_size=75% locale=en_US.UTF-8 +INITRD /%INSTALL_DIR%/boot/i686/archiso.img # Next line should be uncommented when prepare enviroment to boot from PXE. #IPAPPEND 3 diff --git a/archiso2dual/syslinux_arch64.cfg b/archiso2dual/syslinux_arch64.cfg index 10786cd..5aa6f99 100644 --- a/archiso2dual/syslinux_arch64.cfg +++ b/archiso2dual/syslinux_arch64.cfg @@ -5,6 +5,7 @@ perform system maintenance. ENDTEXT MENU LABEL Boot Arch Linux (x86_64) LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz26 -APPEND initrd=/%INSTALL_DIR%/boot/x86_64/archiso.img archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% rw_branch_size=75% locale=en_US.UTF-8 +APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% rw_branch_size=75% locale=en_US.UTF-8 +INITRD /%INSTALL_DIR%/boot/x86_64/archiso.img # Next line should be uncommented when prepare enviroment to boot from PXE. #IPAPPEND 3 diff --git a/configs/syslinux-iso/boot-files/syslinux/syslinux.cfg b/configs/syslinux-iso/boot-files/syslinux/syslinux.cfg index 9b25021..02c1b3d 100644 --- a/configs/syslinux-iso/boot-files/syslinux/syslinux.cfg +++ b/configs/syslinux-iso/boot-files/syslinux/syslinux.cfg @@ -38,7 +38,8 @@ perform system maintenance. ENDTEXT MENU LABEL Boot Arch Linux LINUX /%INSTALL_DIR%/boot/%ARCH%/vmlinuz26 -APPEND initrd=/%INSTALL_DIR%/boot/%ARCH%/archiso.img archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% rw_branch_size=75% locale=en_US.UTF-8 +APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% rw_branch_size=75% locale=en_US.UTF-8 +INITRD /%INSTALL_DIR%/boot/%ARCH%/archiso.img # Next line should be uncommented when prepare enviroment to boot from PXE. #IPAPPEND 3 -- 1.7.4.1

2 1

[arch-releng] Syslinux Patches - Review 2
by pyther＠pyther.net 27 Feb '11

27 Feb '11

Well this is round 2... TODO: * Update documentation accordingly Notable Changes: * Switch order of patches 3 and 2 around. * Changed location of syslinux-install_update to reflect new location in syslinux package (/usr/sbin/syslinux-install_update) * Removed check to see if syslinux is installed There is a signoff for syslinux 4.03-3 pending atm.

3 8

[arch-releng] Syslinux Patches - Review
by pyther＠pyther.net 22 Feb '11

22 Feb '11

Here are the Syslinux patches that I have been working on for the last month or so. TODO: * Update Documentation accordingly The syslinux installation process relies on a script I wrote, syslinux-install_update, which will be included in the Syslinux arch package. Thomas is going to try to push a new syslinux package, with the script, to testing in the coming days. If there are no problems the package, then it will be moved to core. # Patch 3 - Prompt user to pick a bootloader in interactive_select_packages As per my discussion with Dieter, we now ask the user what bootloader they want to use during package selection. We then select the appropriate package for installation. The bootloader that the user picked gets stored in a variable (bootloader) and referenced at "Install Bootloader" where it triggers either interactive_grub or interactive_syslinux. Without this new functionality, if the user did not manually select a bootloader in "Select Packages" they would have to go back, select a bootloader, reinstall the packages, etc...

4 12

[arch-releng] [PATCH] Reworte finddisks and findblockdevices. Renamed findblockdevices to find_usable_devs
by pyther＠pyther.net 21 Feb '11

21 Feb '11

find_usable_devs will looks for both partitioned and non-partitioned block devices. The blockdevice will be excluded from the list if it is an extended partition (not logical) or part of a LVM or RAID configuration. --- src/core/libs/lib-blockdevices-filesystems.sh | 150 +++++++++++++------------ src/core/libs/lib-ui-interactive.sh | 4 +- 2 files changed, 80 insertions(+), 74 deletions(-) diff --git a/src/core/libs/lib-blockdevices-filesystems.sh b/src/core/libs/lib-blockdevices-filesystems.sh index ac749a3..1b10927 100644 --- a/src/core/libs/lib-blockdevices-filesystems.sh +++ b/src/core/libs/lib-blockdevices-filesystems.sh @@ -206,99 +206,105 @@ getlabel() { # find partitionable blockdevices # $1 extra things to echo for each device (optional) (backslash escapes will get interpreted) finddisks() { - workdir="$PWD" - if cd /sys/block 2>/dev/null - then - # ide devices - for dev in $(ls | egrep '^hd') - do - if [ "$(cat $dev/device/media)" = "disk" ] - then - echo -ne "/dev/$dev $1" - fi - done - #scsi/sata devices, and virtio blockdevices (/dev/vd*) - for dev in $(ls | egrep '^[sv]d') - do - # TODO: what is the significance of 5? ASKDEV - if [ "$(cat $dev/device/type)" != "5" ] - then - echo -ne "/dev/$dev $1" + shopt -s nullglob + + # Block Devices + if [[ -d /sys/block ]]; then + for dev in /sys/block/*; do + if [[ -f $dev/device/type ]]; then + local type + read type < /sys/block/${dev##*/}/device/type + read size < /sys/block/${dev##*/}/size + # Type 5 is a ROM Device + if [[ $type != 5 ]] && (( $size > 0 )); then + source "$dev/uevent" + echo -ne "/dev/$DEVNAME $1" + unset DEVNAME + fi fi done fi + # cciss controllers - if cd /dev/cciss 2>/dev/null - then - for dev in $(ls | egrep -v 'p') - do - echo -ne "/dev/cciss/$dev $1" + if [[ -d /dev/cciss ]]; then + for dev in /dev/cciss/*; do + if [[ $dev != *[[:digit:]]p[[:digit:]]* ]]; then + echo "$dev $1" + fi done fi - # Smart 2 controllers - if cd /dev/ida 2>/dev/null - then - for dev in $(ls | egrep -v 'p') - do - echo -ne "/dev/ida/$dev $1" + # Smart 2 Controller + if [[ -d /dev/ida ]]; then + for dev in /dev/ida/*; do + if [[ $dev != *[[:digit:]]p[[:digit:]]* ]]; then + echo "$dev $1" + fi done fi - cd "$workdir" + shopt -u nullglob } + # find block devices, both partionable or not (i.e. partitions themselves) # $1 extra things to echo for each partition (optional) (backslash escapes will get interpreted) -findblockdevices() { - workdir="$PWD" - for devpath in $(finddisks) - do - disk=$(basename $devpath) - echo -ne "/dev/$disk $1" - cd /sys/block/$disk - shopt -s nullglob - for part in $disk* - do - # check if not already assembled to a raid device. TODO: what is the significance of the 5? ASKDEV - if [ -n "$part" ] && ! grep -q $part /proc/mdstat 2>/dev/null && ! fstype 2>/dev/null </dev/$part | grep -q lvm2 && ! sfdisk -c /dev/$disk $(echo $part | sed -e "s#$disk##g") 2>/dev/null | grep -q '5' - then - if [ -d $part ] - then - echo -ne "/dev/$part $1" - fi +# find usable block devices +find_usable_bdevs() { + shopt -s nullglob + + local parts + + # Cycle through all non-partitional block devices (sda, sdb, etc...) + # Look for partitions and include them only if they are not part of a + # RAID or LVM. Also, exclude the extended partition + for devpath in $(finddisks); do + hidebldev= + unset parts + + # Glob allows for following matches: + # /dev/sda -> /dev/sda1 + # /dev/cciss/c0d1 -> /dev/cciss/c0d1p1 + for dev in ${devpath}*[[:digit:]]*; do + local disk="${dev%%[[:digit:]]*}" + local partnum="${dev##*[[:alpha:]]}" + + # Don't display extened partition (not logical parts) + sfdisk -c "$disk" "$partnum" 2>/dev/null | grep -q '5' && continue; + + # Don't list parts that are part of RAID or LVM volumes + if grep -qsw "${dev##*/}" /proc/mdstat || { pvscan -s 2>/dev/null | grep -q "$dev"; }; then + hidebldev="True" + else + parts+=("$dev") fi done - shopt -u nullglob + + # If we have no partitions then print the root of the block device + # Otherwise print the partitions + if [[ -z $hidebldev ]] && (( ${#parts[@]} < 1 )); then + echo -ne "$devpath $1" + elif (( ${#parts[@]} )); then + for part in ${parts[@]}; do + echo -ne "$part $1" + done + fi done + # mapped devices - for devpath in $(ls /dev/mapper 2>/dev/null | grep -v control) - do - echo -ne "/dev/mapper/$devpath $1" + for devpath in /dev/mapper/*; do + # Exclude /control directory and other non-block files + if [[ -b $devpath ]]; then + echo -ne "$devpath $1" + fi done + # raid md devices - for devpath in $(ls -d /dev/md* | grep '[0-9]' 2>/dev/null) - do - if grep -qw $(echo $devpath /proc/mdstat | sed -e 's|/dev/||g') - then + for devpath in /dev/md[0-9]*; do + if grep -qw "${devpath//\/dev\//}" /proc/mdstat; then echo -ne "$devpath $1" fi done - # cciss controllers - if cd /dev/cciss 2>/dev/null - then - for dev in $(ls | egrep 'p') - do - echo -ne "/dev/cciss/$dev $1" - done - fi - # Smart 2 controllers - if cd /dev/ida 2>/dev/null - then - for dev in $(ls | egrep 'p') - do - echo -ne "/dev/ida/$dev $1" - done - fi - cd "$workdir" + + shopt -u nullglob } diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh index b244a6e..bf19ef2 100644 --- a/src/core/libs/lib-ui-interactive.sh +++ b/src/core/libs/lib-ui-interactive.sh @@ -557,7 +557,7 @@ interactive_filesystems() { if [ ! -f $TMP_BLOCKDEVICES ] || ! ask_yesno "Previous blockdevice definitions found:\n`cat $TMP_BLOCKDEVICES`\n\ Use these as a starting point? Make sure your disk(s) are partitioned correctly so your definitions can be applied. Pick 'no' when in doubt to start from scratch" no then - findblockdevices 'raw no_label no_fs\n' > $TMP_BLOCKDEVICES + find_usable_bdevs 'raw no_label no_fs\n' > $TMP_BLOCKDEVICES fi [ -z "$PART_ACCESS" ] && PART_ACCESS=dev @@ -885,7 +885,7 @@ interactive_grub() { # Create and edit the grub menu.lst interactive_grub_menulst - DEVS="$(findblockdevices '_ ')" + DEVS="$(find_usable_bdevs '_ ')" if [ "$DEVS" = " " ]; then notify "No hard drives were found" return 1 -- 1.7.4.1

3 3

Re: [arch-releng] aif... syslinux
by Dieter Plaetinck 13 Feb '11

13 Feb '11

On Fri, 11 Feb 2011 23:55:31 -0500 Matthew Gyurgyik <pyther(a)pyther.net> wrote: > Hi Dieter, > > https://github.com/pyther/aif/compare/master...syslinux-final > > Would you be able to look over that code. I still have to test it and > probably fix up a few things. Figure you could at least let me know how > it looks and what suggestions you have. > > Matthew I see syslinux is still in extra. - what did you discuss with the package maintainer? will it go to core? I don't see much response on https://bugs.archlinux.org/task/22234 - does the package come with all your requirements, like the script you wrote, etc? - how will you make sure the user installs the right package? give him a hint during package selection? Right now, grub is in base, I think it should go out of base, as long as we have a clear message "be sure to select the bootloader you want: one of grub, syslinux" In fact, if you've ever have seen the list of warnings/errors after manually configuring filesystems, I would do the same for package selection. For example we would make a rule that one (and not more) of grub/syslinux must be enabled during package selection, if that's not correct, we present the user the warning, strongly recommend him to go back and correct his mistake (optionally let him continue, maybe he really knows what he's doing) Then, in the "install bootloader" we can just do a pacman query to see which bootloader the user installed. If we don't get one of grub/syslinux we give the user a warning "you have no bootloader installed, so make sure you do the right thing" we shoud also mention that syslinux does not support all filesystems, and when user selects an FS for /boot or / that doesn't work with syslinux, we should warn him. (same thing for grub actually) grubmenu="/boot/grub/menu.lst" # be sure to override this if you have it somewhere else +syslinuxmenu="/boot/syslinux/syslinux.cfg" we should put a "you can override the following vars" that applies to both variables. + "Syslinux" "Use the Syslinux bootloader (ext2/3/4, btrfs, and vfat)" \ you can just use @{syslinux_supported_fs[@]} there +interactive_bootloader_menu() { + # $1 - Bootloader Name + # $2 - Bootloader Configuration Files why use capital letters for its arguments? there's also a bunch of not very useful empty lines there. + if ! "$var_TARGET_DIR/usr/lib/syslinux/syslinux-install_update" -i -c /mnt; then you should make sure the user can see the output of this command something like: >$LOG 2>&1 some install_syslinux_mbr calls have no || return 1. in interactive_install_bootloader you should check the return code of interactive_grub / interactive_syslinux and show the user a warning when it failed. then we can probably remove the GRUB_OK variables also. get_kernel_parameters should get an '|| return 1' same thing for generate_syslinux_menu and generate_grub_menulst in interactive_bootloader_menu() other then this, I think it looks ok ;) Dieter

3 2

[arch-releng] [PATCH 1/2] Make helptext variables local
by pyther＠pyther.net 11 Feb '11

11 Feb '11

--- src/core/libs/lib-ui-interactive.sh | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh index 45d3282..6ec6a06 100644 --- a/src/core/libs/lib-ui-interactive.sh +++ b/src/core/libs/lib-ui-interactive.sh @@ -57,6 +57,7 @@ interactive_configure_system() fi local default=no + local helptext while true; do helptext="\nNote that if you want to change any file not listed here (unlikely) you can go to another tty and update ${var_TARGET_DIR}/etc/<filename> yourself" grep -q '^/dev/mapper' $TMP_FSTAB && helptext="$helptext\n/dev/mapper/ users: Pay attention to HOOKS in mkinitcpio.conf" @@ -1075,7 +1076,7 @@ EOF interactive_grub_menulst () { generate_grub_menulst - helptext= + local helptext= grep -q '^/dev/mapper' $TMP_FSTAB && helptext=" /dev/mapper/ users: Pay attention to the kernel line!" notify "Before installing GRUB, you must review the configuration file. You will now be put into the editor. After you save your changes and exit the editor, you can install GRUB.$helptext" seteditor || return 1 -- 1.7.4

2 2

[arch-releng] [PATCH 1/3] Rename interactive_grub_menulst to interactive_bootloader_menu
by pyther＠pyther.net 09 Feb '11

09 Feb '11

In addition to the rename, the function was updated to be flexible with the use of multiple bootloaders. --- src/core/libs/lib-ui-interactive.sh | 25 +++++++++++++++++-------- 1 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh index 45d3282..a2d5759 100644 --- a/src/core/libs/lib-ui-interactive.sh +++ b/src/core/libs/lib-ui-interactive.sh @@ -886,7 +886,7 @@ interactive_grub() { fi fi # Create and edit the grub menu.lst - interactive_grub_menulst + interactive_bootloader_menu "GRUB" $grubmenu DEVS="$(findblockdevices '_ ')" if [ "$DEVS" = " " ]; then @@ -1073,13 +1073,22 @@ initrd $subdir/kernel26-fallback.img EOF } -interactive_grub_menulst () { - generate_grub_menulst - helptext= - grep -q '^/dev/mapper' $TMP_FSTAB && helptext=" /dev/mapper/ users: Pay attention to the kernel line!" - notify "Before installing GRUB, you must review the configuration file. You will now be put into the editor. After you save your changes and exit the editor, you can install GRUB.$helptext" - seteditor || return 1 - $EDITOR $grubmenu +interactive_bootloader_menu() { + # $1 - Bootloader Name + # $2 - Bootloader Configuration Files + + if [[ $1 = GRUB ]]; then + generate_grub_menulst + fi + + grep -q '^/dev/mapper' $TMP_FSTAB && local helptext=" /dev/mapper/ users: Pay attention to the kernel line!" + notify "Before installing $1, you must review the configuration file. You will now be put into the editor. After you save your changes and exit the editor, you can install $1.$helptext" + + if [[ -z $EDITOR ]]; then + seteditor || return 1 + fi + + $EDITOR $2 } interactive_grub_install () { -- 1.7.4

4 7