From: nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>
Date: Fri, 17 Jun 2005 11:40:09 +0000 (+0000)
Subject: Merge bk://oe-devel.bkbits.net/openembedded
X-Git-Tag: Release-2010-05/1~9453^2~4428
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dda9d167f838c4670b5aabbde27affc406660a57;p=openembedded.git

Merge bk://oe-devel.bkbits.net/openembedded
into  bkbits.net:/repos/n/nslu2-linux/openembedded

2005/06/17 13:06:00+02:00 utwente.nl!koen
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into bitbake.utwente.nl:/home/koen/OE/openembedded

2005/06/17 13:05:45+02:00 utwente.nl!koen
familiar-0.8.3.conf:  adds some hints

2005/06/17 12:59:15+02:00 handhelds.org!CoreDump
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into handhelds.org:/home/mhentges/OpenEmbedded/bitbake/openembedded

2005/06/17 12:58:49+02:00 handhelds.org!CoreDump
altboot: Add password protection to init s and init=/bin/sh

BKrev: 42b2b699B11tvHNpkPG0-YyxZLjOkw
---

diff --git a/conf/distro/familiar-0.8.3.conf b/conf/distro/familiar-0.8.3.conf
index d4f6491b6a..fd8786e0d1 100644
--- a/conf/distro/familiar-0.8.3.conf
+++ b/conf/distro/familiar-0.8.3.conf
@@ -2,7 +2,7 @@ include conf/distro/familiar.conf
 
 DISTRO = "familiar"
 DISTRO_NAME = "Familiar Linux"
-DISTRO_VERSION = "v0.8.3-snapshots-${DATE}"
+DISTRO_VERSION = "v0.8.3-unofficial-unsupported-snapshot-${DATE}"
 
 DISTRO_TYPE = "debug"
 #DISTRO_TYPE = "release"
diff --git a/packages/altboot/altboot_20050616.bb b/packages/altboot/altboot_20050618.bb
similarity index 100%
rename from packages/altboot/altboot_20050616.bb
rename to packages/altboot/altboot_20050618.bb
diff --git a/packages/altboot/files/collie/altboot.cfg b/packages/altboot/files/collie/altboot.cfg
index fcc100ed33..389e3e987c 100644
--- a/packages/altboot/files/collie/altboot.cfg
+++ b/packages/altboot/files/collie/altboot.cfg
@@ -12,5 +12,8 @@ SD_DEVICE="/dev/mmcda1"
 SD_KERNEL_MODULE="/lib/modules/2.4.18-rmk7-pxa3-embedix/kernel/drivers/block/sharp_mmcsd_m.o"
 INIT_RUNLEVEL="5"
 NO_GUI_RL="2"
+MASTER_PASSWORD=""
+ASK_PW_ON_BOOT="no"
+
 SD_MOUNTPOINT="/media/card"
 CF_MOUNTPOINT="/media/cf"
diff --git a/packages/altboot/files/poodle/altboot.cfg b/packages/altboot/files/poodle/altboot.cfg
index fcc100ed33..389e3e987c 100644
--- a/packages/altboot/files/poodle/altboot.cfg
+++ b/packages/altboot/files/poodle/altboot.cfg
@@ -12,5 +12,8 @@ SD_DEVICE="/dev/mmcda1"
 SD_KERNEL_MODULE="/lib/modules/2.4.18-rmk7-pxa3-embedix/kernel/drivers/block/sharp_mmcsd_m.o"
 INIT_RUNLEVEL="5"
 NO_GUI_RL="2"
+MASTER_PASSWORD=""
+ASK_PW_ON_BOOT="no"
+
 SD_MOUNTPOINT="/media/card"
 CF_MOUNTPOINT="/media/cf"