From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 16 Jun 2016 19:03:12 +0000 (-0300)
Subject: Bootless: always use first partition
X-Git-Tag: 0.2.4~152
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=2796dfabc22e9e8fa5410b7fabead24f93f81054;p=hydra.git

Bootless: always use first partition
---

diff --git a/doc/todo.rst b/doc/todo.rst
index 7a19a7d..e88294f 100644
--- a/doc/todo.rst
+++ b/doc/todo.rst
@@ -3,7 +3,6 @@ TODO
 
 - proper documentation.
 - install: move to /usr/local/share/hydra.
-- bootless: always use first partition (like `/dev/sdb1`).
 - ssh-config: hydra integration using a proxy command.
 - init: version control in the superproject?
 - metrics and alarms subsystem.
diff --git a/share/hydra/bootless b/share/hydra/bootless
index 774f9fa..7f7de0f 100755
--- a/share/hydra/bootless
+++ b/share/hydra/bootless
@@ -76,14 +76,13 @@ EOF
     echo -n "Target device: "
     read device
   else
-    device=$1
+    usbdevice=$1
+    device="${usbdevice}1"
   fi
 
   if [ "$2" == "--rsync" ]; then
     rsync="true"
   fi
-
-  usbdevice=`echo ${device} | sed -e s/[0-9]\$//g`
   
   # Issue a warning
   hydra_bootless_warning ${device}
@@ -170,7 +169,8 @@ function hydra_bootless_update {
     echo -n "Target device: "
     read device
   else
-    device=$1
+    usbdevice=$1
+    device="${usbdevice}1"
   fi
 
   # Target device consistency check