DIALOG is now called _dia_DIALOG

2 files changed, 82 insertions, 82 deletions

diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh
index 3e39c40..f638c0e 100644
--- a/src/core/libs/lib-ui-interactive.sh
+++ b/src/core/libs/lib-ui-interactive.sh
@@ -7,14 +7,14 @@ interactive_partition() {
     # Select disk to partition
     DISCS=$(finddisks _)
     DISCS="$DISCS OTHER - DONE +"
-    DIALOG --msgbox "Available Disks:\n\n$(_getavaildisks)\n" 0 0
+    _dia_DIALOG --msgbox "Available Disks:\n\n$(_getavaildisks)\n" 0 0
     DISC=""
     while true; do
         # Prompt the user with a list of known disks
-        DIALOG --menu "Select the disk you want to partition (select DONE when finished)" 14 55 7 $DISCS 2>$ANSWER || return 1
+        _dia_DIALOG --menu "Select the disk you want to partition (select DONE when finished)" 14 55 7 $DISCS 2>$ANSWER || return 1
         DISC=$(cat $ANSWER)
         if [ "$DISC" = "OTHER" ]; then
-            DIALOG --inputbox "Enter the full path to the device you wish to partition" 8 65 "/dev/sda" 2>$ANSWER || return 1
+            _dia_DIALOG --inputbox "Enter the full path to the device you wish to partition" 8 65 "/dev/sda" 2>$ANSWER || return 1
             DISC=$(cat $ANSWER)
         fi
         # Leave our loop if the user is done partitioning
@@ -40,7 +40,7 @@ interactive_configure_system()
             DEFAULT=""
         fi
 
-        DIALOG $DEFAULT --menu "Configuration" 17 70 10 \
+        _dia_DIALOG $DEFAULT --menu "Configuration" 17 70 10 \
             "/etc/rc.conf"              "System Config" \
             "/etc/fstab"                "Filesystem Mountpoints" \
             "/etc/mkinitcpio.conf"      "Initramfs Config" \
@@ -76,7 +76,7 @@ interactive_configure_system()
 interactive_set_clock()   
 {
     # utc or local?
-    DIALOG --menu "Is your hardware clock in UTC or local time?" 10 50 2 \
+    _dia_DIALOG --menu "Is your hardware clock in UTC or local time?" 10 50 2 \
         "UTC" " " \
         "local" " " \
         2>$ANSWER || return 1
@@ -121,8 +121,8 @@ interactive_autoprepare()
 {
     DISCS=$(finddisks)
     if [ $(echo $DISCS | wc -w) -gt 1 ]; then
-        DIALOG --msgbox "Available Disks:\n\n$(_getavaildisks)\n" 0 0
-        DIALOG --menu "Select the hard drive to use" 14 55 7 $(finddisks _) 2>$ANSWER || return 1
+        _dia_DIALOG --msgbox "Available Disks:\n\n$(_getavaildisks)\n" 0 0
+        _dia_DIALOG --menu "Select the hard drive to use" 14 55 7 $(finddisks _) 2>$ANSWER || return 1
         DISC=$(cat $ANSWER)
     else
         DISC=$DISCS
@@ -140,13 +140,13 @@ interactive_autoprepare()
         [ "$(which mkfs.xfs 2>/dev/null)" ]   && FSOPTS="$FSOPTS xfs XFS"
         [ "$(which mkfs.jfs 2>/dev/null)" ]   && FSOPTS="$FSOPTS jfs JFS"
         while [ "$BOOT_PART_SET" = "" ]; do
-            DIALOG --inputbox "Enter the size (MB) of your /boot partition.  Minimum value is 16.\n\nDisk space left: $DISC_SIZE MB" 8 65 "32" 2>$ANSWER || return 1
+            _dia_DIALOG --inputbox "Enter the size (MB) of your /boot partition.  Minimum value is 16.\n\nDisk space left: $DISC_SIZE MB" 8 65 "32" 2>$ANSWER || return 1
             BOOT_PART_SIZE="$(cat $ANSWER)"
             if [ "$BOOT_PART_SIZE" = "" ]; then
-                DIALOG --msgbox "ERROR: You have entered an invalid size, please enter again." 0 0
+                _dia_DIALOG --msgbox "ERROR: You have entered an invalid size, please enter again." 0 0
             else
                 if [ "$BOOT_PART_SIZE" -ge "$DISC_SIZE" -o "$BOOT_PART_SIZE" -lt "16" -o "$SBOOT_PART_SIZE" = "$DISC_SIZE" ]; then
-                    DIALOG --msgbox "ERROR: You have entered a too large size, please enter again." 0 0
+                    _dia_DIALOG --msgbox "ERROR: You have entered a too large size, please enter again." 0 0
                 else
                     BOOT_PART_SET=1
                 fi
@@ -154,13 +154,13 @@ interactive_autoprepare()
         done
         DISC_SIZE=$(($DISC_SIZE-$BOOT_PART_SIZE))
         while [ "$SWAP_PART_SET" = "" ]; do
-            DIALOG --inputbox "Enter the size (MB) of your swap partition.  Minimum value is > 0.\n\nDisk space left: $DISC_SIZE MB" 8 65 "256" 2>$ANSWER || return 1
+            _dia_DIALOG --inputbox "Enter the size (MB) of your swap partition.  Minimum value is > 0.\n\nDisk space left: $DISC_SIZE MB" 8 65 "256" 2>$ANSWER || return 1
             SWAP_PART_SIZE=$(cat $ANSWER)
             if [ "$SWAP_PART_SIZE" = "" -o  "$SWAP_PART_SIZE" -le "0" ]; then
-                DIALOG --msgbox "ERROR: You have entered an invalid size, please enter again." 0 0
+                _dia_DIALOG --msgbox "ERROR: You have entered an invalid size, please enter again." 0 0
             else
                 if [ "$SWAP_PART_SIZE" -ge "$DISC_SIZE" ]; then
-                    DIALOG --msgbox "ERROR: You have entered a too large size, please enter again." 0 0
+                    _dia_DIALOG --msgbox "ERROR: You have entered a too large size, please enter again." 0 0
                 else
                     SWAP_PART_SET=1
                 fi
@@ -168,27 +168,27 @@ interactive_autoprepare()
         done
         DISC_SIZE=$(($DISC_SIZE-$SWAP_PART_SIZE))
         while [ "$ROOT_PART_SET" = "" ]; do
-            DIALOG --inputbox "Enter the size (MB) of your / partition.  The /home partition will use the remaining space.\n\nDisk space left:  $DISC_SIZE MB" 8 65 "7500" 2>$ANSWER || return 1
+            _dia_DIALOG --inputbox "Enter the size (MB) of your / partition.  The /home partition will use the remaining space.\n\nDisk space left:  $DISC_SIZE MB" 8 65 "7500" 2>$ANSWER || return 1
             ROOT_PART_SIZE=$(cat $ANSWER)
             if [ "$ROOT_PART_SIZE" = "" -o "$ROOT_PART_SIZE" -le "0" ]; then
-                DIALOG --msgbox "ERROR: You have entered an invalid size, please enter again." 0 0
+                _dia_DIALOG --msgbox "ERROR: You have entered an invalid size, please enter again." 0 0
             else
                 if [ "$ROOT_PART_SIZE" -ge "$DISC_SIZE" ]; then
-                    DIALOG --msgbox "ERROR: You have entered a too large size, please enter again." 0 0
+                    _dia_DIALOG --msgbox "ERROR: You have entered a too large size, please enter again." 0 0
                 else
-                    DIALOG --yesno "$(($DISC_SIZE-$ROOT_PART_SIZE)) MB will be used for your /home partition.  Is this OK?" 0 0 && ROOT_PART_SET=1
+                    _dia_DIALOG --yesno "$(($DISC_SIZE-$ROOT_PART_SIZE)) MB will be used for your /home partition.  Is this OK?" 0 0 && ROOT_PART_SET=1
                 fi
             fi
         done
         while [ "$CHOSEN_FS" = "" ]; do
-            DIALOG --menu "Select a filesystem for / and /home:" 13 45 6 $FSOPTS 2>$ANSWER || return 1
+            _dia_DIALOG --menu "Select a filesystem for / and /home:" 13 45 6 $FSOPTS 2>$ANSWER || return 1
             FSTYPE=$(cat $ANSWER)
-            DIALOG --yesno "$FSTYPE will be used for / and /home. Is this OK?" 0 0 && CHOSEN_FS=1
+            _dia_DIALOG --yesno "$FSTYPE will be used for / and /home. Is this OK?" 0 0 && CHOSEN_FS=1
         done
         SET_DEFAULTFS=1
     done
 
-    DIALOG --defaultno --yesno "$DISC will be COMPLETELY ERASED!  Are you absolutely sure?" 0 0 \
+    _dia_DIALOG --defaultno --yesno "$DISC will be COMPLETELY ERASED!  Are you absolutely sure?" 0 0 \
     || return 1
 
     DEVICE=$DISC
@@ -199,25 +199,25 @@ interactive_autoprepare()
     PART_ROOT="${DEVICE}3"
 
     if [ "$S_MKFS" = "1" ]; then
-        DIALOG --msgbox "You have already prepared your filesystems manually" 0 0
+        _dia_DIALOG --msgbox "You have already prepared your filesystems manually" 0 0
         return 0
     fi
 
     # validate DEVICE
     if [ ! -b "$DEVICE" ]; then
-      DIALOG --msgbox "Device '$DEVICE' is not valid" 0 0
+      _dia_DIALOG --msgbox "Device '$DEVICE' is not valid" 0 0
       return 1
     fi
 
     # validate DEST
     if [ ! -d "$TARGET_DIR" ]; then
-        DIALOG --msgbox "Destination directory '$TARGET_DIR' is not valid" 0 0
+        _dia_DIALOG --msgbox "Destination directory '$TARGET_DIR' is not valid" 0 0
         return 1
     fi
 
     # / required
     if [ $(echo $FSSPECS | grep '/:' | wc -l) -ne 1 ]; then
-        DIALOG --msgbox "Need exactly one root partition" 0 0
+        _dia_DIALOG --msgbox "Need exactly one root partition" 0 0
         return 1
     fi
 
@@ -251,12 +251,12 @@ interactive_autoprepare()
 
     # invoke sfdisk
     printk off
-    DIALOG --infobox "Partitioning $DEVICE" 0 0
+    _dia_DIALOG --infobox "Partitioning $DEVICE" 0 0
     sfdisk $DEVICE -uM >$LOG 2>&1 <<EOF
 $sfdisk_input
 EOF
     if [ $? -gt 0 ]; then
-        DIALOG --msgbox "Error partitioning $DEVICE (see $LOG for details)" 0 0
+        _dia_DIALOG --msgbox "Error partitioning $DEVICE (see $LOG for details)" 0 0
         printk on
         return 1
     fi
@@ -284,7 +284,7 @@ EOF
         part=$(($part + 1))
     done
 
-    DIALOG --msgbox "Auto-prepare was successful" 0 0
+    _dia_DIALOG --msgbox "Auto-prepare was successful" 0 0
     return 0
 }
 
@@ -302,54 +302,54 @@ interactive_mountpoints() {
         [ "$(which mkfs.vfat 2>/dev/null)" ]  && FSOPTS="$FSOPTS vfat VFAT"
 
         # Select mountpoints
-        DIALOG --msgbox "Available Disks:\n\n$(_getavaildisks)\n" 0 0
+        _dia_DIALOG --msgbox "Available Disks:\n\n$(_getavaildisks)\n" 0 0
         PARTS=$(findpartitions _)
-        DIALOG --menu "Select the partition to use as swap" 21 50 13 NONE - $PARTS 2>$ANSWER || return 1
+        _dia_DIALOG --menu "Select the partition to use as swap" 21 50 13 NONE - $PARTS 2>$ANSWER || return 1
         PART=$(cat $ANSWER)
         PARTS="$(echo $PARTS | sed -e "s#${PART}\ _##g")"
         if [ "$PART" != "NONE" ]; then
             DOMKFS="no"
-            DIALOG --yesno "Would you like to create a filesystem on $PART?\n\n(This will overwrite existing data!)" 0 0 && DOMKFS="yes"
+            _dia_DIALOG --yesno "Would you like to create a filesystem on $PART?\n\n(This will overwrite existing data!)" 0 0 && DOMKFS="yes"
             echo "$PART:swap:swap:$DOMKFS" >>/tmp/.parts
         fi
 
-        DIALOG --menu "Select the partition to mount as /" 21 50 13 $PARTS 2>$ANSWER || return 1
+        _dia_DIALOG --menu "Select the partition to mount as /" 21 50 13 $PARTS 2>$ANSWER || return 1
         PART=$(cat $ANSWER)
         PARTS="$(echo $PARTS | sed -e "s#${PART}\ _##g")"
         PART_ROOT=$PART
         # Select root filesystem type
-        DIALOG --menu "Select a filesystem for $PART" 13 45 6 $FSOPTS 2>$ANSWER || return 1
+        _dia_DIALOG --menu "Select a filesystem for $PART" 13 45 6 $FSOPTS 2>$ANSWER || return 1
         FSTYPE=$(cat $ANSWER)
         DOMKFS="no"
-        DIALOG --yesno "Would you like to create a filesystem on $PART?\n\n(This will overwrite existing data!)" 0 0 && DOMKFS="yes"
+        _dia_DIALOG --yesno "Would you like to create a filesystem on $PART?\n\n(This will overwrite existing data!)" 0 0 && DOMKFS="yes"
         echo "$PART:$FSTYPE:/:$DOMKFS" >>/tmp/.parts
 
         #
         # Additional partitions
         #
-        DIALOG --menu "Select any additional partitions to mount under your new root (select DONE when finished)" 21 50 13 $PARTS DONE _ 2>$ANSWER || return 1
+        _dia_DIALOG --menu "Select any additional partitions to mount under your new root (select DONE when finished)" 21 50 13 $PARTS DONE _ 2>$ANSWER || return 1
         PART=$(cat $ANSWER)
         while [ "$PART" != "DONE" ]; do
             PARTS="$(echo $PARTS | sed -e "s#${PART}\ _##g")"
             # Select a filesystem type
-            DIALOG --menu "Select a filesystem for $PART" 13 45 6 $FSOPTS 2>$ANSWER || return 1
+            _dia_DIALOG --menu "Select a filesystem for $PART" 13 45 6 $FSOPTS 2>$ANSWER || return 1
             FSTYPE=$(cat $ANSWER)
             MP=""
             while [ "${MP}" = "" ]; do
-                DIALOG --inputbox "Enter the mountpoint for $PART" 8 65 "/boot" 2>$ANSWER || return 1
+                _dia_DIALOG --inputbox "Enter the mountpoint for $PART" 8 65 "/boot" 2>$ANSWER || return 1
                 MP=$(cat $ANSWER)
                 if grep ":$MP:" /tmp/.parts; then
-                    DIALOG --msgbox "ERROR: You have defined 2 identical mountpoints! Please select another mountpoint." 8 65
+                    _dia_DIALOG --msgbox "ERROR: You have defined 2 identical mountpoints! Please select another mountpoint." 8 65
                     MP=""
                 fi
             done
             DOMKFS="no"
-            DIALOG --yesno "Would you like to create a filesystem on $PART?\n\n(This will overwrite existing data!)" 0 0 && DOMKFS="yes"
+            _dia_DIALOG --yesno "Would you like to create a filesystem on $PART?\n\n(This will overwrite existing data!)" 0 0 && DOMKFS="yes"
             echo "$PART:$FSTYPE:$MP:$DOMKFS" >>/tmp/.parts
-            DIALOG --menu "Select any additional partitions to mount under your new root" 21 50 13 $PARTS DONE _ 2>$ANSWER || return 1
+            _dia_DIALOG --menu "Select any additional partitions to mount under your new root" 21 50 13 $PARTS DONE _ 2>$ANSWER || return 1
             PART=$(cat $ANSWER)
         done
-        DIALOG --yesno "Would you like to create and mount the filesytems like this?\n\nSyntax\n------\nDEVICE:TYPE:MOUNTPOINT:FORMAT\n\n$(for i in $(cat /tmp/.parts); do echo "$i\n";done)" 18 0 && PARTFINISH="DONE"
+        _dia_DIALOG --yesno "Would you like to create and mount the filesytems like this?\n\nSyntax\n------\nDEVICE:TYPE:MOUNTPOINT:FORMAT\n\n$(for i in $(cat /tmp/.parts); do echo "$i\n";done)" 18 0 && PARTFINISH="DONE"
     done
 
     _umountall
@@ -362,16 +362,16 @@ interactive_mountpoints() {
         umount ${TARGET_DIR}${MP}
         if [ "$DOMKFS" = "yes" ]; then
             if [ "$FSTYPE" = "swap" ]; then
-                DIALOG --infobox "Creating and activating swapspace on $PART" 0 0
+                _dia_DIALOG --infobox "Creating and activating swapspace on $PART" 0 0
             else
-                DIALOG --infobox "Creating $FSTYPE on $PART, mounting to ${TARGET_DIR}${MP}" 0 0
+                _dia_DIALOG --infobox "Creating $FSTYPE on $PART, mounting to ${TARGET_DIR}${MP}" 0 0
             fi
             _mkfs yes $PART $FSTYPE $TARGET_DIR $MP || return 1
         else
             if [ "$FSTYPE" = "swap" ]; then
-                DIALOG --infobox "Activating swapspace on $PART" 0 0
+                _dia_DIALOG --infobox "Activating swapspace on $PART" 0 0
             else
-                DIALOG --infobox "Mounting $PART to ${TARGET_DIR}${MP}" 0 0
+                _dia_DIALOG --infobox "Mounting $PART to ${TARGET_DIR}${MP}" 0 0
             fi
             _mkfs no $PART $FSTYPE $TARGET_DIR $MP || return 1
         fi
@@ -389,13 +389,13 @@ interactive_mountpoints() {
 # returns: 1 on error
 interactive_select_packages() {
 
-    DIALOG --msgbox "Package selection is split into two stages.  First you will select package categories that contain packages you may be interested in.  Then you will be presented with a full list of packages for each category, allowing you to fine-tune.\n\n" 15 70
+    _dia_DIALOG --msgbox "Package selection is split into two stages.  First you will select package categories that contain packages you may be interested in.  Then you will be presented with a full list of packages for each category, allowing you to fine-tune.\n\n" 15 70
 
     # set up our install location if necessary and sync up
     # so we can get package lists
     prepare_pacman
     if [ $? -ne 0 ]; then
-        DIALOG --msgbox "Pacman preparation failed! Check $LOG for errors." 6 60
+        _dia_DIALOG --msgbox "Pacman preparation failed! Check $LOG for errors." 6 60
         return 1
     fi
 
@@ -405,7 +405,7 @@ interactive_select_packages() {
         _catlist="${_catlist} ${i} - OFF"
     done
 
-    DIALOG --checklist "Select Package Categories\nDO NOT deselect BASE unless you know what you're doing!" 19 55 12 $_catlist 2>$ANSWER || return 1
+    _dia_DIALOG --checklist "Select Package Categories\nDO NOT deselect BASE unless you know what you're doing!" 19 55 12 $_catlist 2>$ANSWER || return 1
     _catlist="$(cat $ANSWER)"
 
     # assemble a list of packages with groups, marking pre-selected ones
@@ -428,7 +428,7 @@ interactive_select_packages() {
     # sort by category
     _pkglist="$(echo "$_pkglist" | sort -f -k 2)"
 
-    DIALOG --checklist "Select Packages To Install." 19 60 12 $_pkglist 2>$ANSWER || return 1
+    _dia_DIALOG --checklist "Select Packages To Install." 19 60 12 $_pkglist 2>$ANSWER || return 1
     PACKAGES="$(cat $ANSWER)"
     return 0
 }
@@ -445,55 +445,55 @@ interactive_runtime_network() {
     ifaces=$(ifconfig -a |grep "Link encap:Ethernet"|sed 's/ \+Link encap:Ethernet \+HWaddr \+/ /g')
 
     if [ "$ifaces" = "" ]; then
-        DIALOG --msgbox "Cannot find any ethernet interfaces. This usually means udev was\nunable to load the module and you must do it yourself. Switch to\nanother VT, load the appropriate module, and run this step again." 18 70
+        _dia_DIALOG --msgbox "Cannot find any ethernet interfaces. This usually means udev was\nunable to load the module and you must do it yourself. Switch to\nanother VT, load the appropriate module, and run this step again." 18 70
         return 1
     fi
 
-    DIALOG --nocancel --ok-label "Select" --menu "Select a network interface" 14 55 7 $ifaces 2>$ANSWER
+    _dia_DIALOG --nocancel --ok-label "Select" --menu "Select a network interface" 14 55 7 $ifaces 2>$ANSWER
     case $? in
         0) INTERFACE=$(cat $ANSWER) ;;
         *) return 1 ;;
     esac
 
-    DIALOG --yesno "Do you want to use DHCP?" 0 0
+    _dia_DIALOG --yesno "Do you want to use DHCP?" 0 0
     if [ $? -eq 0 ]; then
-        DIALOG --infobox "Please wait.  Polling for DHCP server on $INTERFACE..." 0 0
+        _dia_DIALOG --infobox "Please wait.  Polling for DHCP server on $INTERFACE..." 0 0
         dhcpcd $INTERFACE >$LOG 2>&1
         if [ $? -ne 0 ]; then
-            DIALOG --msgbox "Failed to run dhcpcd.  See $LOG for details." 0 0
+            _dia_DIALOG --msgbox "Failed to run dhcpcd.  See $LOG for details." 0 0
             return 1
         fi
         if [ ! $(ifconfig $INTERFACE | grep 'inet addr:') ]; then
-            DIALOG --msgbox "DHCP request failed." 0 0 || return 1
+            _dia_DIALOG --msgbox "DHCP request failed." 0 0 || return 1
         fi
         S_DHCP=1
     else
         NETPARAMETERS=""
         while [ "$NETPARAMETERS" = "" ]; do
-            DIALOG --inputbox "Enter your IP address" 8 65 "192.168.0.2" 2>$ANSWER || return 1
+            _dia_DIALOG --inputbox "Enter your IP address" 8 65 "192.168.0.2" 2>$ANSWER || return 1
             IPADDR=$(cat $ANSWER)
-            DIALOG --inputbox "Enter your netmask" 8 65 "255.255.255.0" 2>$ANSWER || return 1
+            _dia_DIALOG --inputbox "Enter your netmask" 8 65 "255.255.255.0" 2>$ANSWER || return 1
             SUBNET=$(cat $ANSWER)
-            DIALOG --inputbox "Enter your broadcast" 8 65 "192.168.0.255" 2>$ANSWER || return 1
+            _dia_DIALOG --inputbox "Enter your broadcast" 8 65 "192.168.0.255" 2>$ANSWER || return 1
             BROADCAST=$(cat $ANSWER)
-            DIALOG --inputbox "Enter your gateway (optional)" 8 65 "192.168.0.1" 2>$ANSWER || return 1
+            _dia_DIALOG --inputbox "Enter your gateway (optional)" 8 65 "192.168.0.1" 2>$ANSWER || return 1
             GW=$(cat $ANSWER)
-            DIALOG --inputbox "Enter your DNS server IP" 8 65 "192.168.0.1" 2>$ANSWER || return 1
+            _dia_DIALOG --inputbox "Enter your DNS server IP" 8 65 "192.168.0.1" 2>$ANSWER || return 1
             DNS=$(cat $ANSWER)
-            DIALOG --inputbox "Enter your HTTP proxy server, for example:\nhttp://name:port\nhttp://ip:port\nhttp://username:password@ip:port\n\n Leave the field empty if no proxy is needed to install." 16 65 "" 2>$ANSWER || return 1
+            _dia_DIALOG --inputbox "Enter your HTTP proxy server, for example:\nhttp://name:port\nhttp://ip:port\nhttp://username:password@ip:port\n\n Leave the field empty if no proxy is needed to install." 16 65 "" 2>$ANSWER || return 1
             PROXY_HTTP=$(cat $ANSWER)
-            DIALOG --inputbox "Enter your FTP proxy server, for example:\nhttp://name:port\nhttp://ip:port\nhttp://username:password@ip:port\n\n Leave the field empty if no proxy is needed to install." 16 65 "" 2>$ANSWER || return 1
+            _dia_DIALOG --inputbox "Enter your FTP proxy server, for example:\nhttp://name:port\nhttp://ip:port\nhttp://username:password@ip:port\n\n Leave the field empty if no proxy is needed to install." 16 65 "" 2>$ANSWER || return 1
             PROXY_FTP=$(cat $ANSWER)
-            DIALOG --yesno "Are these settings correct?\n\nIP address:         $IPADDR\nNetmask:            $SUBNET\nGateway (optional): $GW\nDNS server:         $DNS\nHTTP proxy server:  $PROXY_HTTP\nFTP proxy server:   $PROXY_FTP" 0 0
+            _dia_DIALOG --yesno "Are these settings correct?\n\nIP address:         $IPADDR\nNetmask:            $SUBNET\nGateway (optional): $GW\nDNS server:         $DNS\nHTTP proxy server:  $PROXY_HTTP\nFTP proxy server:   $PROXY_FTP" 0 0
             case $? in
                 1) ;;
                 0) NETPARAMETERS="1" ;;
             esac
         done
         echo "running: ifconfig $INTERFACE $IPADDR netmask $SUBNET broadcast $BROADCAST up" >$LOG
-        ifconfig $INTERFACE $IPADDR netmask $SUBNET broadcast $BROADCAST up >$LOG 2>&1 || DIALOG --msgbox "Failed to setup $INTERFACE interface." 0 0 || return 1
+        ifconfig $INTERFACE $IPADDR netmask $SUBNET broadcast $BROADCAST up >$LOG 2>&1 || _dia_DIALOG --msgbox "Failed to setup $INTERFACE interface." 0 0 || return 1
         if [ "$GW" != "" ]; then
-            route add default gw $GW >$LOG 2>&1 || DIALOG --msgbox "Failed to setup your gateway." 0 0 || return 1
+            route add default gw $GW >$LOG 2>&1 || _dia_DIALOG --msgbox "Failed to setup your gateway." 0 0 || return 1
         fi
         if [ "$PROXY_HTTP" = "" ]; then
             unset http_proxy
@@ -516,7 +516,7 @@ interactive_install_grub() {
     get_grub_map
     local grubmenu="$TARGET_DIR/boot/grub/menu.lst"
     if [ ! -f $grubmenu ]; then
-        DIALOG --msgbox "Error: Couldn't find $grubmenu.  Is GRUB installed?" 0 0
+        _dia_DIALOG --msgbox "Error: Couldn't find $grubmenu.  Is GRUB installed?" 0 0
         return 1
     fi
     # try to auto-configure GRUB...
@@ -539,7 +539,7 @@ interactive_install_grub() {
             fi
             # keep the file from being completely bogus
             if [ "$grubdev" = "DEVICE NOT FOUND" ]; then
-                DIALOG --msgbox "Your root boot device could not be autodetected by setup.  Ensure you adjust the 'root (hd0,0)' line in your GRUB config accordingly." 0 0
+                _dia_DIALOG --msgbox "Your root boot device could not be autodetected by setup.  Ensure you adjust the 'root (hd0,0)' line in your GRUB config accordingly." 0 0
                 grubdev="(hd0,0)"
             fi
             # remove default entries by truncating file at our little tag (#-*)
@@ -567,19 +567,19 @@ EOF
         fi
     fi
 
-    DIALOG --msgbox "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." 0 0
+    _dia_DIALOG --msgbox "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." 0 0
     [ "$EDITOR" ] || geteditor
     $EDITOR $grubmenu
 
     DEVS=$(finddisks _)
     DEVS="$DEVS $(findpartitions _)"
     if [ "$DEVS" = "" ]; then
-        DIALOG --msgbox "No hard drives were found" 0 0
+        _dia_DIALOG --msgbox "No hard drives were found" 0 0
         return 1
     fi
-    DIALOG --menu "Select the boot device where the GRUB bootloader will be installed (usually the MBR and not a partition)." 14 55 7 $DEVS 2>$ANSWER || return 1
+    _dia_DIALOG --menu "Select the boot device where the GRUB bootloader will be installed (usually the MBR and not a partition)." 14 55 7 $DEVS 2>$ANSWER || return 1
     ROOTDEV=$(cat $ANSWER)
-    DIALOG --infobox "Installing the GRUB bootloader..." 0 0
+    _dia_DIALOG --infobox "Installing the GRUB bootloader..." 0 0
     cp -a $TARGET_DIR/usr/lib/grub/i386-pc/* $TARGET_DIR/boot/grub/
     sync
     # freeze xfs filesystems to enable grub installation on xfs filesystems
@@ -591,25 +591,25 @@ EOF
     bootpart=$(mount | grep $TARGET_DIR/boot | cut -d' ' -f 1)
     if [ "$bootpart" = "" ]; then
         if [ "$PART_ROOT" = "" ]; then
-            DIALOG --inputbox "Enter the full path to your root device" 8 65 "/dev/sda3" 2>$ANSWER || return 1
+            _dia_DIALOG --inputbox "Enter the full path to your root device" 8 65 "/dev/sda3" 2>$ANSWER || return 1
             bootpart=$(cat $ANSWER)
         else
             bootpart=$PART_ROOT
         fi
     fi
-    DIALOG --defaultno --yesno "Do you have your system installed on software raid?\nAnswer 'YES' to install grub to another hard disk." 0 0
+    _dia_DIALOG --defaultno --yesno "Do you have your system installed on software raid?\nAnswer 'YES' to install grub to another hard disk." 0 0
     if [ $? -eq 0 ]; then
-        DIALOG --menu "Please select the boot partition device, this cannot be autodetected!\nPlease redo grub installation for all partitions you need it!" 14 55 7 $DEVS 2>$ANSWER || return 1
+        _dia_DIALOG --menu "Please select the boot partition device, this cannot be autodetected!\nPlease redo grub installation for all partitions you need it!" 14 55 7 $DEVS 2>$ANSWER || return 1
         bootpart=$(cat $ANSWER)
     fi
     bootpart=$(mapdev $bootpart)
     bootdev=$(mapdev $ROOTDEV)
     if [ "$bootpart" = "" ]; then
-        DIALOG --msgbox "Error: Missing/Invalid root device: $bootpart" 0 0
+        _dia_DIALOG --msgbox "Error: Missing/Invalid root device: $bootpart" 0 0
         return 1
     fi
     if [ "$bootpart" = "DEVICE NOT FOUND" -o "$bootdev" = "DEVICE NOT FOUND" ]; then
-        DIALOG --msgbox "GRUB root and setup devices could not be auto-located.  You will need to manually run the GRUB shell to install a bootloader." 0 0
+        _dia_DIALOG --msgbox "GRUB root and setup devices could not be auto-located.  You will need to manually run the GRUB shell to install a bootloader." 0 0
         return 1
     fi
     $TARGET_DIR/sbin/grub --no-floppy --batch >/tmp/grub.log 2>&1 <<EOF
@@ -625,7 +625,7 @@ EOF
     fi
 
     if grep "Error [0-9]*: " /tmp/grub.log >/dev/null; then
-        DIALOG --msgbox "Error installing GRUB. (see $LOG for output)" 0 0
+        _dia_DIALOG --msgbox "Error installing GRUB. (see $LOG for output)" 0 0
         return 1
     fi
     notify "GRUB was successfully installed."
@@ -646,7 +646,7 @@ interactive_select_source()
         var_SYNC_URL=
         var_MIRRORLIST="/etc/pacman.d/mirrorlist"
 
-    DIALOG --menu "Please select an installation source" 10 35 3 \
+    _dia_DIALOG --menu "Please select an installation source" 10 35 3 \
     "1" "CD-ROM or OTHER SOURCE" \
     "2" "FTP/HTTP" 2>$ANSWER
 
diff --git a/src/core/procedures/interactive b/src/core/procedures/interactive
index 21ba2a3..b8d1cb9 100644
--- a/src/core/procedures/interactive
+++ b/src/core/procedures/interactive
@@ -67,7 +67,7 @@ mainmenu()
     else
         DEFAULT=""
     fi
-    DIALOG $DEFAULT --title " MAIN MENU " \
+    _dia_DIALOG $DEFAULT --title " MAIN MENU " \
         --menu "Use the UP and DOWN arrows to navigate menus.  Use TAB to switch between buttons and ENTER to select." 16 55 8 \
         "0" "Select Source" \
         "1" "Set Clock" \
@@ -83,7 +83,7 @@ mainmenu()
             execute worker select_source; ret=$?
 		if [ $ret -eq 0 -a "$var_PKG_SOURCE_TYPE" = "ftp" ]; then
 			while true; do
-				DIALOG --menu "FTP Installation" 10 35 3 \
+				_dia_DIALOG --menu "FTP Installation" 10 35 3 \
 				"0" "Setup Network (Make sure the network is ok before continuing" \
 				"1" "Choose Mirror" \
 				"2" "Return to Main Menu" 2>$ANSWER
@@ -166,7 +166,7 @@ worker_prepare_disks()
         else
             DEFAULT=""
         fi
-        DIALOG $DEFAULT --menu "Prepare Hard Drive" 12 60 5 \
+        _dia_DIALOG $DEFAULT --menu "Prepare Hard Drive" 12 60 5 \
             "1" "Auto-Prepare (erases the ENTIRE hard drive)" \
             "2" "Partition Hard Drives" \
             "3" "Set Filesystem Mountpoints" \
@@ -222,14 +222,14 @@ worker_select_source ()
 worker_package_list() {
     # step dependencies
     if [ $S_SRC -eq 0 ]; then
-        DIALOG --msgbox "You must select an installation source!" 0 0
+        _dia_DIALOG --msgbox "You must select an installation source!" 0 0
         return 1
     fi
 
     # if selection has been done before, warn about loss of input
     # and let the user exit gracefully
     if [ $S_SELECT -ne 0 ]; then
-        DIALOG --yesno "WARNING: Running this stage again will result in the loss of previous package selections.\n\nDo you wish to continue?" 10 50 || return 1
+        _dia_DIALOG --yesno "WARNING: Running this stage again will result in the loss of previous package selections.\n\nDo you wish to continue?" 10 50 || return 1
     fi
 
 	interactive_select_packages