Bläddra i källkod

Fixed username and password when generic images are created

Bob Mottram 9 år sedan
förälder
incheckning
653d6f2dec
2 ändrade filer med 16 tillägg och 7 borttagningar
  1. 7
    7
      src/freedombone-config
  2. 9
    0
      src/freedombone-image

+ 7
- 7
src/freedombone-config Visa fil

34
 PROJECT_NAME='freedombone'
34
 PROJECT_NAME='freedombone'
35
 
35
 
36
 # username created by default within a debian image
36
 # username created by default within a debian image
37
-DEFAULT_IMAGE_USERNAME='fbone'
37
+GENERIC_IMAGE_USERNAME='fbone'
38
 
38
 
39
 export TEXTDOMAIN=${PROJECT_NAME}-config
39
 export TEXTDOMAIN=${PROJECT_NAME}-config
40
 export TEXTDOMAINDIR="/usr/share/locale"
40
 export TEXTDOMAINDIR="/usr/share/locale"
475
         esac
475
         esac
476
         case $(cat $data) in
476
         case $(cat $data) in
477
             1) if [ -d /home/$MY_USERNAME/.gnupg ]; then
477
             1) if [ -d /home/$MY_USERNAME/.gnupg ]; then
478
-				   rm -rf /home/$MY_USERNAME/.gnupg
479
-			   fi
480
-			   break;;
478
+                   rm -rf /home/$MY_USERNAME/.gnupg
479
+               fi
480
+               break;;
481
             2) interactive_gpg_from_usb
481
             2) interactive_gpg_from_usb
482
                break;;
482
                break;;
483
             3) interactive_gpg_from_remote
483
             3) interactive_gpg_from_remote
653
         fi
653
         fi
654
     fi
654
     fi
655
 
655
 
656
-    if [ -d /home/$DEFAULT_IMAGE_USERNAME ]; then
656
+    if [ -d /home/$GENERIC_IMAGE_USERNAME ]; then
657
         # when installing from an image which comes with a known default user account
657
         # when installing from an image which comes with a known default user account
658
         selected_username=
658
         selected_username=
659
         while [ ! $selected_username ]
659
         while [ ! $selected_username ]
673
                    if [[ $possible_username != *' '* && $possible_username != *'/'* && $possible_username != *'\'* && $possible_username != *'*'* ]]; then
673
                    if [[ $possible_username != *' '* && $possible_username != *'/'* && $possible_username != *'\'* && $possible_username != *'*'* ]]; then
674
                        if [ $possible_username ]; then
674
                        if [ $possible_username ]; then
675
                            if [ ${#possible_username} -gt 1 ]; then
675
                            if [ ${#possible_username} -gt 1 ]; then
676
-                               if [[ $possible_username != $DEFAULT_IMAGE_USERNAME ]]; then
676
+                               if [[ $possible_username != $GENERIC_IMAGE_USERNAME ]]; then
677
                                    MY_USERNAME=$(cat $data)
677
                                    MY_USERNAME=$(cat $data)
678
-                                   usermod -l $MY_USERNAME $DEFAULT_IMAGE_USERNAME
678
+                                   usermod -l $MY_USERNAME $GENERIC_IMAGE_USERNAME
679
                                    usermod -d /home/$MY_USERNAME -m $MY_USERNAME
679
                                    usermod -d /home/$MY_USERNAME -m $MY_USERNAME
680
                                    break
680
                                    break
681
                                fi
681
                                fi

+ 9
- 0
src/freedombone-image Visa fil

33
 export TEXTDOMAIN=${PROJECT_NAME}-image
33
 export TEXTDOMAIN=${PROJECT_NAME}-image
34
 export TEXTDOMAINDIR="/usr/share/locale"
34
 export TEXTDOMAINDIR="/usr/share/locale"
35
 
35
 
36
+# fixed username and password when the --generic option is used
37
+GENERIC_IMAGE_USERNAME='fbone'
38
+GENERIC_IMAGE_PASSWORD='freedombone'
39
+
36
 IMAGE_TYPE='beaglebone'
40
 IMAGE_TYPE='beaglebone'
37
 CURR_DIR=$(pwd)
41
 CURR_DIR=$(pwd)
38
 CURR_USER=$(echo $USER)
42
 CURR_USER=$(echo $USER)
156
     fi
160
     fi
157
 fi
161
 fi
158
 
162
 
163
+if [[ $GENERIC_IMAGE == "yes" ]]; then
164
+    USERNAME=$GENERIC_IMAGE_USERNAME
165
+    PASSWORD=$GENERIC_IMAGE_PASSWORD
166
+fi
167
+
159
 if [ ! $PASSWORD ]; then
168
 if [ ! $PASSWORD ]; then
160
     # generate a random password
169
     # generate a random password
161
     PASSWORD="$(openssl rand -base64 10 | cut -c1-8)"
170
     PASSWORD="$(openssl rand -base64 10 | cut -c1-8)"