diff options
| author | Dieter Plaetinck <dieter@plaetinck.be> | 2011-01-03 19:24:53 +0100 |
|---|---|---|
| committer | Dieter Plaetinck <dieter@plaetinck.be> | 2011-01-03 19:24:53 +0100 |
| commit | 474fff0355e0f3cb19f9afe28c956595e577e0a8 (patch) | |
| tree | e8ecf51a4b651d1e5116bc7a868e895f0c78b9d5 /src | |
| parent | 9d8c2f0cf4345ddca45e6ac9412bb3ebee908979 (diff) | |
| parent | 1f0ad6bb4e5d50e5c1a18fbfc2dfbb6bc904cef5 (diff) | |
Merge remote branch 'pyther/master'
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/libs/lib-ui-interactive.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh index 2297078..11cde02 100644 --- a/src/core/libs/lib-ui-interactive.sh +++ b/src/core/libs/lib-ui-interactive.sh @@ -1,6 +1,9 @@ #!/bin/bash # A library which allows you to do backend stuff by using user interfaces +# Global Variables +grubmenu="$var_TARGET_DIR/boot/grub/menu.lst" + # 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 check_depend () @@ -855,7 +858,6 @@ interactive_install_bootloader () { interactive_grub() { get_grub_map - local grubmenu="$var_TARGET_DIR/boot/grub/menu.lst" [ ! -f $grubmenu ] && show_warning "No grub?" "Error: Couldn't find $grubmenu. Is GRUB installed?" && return 1 debug FS "starting interactive_grub" @@ -995,7 +997,6 @@ interactive_grub() { } generate_grub_menulst() { - local grubmenu="$var_TARGET_DIR/boot/grub/menu.lst" get_device_with_mount '/' || return 1 local _rootpart=$ANSWER_DEVICE @@ -1128,7 +1129,6 @@ EOF } interactive_grub_menulst () { - local grubmenu="$var_TARGET_DIR/boot/grub/menu.lst" generate_grub_menulst helptext= grep -q '^/dev/mapper' $TMP_FSTAB && helptext=" /dev/mapper/ users: Pay attention to the kernel line!" |