X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=chboot;h=64e499ff484176dfbeaf98479bf5d3d9ddbf4dee;hb=a8ec695d6a39792133a21e9eca70e69f9fab107b;hp=37d2516bb1cf941753a949b6ff9a0259b4592470;hpb=e6da963744f05fc92ba515f1544fbbc0773f4d2f;p=automated-distro-installer

diff --git a/chboot b/chboot
index 37d2516..64e499f 100755
--- a/chboot
+++ b/chboot
@@ -1,18 +1,20 @@
-#!/bin/bash -x
+#!/bin/bash
 
 # Set grub to boot into a different distro, and reboot unless -r
-# $0 DISTRO_NAME
+# $0 [DISTRO_NAME]
+# with no argument, print available distros
 
 # DISTRO_NAME is based on the partition names in /boot. eg boot_debianjessie
 
 set -eE -o pipefail
-trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
+trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
 [[ $EUID == 0 ]] || exec sudo "$BASH_SOURCE" "$@"
 
 reboot=true
 while [[ $1 == -* ]]; do
     case $1 in
+        -d) set -x; shift ;;
         -r) reboot=false; shift ;;
         --) break ;;
     esac
@@ -23,6 +25,12 @@ distro=$1
 
 ###### end command line parsing #####
 
+if [[ ! $distro ]]; then
+    echo "available distros:"
+    btrfs subvolume list /boot | sed -rn 's/^.*boot_(.*)/\1/p'
+    exit 0
+fi
+
 if ! btrfs subvolume list /boot | grep "_$distro$" &>/dev/null; then
     echo "$0: error: _$distro$ not found in btrfs subvolume list /boot:"
     btrfs subvolume list /boot
@@ -46,3 +54,7 @@ e grub-bios-setup -d $mount_point/grub/i386-pc -s -m $mount_point/grub/device.ma
 
 e umount $mount_point
 e rmdir $mount_point
+
+if $reboot; then
+    reboot now
+fi