Author: codehelp
Date: 2010-07-06 13:49:27 +0100 (Tue, 06 Jul 2010)
New Revision: 1186
Modified:
balloon/tags/1.0-rc1/rootfs/emdebian/multistrap-balloon-CUED.conf
balloon/tags/1.0-rc1/rootfs/emdebian/multistrap-balloon.conf
balloon/tags/1.0-rc1/rootfs/emdebian/rootfs-config
Log:
update from trunk
Modified: balloon/tags/1.0-rc1/rootfs/emdebian/multistrap-balloon-CUED.conf
===================================================================
--- balloon/tags/1.0-rc1/rootfs/emdebian/multistrap-balloon-CUED.conf 2010-07-06 12:48:53 UTC (rev 1185)
+++ balloon/tags/1.0-rc1/rootfs/emdebian/multistrap-balloon-CUED.conf 2010-07-06 12:49:27 UTC (rev 1186)
@@ -35,14 +35,14 @@
suite=stable
[Updates]
-packages=apt
+packages=pcmciautils
source=
http://www.emdebian.org/grip
keyring=emdebian-archive-keyring
suite=stable-proposed-updates
# fallback
[Debian]
-packages=pcmciautils
+packages=
source=
http://ftp.uk.debian.org/debian
keyring=debian-archive-keyring
suite=stable
Modified: balloon/tags/1.0-rc1/rootfs/emdebian/multistrap-balloon.conf
===================================================================
--- balloon/tags/1.0-rc1/rootfs/emdebian/multistrap-balloon.conf 2010-07-06 12:48:53 UTC (rev 1185)
+++ balloon/tags/1.0-rc1/rootfs/emdebian/multistrap-balloon.conf 2010-07-06 12:49:27 UTC (rev 1186)
@@ -23,7 +23,7 @@
# debootstrap determines which repository is used to
# calculate the list of Priority: required packages
#debootstrap=Grip Trx850
-debootstrap=Grip Debian
+debootstrap=Grip Updates Debian
# the order of sections is no longer important.
# aptsources is a list of sections to be listed
# in the /etc/apt/sources.list.d/multistrap.sources.list
@@ -33,21 +33,20 @@
[Grip]
# space separated package list
packages=udev ntpdate iputils-ping
-#packages=udev ntpdate balloon3-config iputils-ping
#source=http://aptcache:3142/www.emdebian.org/grip
source=http://www.emdebian.org/grip
keyring=emdebian-archive-keyring
suite=stable
[Updates]
-packages=
+packages=pcmciautils balloon3-config
source=
http://www.emdebian.org/grip
keyring=emdebian-archive-keyring
suite=stable-proposed-updates
# fallback
[Debian]
-packages=pcmciautils
+packages=
source=
http://ftp.uk.debian.org/debian
keyring=debian-archive-keyring
suite=stable
Modified: balloon/tags/1.0-rc1/rootfs/emdebian/rootfs-config
===================================================================
--- balloon/tags/1.0-rc1/rootfs/emdebian/rootfs-config 2010-07-06 12:48:53 UTC (rev 1185)
+++ balloon/tags/1.0-rc1/rootfs/emdebian/rootfs-config 2010-07-06 12:49:27 UTC (rev 1186)
@@ -48,9 +48,8 @@
if [ ! -d $ROOTFS/etc/network ]; then mkdir -p $ROOTFS/etc/network; fi
if [ ! -d $ROOTFS/etc/init.d ]; then mkdir -p $ROOTFS/etc/init.d; fi
if [ ! -d $ROOTFS/etc/dhcp3 ]; then mkdir -p $ROOTFS/etc/dhcp3; fi
- if [ ! -d $ROOTFS/etc/apt/apt.conf.d/ ]; then
- mkdir -p $ROOTFS/etc/apt/apt.conf.d/
- fi
+ if [ ! -d $ROOTFS/lib/firmware ]; then mkdir -p $ROOTFS/lib/firmware; fi
+ if [ ! -d $ROOTFS/etc/apt/apt.conf.d/ ]; then mkdir -p $ROOTFS/etc/apt/apt.conf.d/; fi
cp -v $CONFIG/fstab $ROOTFS/etc/fstab
cp -v $CONFIG/interfaces $ROOTFS/etc/network/interfaces
cp -v $CONFIG/modules $ROOTFS/etc/modules
@@ -58,6 +57,8 @@
cp -v $CONFIG/urandom $ROOTFS/etc/init.d/
cp -v $CONFIG/inittab $ROOTFS/etc/
cp -v $CONFIG/10disablerecommends $ROOTFS/etc/apt/apt.conf.d/
+ cp -v $CONFIG/firmware/libertas_cs.fw $ROOTFS/lib/firmware/
+ cp -v $CONFIG/firmware/libertas_cs_helper.fw $ROOTFS/lib/firmware
# making devices so far missing between old and new multistrap versions preventing
# chroot from running into newly untarred rootfs
(cd $ROOTFS/dev; /sbin/MAKEDEV -v std )
@@ -81,8 +82,6 @@
fi
# stuff that can be left to 2nd stage:
- #Set root password
-# echo root:rootme | chpasswd
(cd $ROOTFS/dev; ln -sf urandom random)
#use bash, not dash - saves 10 seconds
# ... but we don't have dash ...
(text/plain)