summaryrefslogtreecommitdiff
path: root/packages/altboot
diff options
context:
space:
mode:
authorMatthias Hentges <oe@hentges.net>2006-11-22 23:29:59 +0000
committerMatthias Hentges <oe@hentges.net>2006-11-22 23:29:59 +0000
commit07dc1c42dbd32cdc785c0795634c5372fbe73615 (patch)
treea464cba3db9c8850953fd154820d49478e36c164 /packages/altboot
parent04e7cf35464cf06291eac2ddb1262db11f68e092 (diff)
altboot: Unb0rk Poodles 2.6 conf from last commit and store the master password in a new file (altboot.pwd)
Diffstat (limited to 'packages/altboot')
-rw-r--r--packages/altboot/altboot_0.0.0.bb2
-rw-r--r--packages/altboot/files/altboot.func11
-rw-r--r--packages/altboot/files/poodle/altboot-2.6.cfg4
3 files changed, 12 insertions, 5 deletions
diff --git a/packages/altboot/altboot_0.0.0.bb b/packages/altboot/altboot_0.0.0.bb
index 8cc722e603..be73b0caed 100644
--- a/packages/altboot/altboot_0.0.0.bb
+++ b/packages/altboot/altboot_0.0.0.bb
@@ -20,7 +20,7 @@ RDEPENDS_${PN} = "${PN}-conf"
######################################################################################
-PR = "r50"
+PR = "r51"
######################################################################################
diff --git a/packages/altboot/files/altboot.func b/packages/altboot/files/altboot.func
index a4ac6ed337..75808090ba 100644
--- a/packages/altboot/files/altboot.func
+++ b/packages/altboot/files/altboot.func
@@ -330,6 +330,9 @@ image_conf(){
# 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 @@ set_password() {
# 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"
diff --git a/packages/altboot/files/poodle/altboot-2.6.cfg b/packages/altboot/files/poodle/altboot-2.6.cfg
index 908a9ac88f..f867db6b05 100644
--- a/packages/altboot/files/poodle/altboot-2.6.cfg
+++ b/packages/altboot/files/poodle/altboot-2.6.cfg
@@ -10,7 +10,7 @@ TIMEOUT="4"
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 @@ ENABLE_IMAGECONF="yes"
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"