[arch-releng] [PATCH 1/3] Rename interactive_grub_menulst to interactive_bootloader_menu
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
--- src/core/libs/lib-blockdevices-filesystems.sh | 1 + src/core/libs/lib-ui-interactive.sh | 27 ++++++++++++++++-------- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/src/core/libs/lib-blockdevices-filesystems.sh b/src/core/libs/lib-blockdevices-filesystems.sh index ac749a3..5bf181e 100644 --- a/src/core/libs/lib-blockdevices-filesystems.sh +++ b/src/core/libs/lib-blockdevices-filesystems.sh @@ -93,6 +93,7 @@ get_possible_fs () { done } +supported_bootloaders=('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 062c420..dbf97bd 100644 --- a/src/core/libs/lib-ui-interactive.sh +++ b/src/core/libs/lib-ui-interactive.sh @@ -709,12 +709,13 @@ device type label size type create? mountpoint options label params" required "$ # params: none # returns: 1 on error interactive_select_packages() { + local needed_pkgs=() # set up our install location if necessary and sync up so we can get package lists target_prepare_pacman || { show_warning 'Pacman preparation failure' "Pacman preparation failed! Check $LOG for errors."; return 1; } repos=`list_pacman_repos target` - notify "Package selection is split into two stages. First you will select package groups that contain packages you may be interested in. Then you will be presented with a full list of packages for each group, allowing you to fine-tune.\n\n + notify "Package selection is split into three stages. First, you will select a bootloader. Then, you will select package groups that contain packages that you may be interested in. Lastly, you will be presented with a full list of packages for each group, allowing you to fine-tune.\n\n Note that right now the packages (and groups) selection is limited to the repos available at this time ($repos). Once you have your Arch system up and running, you have access to more repositories and packages.\n\n If any previous configuration you've done until now (like fancy filesystems) require extra packages, we've already preselected them for your convenience" @@ -724,6 +725,14 @@ If any previous configuration you've done until now (like fancy filesystems) req grouplist+=(${i} - OFF) done + ask_option no "Choose bootloader" "Which bootloader would you like to use?" optional \ + "grub" "GRUB bootloader" + + bootloader=$ANSWER_OPTION + + # Make sure selected bootloader is a supported_bootloader and mark bootloader for installation + check_is_in $bootloader "${supported_bootloaders[@]}" && needed_pkgs+=("$bootloader") + ask_checklist "Select Package groups\nDo not deselect base unless you know what you're doing!" 0 "${grouplist[@]}" || return 1 grouplist=("${ANSWER_CHECKLIST[@]}") @@ -842,15 +851,15 @@ interactive_runtime_network() { return 0 } +# bootloader is global variable that gets set in interactive_select_packages interactive_install_bootloader () { - ask_option Grub "Choose bootloader" "Which bootloader would you like to use? Grub is the Arch default." required \ - "Grub" "Use the GRUB bootloader (default)" \ - "None" "\Zb\Z1Warning\Z0\ZB: you must install your own bootloader!" || return 1 - - bl=`tr '[:upper:]' '[:lower:]' <<< "$ANSWER_OPTION"` - [ "$bl" != grub ] && return 0 - GRUB_OK=0 - interactive_grub + if [[ $bootloader = grub ]]; then + GRUB_OK=0 + interactive_grub || return 1 + else + show_warning 'No Bootloader' 'You did not select a bootloader. No bootloader will be installed.' + return 0 + fi } interactive_grub() { -- 1.7.4.1
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 | 119 ++++++++++++++++++++++++-
src/core/procedures/base | 1 +
3 files changed, 120 insertions(+), 3 deletions(-)
diff --git a/src/core/libs/lib-blockdevices-filesystems.sh b/src/core/libs/lib-blockdevices-filesystems.sh
index 5bf181e..cd17c72 100644
--- a/src/core/libs/lib-blockdevices-filesystems.sh
+++ b/src/core/libs/lib-blockdevices-filesystems.sh
@@ -93,7 +93,8 @@ get_possible_fs () {
done
}
-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 dbf97bd..c1e7a30 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
@@ -726,7 +728,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
@@ -856,6 +859,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.'
return 0
@@ -1120,11 +1125,121 @@ 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
+ # Notify the user or trust the scripts?
+ 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; 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; 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 - $?"
+ notify "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; then
+ debug FS "Successfully installed MBR(s)"
+ else
+ debug FS "Failed to install MBR. syslinux-install_update -m failed with Error Code - $?"
+ notify "Failed to install the MBR!" && return 1
+ fi
+ fi
+ notify "Syslinux Installation Successful"
+}
+
+generate_syslinux_menu () {
+ get_kernel_parameters
+
+ cat >>$syslinuxmenu <
thanks. pushed 1 and 2 (with minimal adjustments) Dieter
On Sun, 27 Feb 2011 17:11:24 -0500 pyther@pyther.net wrote:
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 | 119 ++++++++++++++++++++++++- src/core/procedures/base | 1 + 3 files changed, 120 insertions(+), 3 deletions(-)
diff --git a/src/core/libs/lib-blockdevices-filesystems.sh b/src/core/libs/lib-blockdevices-filesystems.sh index 5bf181e..cd17c72 100644 --- a/src/core/libs/lib-blockdevices-filesystems.sh +++ b/src/core/libs/lib-blockdevices-filesystems.sh @@ -93,7 +93,8 @@ get_possible_fs () { done }
-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 dbf97bd..c1e7a30 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 @@ -726,7 +728,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
@@ -856,6 +859,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.' return 0 @@ -1120,11 +1125,121 @@ 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 + # Notify the user or trust the scripts? what exactly is this comment supposed to achieve? + 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; 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; 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 - $?" + notify "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; then + debug FS "Successfully installed MBR(s)" + else + debug FS "Failed to install MBR. syslinux-install_update -m failed with Error Code - $?" + notify "Failed to install the MBR!" && return 1 + fi + fi + notify "Syslinux Installation Successful" +} + +generate_syslinux_menu () { + get_kernel_parameters + + cat >>$syslinuxmenu <
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 3ff66b4..bab079b 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=(\
In addition to the comment above, I'll copy paste some feedback from an earlier review: + 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 get_kernel_parameters should get an '|| return 1' same thing for generate_syslinux_menu and generate_grub_menulst in interactive_bootloader_menu() Furthermore: - We can probably remove GRUB_OK (I can look after that myself also) - To show warnings, use show_warning, not notify Dieter
On 02/28/2011 03:52 PM, Dieter Plaetinck wrote:
On Sun, 27 Feb 2011 17:11:24 -0500 pyther@pyther.net wrote:
+ + if device_is_raid "$bootpart"; then + debug FS "Software RAID detected" + local onraid=true + # Notify the user or trust the scripts? what exactly is this comment supposed to achieve? Nothing it was left over from some old code. I removed it. In addition to the comment above, I'll copy paste some feedback from an earlier review:
+ 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 Fixed get_kernel_parameters should get an '|| return 1' same thing for generate_syslinux_menu and generate_grub_menulst in interactive_bootloader_menu() Fixed for generate_syslinux_menu... I will submit a separate patch for grub Furthermore: - We can probably remove GRUB_OK (I can look after that myself also) I agree, although that should be a separate patch, right? - To show warnings, use show_warning, not notify Of course, fixed... Dieter
I haven't tested the changes yet. Although I don't see them causing any
troubles, I do want to give it a test run. However, I won't be able to
do that for a couple of days though.
A diff of the changes:
diff --git a/src/core/libs/lib-ui-interactive.sh
b/src/core/libs/lib-ui-interactive.sh
index 6b6260b..c3686e4 100644
--- a/src/core/libs/lib-ui-interactive.sh
+++ b/src/core/libs/lib-ui-interactive.sh
@@ -1164,12 +1164,11 @@ interactive_syslinux() {
if device_is_raid "$bootpart"; then
debug FS "Software RAID detected"
local onraid=true
- # Notify the user or trust the scripts?
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; then
+ 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
@@ -1177,26 +1176,26 @@ interactive_syslinux() {
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; then
+ 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 - $?"
- notify "Failed to set boot flag(s). MBR not
installed" && return 1
+ 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; then
+ 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 - $?"
- notify "Failed to install the MBR!" && return 1
+ show_warning "FAILED" "Failed to install the
MBR!" && return 1
fi
fi
notify "Syslinux Installation Successful"
}
generate_syslinux_menu () {
- get_kernel_parameters
+ get_kernel_parameters || return 1
cat >>$syslinuxmenu <
On Mon, 28 Feb 2011 16:50:11 -0500
Matthew Gyurgyik
On 02/28/2011 03:52 PM, Dieter Plaetinck wrote:
- We can probably remove GRUB_OK (I can look after that myself also) I agree, although that should be a separate patch, right?
yep.
A diff of the changes:
please, just send a new patch when you have the time. Dieter
participants (3)
-
Dieter Plaetinck
-
Matthew Gyurgyik
-
pyther＠pyther.net