Changeset 7641 for 2.0/nanobsd

Timestamp:

Apr 1, 2010, 6:44:41 AM (15 years ago)

Author:

rick

Message:

Allow root passwd to be stored plain text, which is of course dangerous, but also practical when mass-building images

Location:

2.0/nanobsd/nanobsd

Files:

• cfg (modified) (1 prop)
• cfg/nanobsd.wleiden (modified) (2 diffs)
• tools/write-image.sh (modified) (1 diff)

2.0/nanobsd/nanobsd/cfg/nanobsd.wleiden

@@ -11 +11 @@
 NANO_IMAGES=2                   # aantal nanobsd code slices/installs (1/2)   
 #NANO_DRIVE=ad1                 # NanoBSD disk id, default is ad0
+
+NANO_ROOT_PASSWORD_FILE=$NANO_CONF_DIR/.root_passwd
 
 NANO_CONFSIZE=8192              # volume van de config slice, default 2048 (512bs) 
@@ -171 +173 @@
 cust_set_root_password() (
         if [ -n "${CFG_ROOT_PASSWORD}" ]; then
-                pprint 2 "Set root password using CFG_ROOT_PASSWORD variable"
-                chroot ${NANO_WORLDDIR} sh -c "echo '${CFG_ROOT_PASSWORD}' | pw usermod -h 0 -u root"
+                NANO_ROOT_PASSWORD=${CFG_ROOT_PASSWORD}
+                pprint 2 "Root password set using CFG_ROOT_PASSWORD variable"
+        elif [ -r "${NANO_ROOT_PASSWORD_FILE}" ]; then
+                NANO_ROOT_PASSWORD=`cat ${NANO_ROOT_PASSWORD_FILE}`
+                pprint 2 "Root password set using value at $NANO_ROOT_PASSWORD_FILE"
+        fi
+
+        if [ -n "${NANO_ROOT_PASSWORD}" ]; then
+                chroot ${NANO_WORLDDIR} sh -c "echo '${NANO_ROOT_PASSWORD}' | pw usermod -h 0 -u root"
         else
-                pprint 2 "Root password is <blank>, no password provided at variable CFG_ROOT_PASSWORD"
+                pprint 2 "Root password is <blank>, to populate password"
+                pprint 2 "  - variable CFG_ROOT_PASSWORD"
+                pprint 2 "  - template file $NANO_ROOT_PASSWORD_FILE" 
         fi
 )

2.0/nanobsd/nanobsd/tools/write-image.sh

@@ -53 +53 @@
 dd if=${IMG} of=/dev/${DA} bs=64k 2>${TMPFILE} &
 DD_PID=$!
-sleep 0.5
 while `ps ${DD_PID} >/dev/null`; do
   kill -INFO ${DD_PID}
-  sleep 0.1 #Micro delay allow TMPFILE to populate
+  sleep 1 #Micro delay allow TMPFILE to populate
   SIZE_DONE=`awk '/transferred/ {print $1}' ${TMPFILE}`
   SIZE_DONE=`echo "${SIZE_DONE} / 1024 / 1024" | bc -l`