summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorMatthias Hentges <oe@hentges.net>2006-11-22 23:41:02 +0000
committerMatthias Hentges <oe@hentges.net>2006-11-22 23:41:02 +0000
commit3ecff9b21111cace7d073669bde234f68002bd94 (patch)
treebbca2c08b97615063c2de88111856b0509a672de /packages
parented3cbac197f767f226f8eb130f099f131b5f340a (diff)
parent60c2cae137da838048e25fc1778a547fd73c3e9b (diff)
merge of 'c29c2d80a9c5a2b26cc0510f7c58f76201aaebf0'
and 'd911fb03b7332d3d2f9b04109ce91081f3062e71'
Diffstat (limited to 'packages')
-rw-r--r--packages/altboot/altboot_0.0.0.bb2
-rw-r--r--packages/altboot/altboot_wip.bb (renamed from packages/altboot/altboot_1.1.0-wip.bb)17
-rw-r--r--packages/altboot/files/altboot.func11
-rw-r--r--packages/altboot/files/poodle/altboot-2.6.cfg4
4 files changed, 22 insertions, 12 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/altboot_1.1.0-wip.bb b/packages/altboot/altboot_wip.bb
index 1ca672d7ce..7e6d06e943 100644
--- a/packages/altboot/altboot_1.1.0-wip.bb
+++ b/packages/altboot/altboot_wip.bb
@@ -23,8 +23,10 @@ RDEPENDS_${PN}-conf = "${PN}"
######################################################################################
-WIP_DATE = "20061120"
-PR = "${WIP_DATE}-r1"
+WIP_DATE = "20061123"
+
+PV = "1.1.1+wip-${WIP_DATE}"
+PR = "r0"
######################################################################################
@@ -34,15 +36,15 @@ PACKAGE_ARCH_${PN} = "all"
PACKAGE_ARCH_${PN}-doc = "all"
PACKAGE_ARCH_${PN}-conf = "${MACHINE}"
-TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-')}"
+TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-').replace('+', '-')}"
-SRC_URI = "cvs://anonymous@hentges.net/hentgescvs;method=pserver;tag=${TAG}-${WIP_DATE};module=altboot"
+SRC_URI = "cvs://anonymous@hentges.net/hentgescvs;method=pserver;tag=${TAG};module=altboot"
S = "${WORKDIR}/altboot/"
######################################################################################
-FILES_${PN}-conf = "/etc/altboot*.cfg"
+FILES_${PN}-conf = "/etc/altboot*cfg"
######################################################################################
@@ -53,12 +55,13 @@ do_install() {
install -d ${D}/etc/altboot.rc
install -d ${D}/usr/share/doc/altboot
install -d ${D}/usr/share/sounds
+ install -d ${D}/etc/skel/altboot
if test -d ${WORKDIR}/altboot/${MACHINE}
then
- install -m 0644 ${WORKDIR}/altboot/${MACHINE}/altboot*.cfg ${D}/etc
+ install -m 0644 ${WORKDIR}/altboot/${MACHINE}/altboot*.cfg ${D}/etc/
else
- install -m 0644 ${WORKDIR}/altboot/altboot*.cfg ${D}/etc
+ install -m 0644 ${WORKDIR}/altboot/altboot*.cfg ${D}/etc/
fi
install -m 0644 ${WORKDIR}/altboot/beep.raw ${D}/usr/share/sounds
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"