[oe-commits] org.oe.dev altboot: Unb0rk Poodles 2.6 conf from last commit and store the master password in a new file (altboot.pwd)

[coredump commit]

altboot: Unb0rk Poodles 2.6 conf from last commit and store the master password in a new file (altboot.pwd)

Author: coredump at openembedded.org
Branch: org.openembedded.dev
Revision: d4a51260c20d7adc010d91e4fac092745ba96949
ViewMTN: http://monotone.openembedded.org/revision.psp?id=d4a51260c20d7adc010d91e4fac092745ba96949
Files:
1
packages/altboot/altboot_0.0.0.bb
packages/altboot/files/altboot.func
packages/altboot/files/poodle/altboot-2.6.cfg
Diffs:

#
# mt diff -r5baf3dd3396a138bcabc954f2907abada5e084da -rd4a51260c20d7adc010d91e4fac092745ba96949
#
# 
# 
# patch "packages/altboot/altboot_0.0.0.bb"
#  from [23de494f904ad306edceae0aef6345bfe14d54ac]
#    to [ac1cef2492ce008c30558aa9590ce788684efa07]
# 
# patch "packages/altboot/files/altboot.func"
#  from [dd7a58cf92a4de2e7ff86c5a230519f2d3d991e3]
#    to [a5d097e9872bac7bbf58608bf1d454b3fc54fa95]
# 
# patch "packages/altboot/files/poodle/altboot-2.6.cfg"
#  from [74cf0b9e6fad6052a6d2b92d8645f3e78ef7e53d]
#    to [752664abb465a489ed38bf1517b47431554273f9]
# 
============================================================
--- packages/altboot/altboot_0.0.0.bb	23de494f904ad306edceae0aef6345bfe14d54ac
+++ packages/altboot/altboot_0.0.0.bb	ac1cef2492ce008c30558aa9590ce788684efa07
@@ -20,7 +20,7 @@ RDEPENDS_${PN} = "${PN}-conf"
 
 ######################################################################################
 
-PR = "r50"
+PR = "r51"
 
 ######################################################################################
 
============================================================
--- packages/altboot/files/altboot.func	dd7a58cf92a4de2e7ff86c5a230519f2d3d991e3
+++ packages/altboot/files/altboot.func	a5d097e9872bac7bbf58608bf1d454b3fc54fa95
@@ -330,6 +330,9 @@ set_password() {
 
 # This functions configures the master password for altboot if none is set
 set_password() {
+
+	test -e /etc/altboot.pwd && . /etc/altboot.pwd	
+
 	mount -o remount,rw /
 	if test -z "$MASTER_PASSWORD" -a "$ENABLE_DEBUG" != yes
 	then
@@ -358,14 +361,15 @@ set_password() {
 				then
 					crypt_pw="`echo "$junk1" | md5sum | awk '{print $1}'`"
 					
-					if test -e "${ALTBOOT_CFG_FILE}"
+					if test -e "/etc/altboot.pwd"
 					then
 						sed "/^MASTER_PASSWORD/s/\(.*\=\).*/\1\"$crypt_pw\"/" "${ALTBOOT_CFG_FILE}" > ${ALTBOOT_CFG_FILE}_
 						mv ${ALTBOOT_CFG_FILE}_ ${ALTBOOT_CFG_FILE}
 						MASTER_PASSWORD="$crypt_pw"
 						echo "Password changed."
 					else
-						echo "${ALTBOOT_CFG_FILE} is missing, no password saved"
+						echo "MASTER_PASSWORD=\"$crypt_pw\"" > /etc/altboot.pwd
+						echo "Password installed"
 					fi
 					
 					break
@@ -380,6 +384,9 @@ verify_master_pw() {
 
 # This function asks for altboots master password. It only returns if the correct password was supplied
 verify_master_pw() {
+	
+	test -e /etc/altboot.pwd && . /etc/altboot.pwd
+	
 	if ! test -z "$MASTER_PASSWORD"
 	then
 		auth_timeout="3"
============================================================
--- packages/altboot/files/poodle/altboot-2.6.cfg	74cf0b9e6fad6052a6d2b92d8645f3e78ef7e53d
+++ packages/altboot/files/poodle/altboot-2.6.cfg	752664abb465a489ed38bf1517b47431554273f9
@@ -10,7 +10,7 @@ SH_SHELL="/bin/sh"
 REAL_INIT="/sbin/init.sysvinit"
 SH_SHELL="/bin/sh"
 
-ENABLE_SOUND="no"
+ENABLE_SOUND="yes"
 
 IMAGE_PATH="boot-images"
 IMAGE_TYPE="ext2"
@@ -20,7 +20,7 @@ SD_KERNEL_MODULE=""
 SD_DEVICE="/dev/mmcblk0p1"
 SD_KERNEL_MODULE=""
 
-USB_HOST_AVAILABLE="yes"
+USB_HOST_AVAILABLE="no"
 USB_STORAGE_MODULES="ohci_hcd usb_storage sd_mod"
 USB_STORAGE_PARTITION="/dev/sda1"
 USB_STORAGE_WAIT="4"