diff --git a/setup.sh b/setup.sh index 57c481e..36f45ab 100644 --- a/setup.sh +++ b/setup.sh @@ -5,11 +5,11 @@ # fresh update on apt in Ubuntu echo "" echo "Updating local packages..." -apt-add-repository universe >/dev/null 2>/dev/null && apt update >/dev/null 2>/dev/null +errors=`apt-add-repository universe >/dev/null 2>/dev/null && apt update >/dev/null 2>/dev/null` if [ "$?" = "0" ]; then echo "Done." else - echo "Failed to add universal repository, update apt repository - possibly bad network connection." + echo "Failed to add universal repository, update apt repository - $errors" exit 1 fi @@ -31,13 +31,13 @@ window=$((height - 5)) # set line separator devices=""; for device in $(ls /dev/disk/by-id | grep -v part); do devices="$devices $device off"; done disks=`dialog --separate-output --no-cancel --no-items --title "Root devices" --checklist "Select boot drives" $height $width ${window}$devices 2>&1 1>/dev/tty` -raidtype=`dialog --no-items --no-cancel --title "Root pool ZFS RAID" --radiolist "Select root pool ZFS RAID type" 11 35 4 raidz off raidz2 off mirror off none off 2>&1 1>/dev/tty` +raidtype=`dialog --no-items --no-cancel --title "Root pool ZFS RAID" --radiolist "Select root pool ZFS RAID type" 12 35 5 raidz off raidz2 off raidz3 off mirror off none off 2>&1 1>/dev/tty` hostname=""; while [ -z "$hostname" ]; do hostname=`dialog --no-cancel --inputbox "Host name/Server name" 8 100 2>&1 >/dev/tty`; done nicdevices=""; for nic in $(ip -o link show | awk -F': ' '{print $2}' | grep -v '^lo'); do nicdevices="$nicdevices $nic off"; done nics=`dialog --separate-output --no-cancel --no-items --title "Network devices for bridge" --checklist "Select the network devices to be bridged" $height $width ${window}$nicdevices 2>&1 1>/dev/tty` -rootpassword=`dialog --no-cancel -title "Root password" --passwordbox "Enter root password" $height $width 2>&1 1>/dev/tty` +rootpassword=`dialog --no-cancel --title "Root password" --passwordbox "Enter root password" $height $width 2>&1 1>/dev/tty` timezone=`dialog --no-cancel --title "Timezone" --inputbox "Enter time zone" $height $width "America/Los_Angeles" 2>&1 1>/dev/tty` @@ -108,7 +108,7 @@ fi echo "Done." echo "" -echo "Starting debian bootstrap..." +echo "Starting debian bootstrap - this can take some time..." debootstrap bionic /mnt #errors=`debootstrap bionic /mnt 2>&1 1>/dev/null` if ! [ "$?" = "0" ]; then