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

[arch-releng] [PATCH] Fix code so bootloader package is selected for install
by pyther＠pyther.net 13 Mar '11

13 Mar '11

--- src/core/libs/lib-ui-interactive.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh index 563dc2b..38a626e 100644 --- a/src/core/libs/lib-ui-interactive.sh +++ b/src/core/libs/lib-ui-interactive.sh @@ -756,7 +756,7 @@ If any previous configuration you've done until now (like fancy filesystems) req # build the list of options, sorted primarily by group, then by packagename (this is already). marking where appropriate local pkglist=() - needed_pkgs=("${needed_pkgs_fs[@]}") + needed_pkgs+=("${needed_pkgs_fs[@]}") while read pkgname pkgver pkggroup pkgdesc; do mark=OFF if check_is_in "$pkggroup" "${grouplist[@]}" || check_is_in $pkgname "${needed_pkgs[@]}"; then -- 1.7.4.1

4 6

[arch-releng] Default Bootloader for AIF
by Matthew Gyurgyik 13 Mar '11

13 Mar '11

Arch Devs, In November Pierre wrote a mail to arch-dev-public about bootloaders in core. http://mailman.archlinux.org/pipermail/arch-dev-public/2010-November/018445… Pierre wrote: > Summing up my suggestion for some time in the future would be: > * move extlinux/syslinux to core/base > * move grub1 to extra/multilib and remove it from base group > * keep grub2 in extra > * maybe also move lilo to extra > * of course keep all of them on the install cd Now that there is Syslinux support in AIF, should AIF select Syslinux as the "Default" bootloader? Users are asked to select which bootloader package they would like to install. They can either pick from Grub or Syslinux. Since Grub is listed first it is selected as the "Default". ~pyther

2 1

[arch-releng] [PATCH 1/2] Update Documentation to reflect new bootloader installation method
by pyther＠pyther.net 13 Mar '11

13 Mar '11

--- doc/official_installation_guide_en | 43 ++++++++++++++++++----------------- 1 files changed, 22 insertions(+), 21 deletions(-) diff --git a/doc/official_installation_guide_en b/doc/official_installation_guide_en index d73ed8e..653cebe 100644 --- a/doc/official_installation_guide_en +++ b/doc/official_installation_guide_en @@ -460,13 +460,14 @@ hard disk preparations need to be undone. #### Select Packages Select Packages will let you select the packages you wish to install from the -CD, USB or your NET mirror. You have the opportunity to specify whole package -groups from which you'd generally like to install packages, then fine-tune -your coarse selection by (de)selecting individual packages from the groups you -have chosen using the space bar. It is recommended that you install all the -"base" packages, but not anything else at this point. The only exception to -this rule is installing any packages you need for setting up Internet -connectivity. +CD, USB or your NET mirror. First, you are prompted to select a bootloader +package (the bootloader will be configured later on in the "Install Bootloader" +stage). After this, you can select package groups from which you'd generally +like to install packages, then fine-tune your coarse selection by (de)selecting +individual packages from the groups you have chosen using the space bar. It is +recommended that you install all the "base" packages, but not anything else at +this point. The only exception to this rule is installing any packages you need +for setting up Internet connectivity. Once you're done selecting the packages you need, leave the selection screen and continue to the next step. @@ -771,25 +772,25 @@ changes you made in mkinitcpio.conf. #### Install Bootloader -Install Bootloader will install a bootloader on your hard drive, either GRUB -or NONE in case you have a bootloader already installed and want to use that -one instead. If you choose to install GRUB, the setup script will want you to -examine the appropriate configuration file to confirm the proper settings. - +Install Bootloader will install and help you configure the bootloader that you +selected in the "Select Packages" stage. **/boot/grub/menu.lst** +**/boot/syslinux/syslinux.cfg** + +An editor will open, allowing you to edit the appropriate bootloader +configuration file which the installer has pre-populated. You should check and +modify this file, if needed, to accommodate your boot setup. + +Syslinux: +After checking your bootloader configuration for correctness, you'll be asked to +allow the installer to Set the Boot Flag and install the Syslinux MBR. -You should check and modify this file to accommodate your boot setup if you -want to use GRUB, otherwise you will have to modify your existing bootloader's -configuration file. The installer will have pre-populated this file using UUID -entries which you may have to change in the same cases you'd need to change -them in your fstab. +Grub: After checking your bootloader configuration for correctness, you'll be -prompted for a partition to install the loader to. Unless you're using yet -another boot loader, you should install GRUB to the MBR of the installation -disk, which is usually represented by the appropriate device name without a -number suffix. +prompted for a disk to install the loader to. You should install GRUB to the MBR +of the installation disk. #### Exit Install -- 1.7.4.1

2 2

[arch-releng] [PATCH] Update Documentation to reflect new bootloader installation method
by pyther＠pyther.net 13 Mar '11

13 Mar '11

--- doc/official_installation_guide_en | 39 ++++++++++++++++++++--------------- 1 files changed, 22 insertions(+), 17 deletions(-) diff --git a/doc/official_installation_guide_en b/doc/official_installation_guide_en index d73ed8e..69578f2 100644 --- a/doc/official_installation_guide_en +++ b/doc/official_installation_guide_en @@ -180,11 +180,9 @@ Make sure your BIOS is set in a way to allow booting from your CD-ROM or USB device. Reboot your computer with the Arch Linux Installation CD in the drive or the USB stick plugged in the port. Once the installation medium has started -booting you will see the Arch Linux logo and a grub menu waiting for your +booting you will see the Arch Linux logo and an Isolinux menu waiting for your selection. Most likely you can just hit enter at this point. -If Grub hangs, you're one of the unlucky few whose CD-rom drive doesn't work -with grub and you should try the isolinux image. ### Post-boot At the end of the boot procedure, you should be at a login prompt with some @@ -460,7 +458,9 @@ hard disk preparations need to be undone. #### Select Packages Select Packages will let you select the packages you wish to install from the -CD, USB or your NET mirror. You have the opportunity to specify whole package +CD, USB or your NET mirror. First, you are prompted to select a bootloader. Your +choice will install the appropriate bootloader package and will be used for the +"Install Bootloader" stage. You now have the opportunity to specify whole package groups from which you'd generally like to install packages, then fine-tune your coarse selection by (de)selecting individual packages from the groups you have chosen using the space bar. It is recommended that you install all the @@ -771,25 +771,30 @@ changes you made in mkinitcpio.conf. #### Install Bootloader -Install Bootloader will install a bootloader on your hard drive, either GRUB -or NONE in case you have a bootloader already installed and want to use that -one instead. If you choose to install GRUB, the setup script will want you to +Install Bootloader will install the bootloader that you selected in the "Select +Source" stage on your hard drive. If you skipped selecting a bootloader, no +bootloader will be installed. Otherwise, the setup script will want you to examine the appropriate configuration file to confirm the proper settings. - **/boot/grub/menu.lst** +**/boot/syslinux/syslinux.cfg** + +An editor will open, allowing you to edit the appropriate bootloader +configuration file. You should check and modify this file to accommodate your +boot setup. The installer will have pre-populated this file using UUID entries +which you may have to change in the same cases you'd need to change them in your +fstab. + +Syslinux: +After checking your bootloader configuration for correctness, you'll be asked to +allow the installer to Set the Boot Flag and install the Syslinux MBR. -You should check and modify this file to accommodate your boot setup if you -want to use GRUB, otherwise you will have to modify your existing bootloader's -configuration file. The installer will have pre-populated this file using UUID -entries which you may have to change in the same cases you'd need to change -them in your fstab. +Grub: After checking your bootloader configuration for correctness, you'll be -prompted for a partition to install the loader to. Unless you're using yet -another boot loader, you should install GRUB to the MBR of the installation -disk, which is usually represented by the appropriate device name without a -number suffix. +prompted for a disk to install the loader to. You should install GRUB to the MBR +of the installation disk, which is usually represented by the appropriate device +name without a number suffix. #### Exit Install -- 1.7.4.1

3 3

[arch-releng] Couple of problems with the latest 03.09 & 03.05 ISO's
by bill . 10 Mar '11

10 Mar '11

Hello and thanks for your work with the newest ISO's. I really don't know if this is the best place to post about problems with the latest testing releases so excuse me beforehand. I wanted to make a new install on a virtualbox machine and i used the 2011.03.09 iso. Before i am even dropped to a console to start the installation i get the following error ERROR: while mounting root (aufs) filesystem. /bin/sh: can't access tty; job control turned off [ramfs /]# It switches on a ramfs console and i can't continue the installation. I searched the net but couldn't find anything to help me. Let me know if there is a way to provide more info. I used the 2011.03.05 iso and this time it started the installation with no problem. I was able to finish the procedure normally except for the part where it installs the bootloader. I was only given the option to install it on partitions (*/dev/sdX#*) and not on a hard disk itself. (like* /dev/sdX) *As expected I couldn't boot into my new installation and i had to to use the "grub setup" command (from within the installation iso) to install the loader on the mbr. And again, if this isn't the correct place to report problems, please direct me to a better one. Thanks!

2 1

[arch-releng] Trapezium: Install an Archlinux farm
by Charles Vejnar 07 Mar '11

07 Mar '11

Hi, Finally, I had the time to wrap everything together. With the 2 patches I recently submitted, it becomes possible to easily install many servers with Archlinux. See for the Trapezium server and some doc here: http://hg.vejnar.org/trapezium The documentation is minimal so don't hesitate to comment or ask questions. Charles

3 4

[arch-releng] [PATCH] Provide Syslinux as a possible bootloader
by pyther＠pyther.net 06 Mar '11

06 Mar '11

interactive_syslinux depends on the syslinux-install_update script that is in the Arch syslinux package. --- src/core/libs/lib-blockdevices-filesystems.sh | 3 +- src/core/libs/lib-ui-interactive.sh | 118 ++++++++++++++++++++++++- src/core/procedures/base | 1 + 3 files changed, 119 insertions(+), 3 deletions(-) diff --git a/src/core/libs/lib-blockdevices-filesystems.sh b/src/core/libs/lib-blockdevices-filesystems.sh index cb30a2e..13160c9 100644 --- a/src/core/libs/lib-blockdevices-filesystems.sh +++ b/src/core/libs/lib-blockdevices-filesystems.sh @@ -94,7 +94,8 @@ get_possible_fs () { true } -supported_bootloaders=('grub') +syslinux_supported_fs=('ext2' 'ext3' 'ext4' 'btrfs' 'vfat') +supported_bootloaders=('syslinux' 'grub') # procedural code from quickinst functionized and fixed. # there were functions like this in the setup script too, with some subtle differences. see below diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh index 29453cb..bd8cb8a 100644 --- a/src/core/libs/lib-ui-interactive.sh +++ b/src/core/libs/lib-ui-interactive.sh @@ -2,7 +2,9 @@ # A library which allows you to do backend stuff by using user interfaces # Global Variables -grubmenu="/boot/grub/menu.lst" # be sure to override this if you have it somewhere else +# Be sure to override these if you have the configuration file elsewhere +grubmenu="/boot/grub/menu.lst" +syslinuxmenu="/boot/syslinux/syslinux.cfg" # check if a worker has completed successfully. if not -> tell user he must do it + return 1 # if ok -> don't warn anything and return 0 @@ -737,7 +739,8 @@ If any previous configuration you've done until now (like fancy filesystems) req done ask_option no "Choose bootloader" "Which bootloader would you like to use?" optional \ - "grub" "GRUB bootloader" + "grub" "GRUB bootloader" \ + "syslinux" "Syslinux bootloader (${syslinux_supported_fs[*]})" bootloader=$ANSWER_OPTION @@ -867,6 +870,8 @@ interactive_install_bootloader () { if [[ $bootloader = grub ]]; then GRUB_OK=0 interactive_grub || return 1 + elif [[ $bootloader = syslinux ]]; then + interactive_syslinux || return 1 else show_warning 'No Bootloader' 'You did not select a bootloader. No bootloader will be installed.' fi @@ -1131,11 +1136,120 @@ EOF fi } +interactive_syslinux() { + debug FS "starting interactive_syslinux" + + # Find and Store the device that has the root filesystem + get_device_with_mount '/' || return 1 + PART_ROOT="$ANSWER_DEVICE" + + # Gets booot device + get_device_with_mount '/boot' + bootdev="$ANSWER_DEVICE" + + # Check to see if /boot or / (root) has a valid FS type and set bootpart + # bootpart == device with /boot dir + if [[ $bootdev ]]; then + filesystem="$(awk '/ \/boot /{print $4}' $TMP_FILESYSTEMS)" + debug FS "$bootdev - FS type: $filesystem" + + local bootpart="$bootdev" + else + filesystem="$(awk '/ \/ /{print $4}' $TMP_FILESYSTEMS)" + debug FS "$PART_ROOT - FS type: $filesystem" + + local bootpart="$PART_ROOT" + fi + + if ! check_is_in "$filesystem" "${syslinux_supported_fs[@]}"; then + show_warning "Invalid FS" "Error: Syslinux does not support $filesystem.\n\nThe following filesystems are supported:\n ${syslinux_supported_fs[@]}" + return 1 + fi + + # remove default entries by truncating file at our little tag (#-*) + sed -i -e '/#-\*/q' "$syslinuxmenu" + + # Generate menu and prompt user to edit it + interactive_bootloader_menu "syslinux" "$syslinuxmenu" + + if device_is_raid "$bootpart"; then + debug FS "Software RAID detected" + local onraid=true + fi + + debug FS "Installing Syslinux ($var_TARGET_DIR/usr/sbin/syslinux-install_update -i -c /mnt)" + inform "Installing Syslinux..." + if ! "$var_TARGET_DIR/usr/sbin/syslinux-install_update" -i -c /mnt >$LOG 2>&1; then + debug FS "FAILED: syslinux-install_update -i -c /mnt failed" + show_warning "FAILED" "syslinux-install_update -i -c /mnt failed" + return 1 + fi + + if ask_yesno "Set boot flag(s) and install the Syslinux MBR?" yes; then + inform "Setting Boot Flag(s)...\nThis could take a while. Please be patient.\n\n" syslinuxprog + if "$var_TARGET_DIR/usr/sbin/syslinux-install_update" -a -c /mnt >$LOG 2>&1; then + debug FS "Successfully set boot flag(s)" + else + debug FS "Failde to set boot flag(s). syslinux-install_update -a failed with Error Code - $?" + show_warning "FAILED" "Failed to set boot flag(s). MBR not installed" && return 1 + fi + + inform "Installing Syslinux MBR..." syslinuxprog + if "$var_TARGET_DIR/usr/sbin/syslinux-install_update" -m -c /mnt >$LOG 2>&1; then + debug FS "Successfully installed MBR(s)" + else + debug FS "Failed to install MBR. syslinux-install_update -m failed with Error Code - $?" + show_warning "FAILED" "Failed to install the MBR!" && return 1 + fi + fi + notify "Syslinux Installation Successful" +} + +generate_syslinux_menu () { + get_kernel_parameters || return + + cat >>$syslinuxmenu <<EOF + +# (0) Arch Linux +LABEL arch + MENU LABEL Arch Linux + LINUX ../vmlinuz26 + APPEND $kernel_parameters + INITRD ../kernel26.img + +# (1) Arch Linux Fallback +LABEL archfallback + MENU LABEL Arch Linux Fallback + LINUX ../vmlinuz26 + APPEND $kernel_parameters + INITRD ../kernel26-fallback.img + +# (2) Windows +#LABEL windows +#COM32 chain.c32 +#APPEND hd0 0 + +LABEL hdt + MENU LABEL HDT (Hardware Detection Tool) + COM32 hdt.c32 + +LABEL reboot + MENU LABEL Reboot + COM32 reboot.c32 + +LABEL off + MENU LABEL Power Off + COMBOOT poweroff.com +EOF +} + # $1 - Bootloader Name # $2 - Bootloader Configuration Files interactive_bootloader_menu() { if [[ $1 = grub ]]; then generate_grub_menulst || return + elif [[ $1 = syslinux ]]; then + generate_syslinux_menu || return fi grep -q '^/dev/mapper' $TMP_FSTAB && local helptext=" /dev/mapper/ users: Pay attention to the kernel line!" diff --git a/src/core/procedures/base b/src/core/procedures/base index ec38f51..4e41c81 100644 --- a/src/core/procedures/base +++ b/src/core/procedures/base @@ -11,6 +11,7 @@ var_UI_TYPE="cli" # set to cli or dia for dialog var_ARCH=`uname -m` #i686 or x86_64. NOTE: this assumes you want to install the same arch as the installation environment you're using. maybe we could decouple those someday.. [ -z "$var_ARCH" ] && die_error "Could not determine your architecture" grubmenu="$var_TARGET_DIR$grubmenu" +syslinuxmenu="$var_TARGET_DIR$syslinuxmenu" ###### Phases ( can be overridden by more specific procedures) ###### phase_preparation=(\ -- 1.7.4.1

3 2

[arch-releng] [PATCH] Provide Syslinux as a possible bootloader
by pyther＠pyther.net 06 Mar '11

06 Mar '11

interactive_syslinux depends on the syslinux-install_update script that is in the Arch syslinux package. --- src/core/libs/lib-blockdevices-filesystems.sh | 3 +- src/core/libs/lib-ui-interactive.sh | 118 ++++++++++++++++++++++++- src/core/procedures/base | 1 + 3 files changed, 119 insertions(+), 3 deletions(-) diff --git a/src/core/libs/lib-blockdevices-filesystems.sh b/src/core/libs/lib-blockdevices-filesystems.sh index 5b078a7..513c980 100644 --- a/src/core/libs/lib-blockdevices-filesystems.sh +++ b/src/core/libs/lib-blockdevices-filesystems.sh @@ -94,7 +94,8 @@ get_possible_fs () { true } -supported_bootloaders=('grub') +syslinux_supported_fs=('ext2' 'ext3' 'ext4' 'btrfs' 'vfat') +supported_bootloaders=('syslinux' 'grub') # procedural code from quickinst functionized and fixed. # there were functions like this in the setup script too, with some subtle differences. see below diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh index c4bb336..36525be 100644 --- a/src/core/libs/lib-ui-interactive.sh +++ b/src/core/libs/lib-ui-interactive.sh @@ -2,7 +2,9 @@ # A library which allows you to do backend stuff by using user interfaces # Global Variables -grubmenu="/boot/grub/menu.lst" # be sure to override this if you have it somewhere else +# Be sure to override these if you have the configuration file elsewhere +grubmenu="/boot/grub/menu.lst" +syslinuxmenu="/boot/syslinux/syslinux.cfg" # check if a worker has completed successfully. if not -> tell user he must do it + return 1 # if ok -> don't warn anything and return 0 @@ -737,7 +739,8 @@ If any previous configuration you've done until now (like fancy filesystems) req done ask_option no "Choose bootloader" "Which bootloader would you like to use?" optional \ - "grub" "GRUB bootloader" + "grub" "GRUB bootloader" \ + "syslinux" "Syslinux bootloader (${syslinux_supported_fs[*]})" bootloader=$ANSWER_OPTION @@ -867,6 +870,8 @@ interactive_install_bootloader () { if [[ $bootloader = grub ]]; then GRUB_OK=0 interactive_grub || return 1 + elif [[ $bootloader = syslinux ]]; then + interactive_syslinux || return 1 else show_warning 'No Bootloader' 'You did not select a bootloader. No bootloader will be installed.' fi @@ -1131,11 +1136,120 @@ EOF fi } +interactive_syslinux() { + debug FS "starting interactive_syslinux" + + # Find and Store the device that has the root filesystem + get_device_with_mount '/' || return 1 + PART_ROOT="$ANSWER_DEVICE" + + # Gets booot device + get_device_with_mount '/boot' + bootdev="$ANSWER_DEVICE" + + # Check to see if /boot or / (root) has a valid FS type and set bootpart + # bootpart == device with /boot dir + if [[ $bootdev ]]; then + filesystem="$(awk '/ \/boot /{print $4}' $TMP_FILESYSTEMS)" + debug FS "$bootdev - FS type: $filesystem" + + local bootpart="$bootdev" + else + filesystem="$(awk '/ \/ /{print $4}' $TMP_FILESYSTEMS)" + debug FS "$PART_ROOT - FS type: $filesystem" + + local bootpart="$PART_ROOT" + fi + + if ! check_is_in "$filesystem" "${syslinux_supported_fs[@]}"; then + show_warning "Invalid FS" "Error: Syslinux does not support $filesystem.\n\nThe following filesystems are supported:\n ${syslinux_supported_fs[@]}" + return 1 + fi + + # remove default entries by truncating file at our little tag (#-*) + sed -i -e '/#-\*/q' "$syslinuxmenu" + + # Generate menu and prompt user to edit it + interactive_bootloader_menu "syslinux" "$syslinuxmenu" + + if device_is_raid "$bootpart"; then + debug FS "Software RAID detected" + local onraid=true + fi + + debug FS "Installing Syslinux ($var_TARGET_DIR/usr/sbin/syslinux-install_update -i -c /mnt)" + inform "Installing Syslinux..." + if ! "$var_TARGET_DIR/usr/sbin/syslinux-install_update" -i -c /mnt >$LOG 2>&1; then + debug FS "FAILED: syslinux-install_update -i -c /mnt failed" + show_warning "FAILED" "syslinux-install_update -i -c /mnt failed" + return 1 + fi + + if ask_yesno "Set boot flag(s) and install the Syslinux MBR?" yes; then + inform "Setting Boot Flag(s)...\nThis could take a while. Please be patient.\n\n" syslinuxprog + if "$var_TARGET_DIR/usr/sbin/syslinux-install_update" -a -c /mnt >$LOG 2>&1; then + debug FS "Successfully set boot flag(s)" + else + debug FS "Failde to set boot flag(s). syslinux-install_update -a failed with Error Code - $?" + show_warning "FAILED" "Failed to set boot flag(s). MBR not installed" && return 1 + fi + + inform "Installing Syslinux MBR..." syslinuxprog + if "$var_TARGET_DIR/usr/sbin/syslinux-install_update" -m -c /mnt >$LOG 2>&1; then + debug FS "Successfully installed MBR(s)" + else + debug FS "Failed to install MBR. syslinux-install_update -m failed with Error Code - $?" + show_warning "FAILED" "Failed to install the MBR!" && return 1 + fi + fi + notify "Syslinux Installation Successful" +} + +generate_syslinux_menu () { + get_kernel_parameters || return + + cat >>$syslinuxmenu <<EOF + +# (0) Arch Linux +LABEL arch + MENU LABEL Arch Linux + LINUX ../vmlinuz26 + APPEND $kernel_parameters + INITRD ../kernel26.img + +# (1) Arch Linux Fallback +LABEL archfallback + MENU LABEL Arch Linux Fallback + LINUX ../vmlinuz26 + APPEND $kernel_parameters + INITRD ../kernel26-fallback.img + +# (2) Windows +#LABEL windows +#COM32 chain.c32 +#APPEND hd0 0 + +LABEL hdt + MENU LABEL HDT (Hardware Detection Tool) + COM32 hdt.c32 + +LABEL reboot + MENU LABEL Reboot + COM32 reboot.c32 + +LABEL off + MENU LABEL Power Off + COMBOOT poweroff.com +EOF +} + # $1 - Bootloader Name # $2 - Bootloader Configuration Files interactive_bootloader_menu() { if [[ $1 = grub ]]; then generate_grub_menulst + elif [[ $1 = syslinux ]]; then + generate_syslinux_menu || return fi grep -q '^/dev/mapper' $TMP_FSTAB && local helptext=" /dev/mapper/ users: Pay attention to the kernel line!" diff --git a/src/core/procedures/base b/src/core/procedures/base index ec38f51..4e41c81 100644 --- a/src/core/procedures/base +++ b/src/core/procedures/base @@ -11,6 +11,7 @@ var_UI_TYPE="cli" # set to cli or dia for dialog var_ARCH=`uname -m` #i686 or x86_64. NOTE: this assumes you want to install the same arch as the installation environment you're using. maybe we could decouple those someday.. [ -z "$var_ARCH" ] && die_error "Could not determine your architecture" grubmenu="$var_TARGET_DIR$grubmenu" +syslinuxmenu="$var_TARGET_DIR$syslinuxmenu" ###### Phases ( can be overridden by more specific procedures) ###### phase_preparation=(\ -- 1.7.4.1

3 2

[arch-releng] [PATCH] Return non-zero return code for generate_grub_menulst
by pyther＠pyther.net 06 Mar '11

06 Mar '11

--- src/core/libs/lib-ui-interactive.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh index c4bb336..29453cb 100644 --- a/src/core/libs/lib-ui-interactive.sh +++ b/src/core/libs/lib-ui-interactive.sh @@ -1135,7 +1135,7 @@ EOF # $2 - Bootloader Configuration Files interactive_bootloader_menu() { if [[ $1 = grub ]]; then - generate_grub_menulst + generate_grub_menulst || return fi grep -q '^/dev/mapper' $TMP_FSTAB && local helptext=" /dev/mapper/ users: Pay attention to the kernel line!" -- 1.7.4.1

1 0

[arch-releng] [PATCH] Clearify types of devices that find_usable_devices returns
by pyther＠pyther.net 06 Mar '11

06 Mar '11

--- src/core/libs/lib-blockdevices-filesystems.sh | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/core/libs/lib-blockdevices-filesystems.sh b/src/core/libs/lib-blockdevices-filesystems.sh index 5b078a7..cb30a2e 100644 --- a/src/core/libs/lib-blockdevices-filesystems.sh +++ b/src/core/libs/lib-blockdevices-filesystems.sh @@ -244,8 +244,10 @@ finddisks() { } -# find usable blockdevices, both partionable or not (i.e. partitions themselves) -# $1 extra things to echo for each partition (optional) (backslash escapes will get interpreted) +# find usable blockdevices: RAID + LVM volumes, partitioned and unpartitioned devices +# Exclude devices/partitions that are part of a RAID or LVM volume +# Exclude root block devices (ex. sda) that are partitioned +# $1 extra things to echo for each device (optional) (backslash escapes will get interpreted) find_usable_blockdevices() { shopt -s nullglob -- 1.7.4.1

1 0