Browse Source

Detect admin user for usb restore

Bob Mottram 9 years ago
parent
commit
acfab98045
1 changed files with 5 additions and 2 deletions
  1. 5
    2
      src/freedombone

+ 5
- 2
src/freedombone View File

3398
 
3398
 
3399
   echo '#!/bin/bash' > /usr/bin/$RESTORE_SCRIPT_NAME
3399
   echo '#!/bin/bash' > /usr/bin/$RESTORE_SCRIPT_NAME
3400
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
3400
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
3401
+  echo "COMPLETION_FILE=$COMPLETION_FILE" >> /usr/bin/$RESTORE_SCRIPT_NAME
3402
+  echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
3401
   echo "USB_DRIVE=$USB_DRIVE" >> /usr/bin/$RESTORE_SCRIPT_NAME
3403
   echo "USB_DRIVE=$USB_DRIVE" >> /usr/bin/$RESTORE_SCRIPT_NAME
3402
   echo 'if [ $1 ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3404
   echo 'if [ $1 ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3403
   echo '  USB_DRIVE=/dev/${1}1' >> /usr/bin/$RESTORE_SCRIPT_NAME
3405
   echo '  USB_DRIVE=/dev/${1}1' >> /usr/bin/$RESTORE_SCRIPT_NAME
3404
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3406
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3405
   echo "USB_MOUNT=$USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3407
   echo "USB_MOUNT=$USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
3406
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
3408
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
3407
-  echo "ADMIN_USERNAME=$MY_USERNAME" >> /usr/bin/$RESTORE_SCRIPT_NAME
3408
-  echo "MY_USERNAME=$MY_USERNAME" >> /usr/bin/$RESTORE_SCRIPT_NAME
3409
+  echo -n 'ADMIN_USERNAME=$(cat $COMPLETION_FILE | grep "Admin user" | ' >> /usr/bin/$RESTORE_SCRIPT_NAME
3410
+  echo "awk -F ':' '{print $2}')" >> /usr/bin/$RESTORE_SCRIPT_NAME
3411
+  echo 'MY_USERNAME=$ADMIN_USERNAME' >> /usr/bin/$RESTORE_SCRIPT_NAME
3409
   echo 'if [ $2 ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3412
   echo 'if [ $2 ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
3410
   echo '  MY_USERNAME=$2' >> /usr/bin/$RESTORE_SCRIPT_NAME
3413
   echo '  MY_USERNAME=$2' >> /usr/bin/$RESTORE_SCRIPT_NAME
3411
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
3414
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME