Merge bk://openembedded@openembedded.bkbits.net/packages

into chris.(none):/home/cwiiis/oe/packages

2004/09/13 01:32:32+01:00 (none)!cwiiis
Change dillo2 config slightly.

2004/09/13 01:31:38+01:00 (none)!cwiiis
Tweak permissions/devices related to collie.

BKrev: 4144eaafe7qVx8GFYBwgRmH73CPiog

4 files changed, 78 insertions, 2 deletions

diff --git a/base-files/base-files/collie/fstab b/base-files/base-files/collie/fstab
index 96eba78873..5b146a7da5 100644
--- a/base-files/base-files/collie/fstab
+++ b/base-files/base-files/collie/fstab
@@ -1,6 +1,6 @@
 /dev/mtdblock4	/ 	jffs2	defaults	1  1 
 proc            /proc   proc    defaults        0  0
-/dev/hda1	/mnt/cf	auto	defaults,sync,noauto,noatime,user,exec,suid	0  0
+/dev/hda1	/mnt/cf	auto	defaults,sync,noauto,noatime,user,exec,suid,gid=100,umask=0002	0  0
 /dev/mmcda1	/mnt/card	auto	defaults,sync,noauto,noatime,user,exec,suid	0  0
 tmpfs		/var	tmpfs	defaults	0  0
 
diff --git a/dillo/dillo2-0.6.6/dillorc b/dillo/dillo2-0.6.6/dillorc
index e69de29bb2..fce16dd957 100644
--- a/dillo/dillo2-0.6.6/dillorc
+++ b/dillo/dillo2-0.6.6/dillorc
@@ -0,0 +1,71 @@
+# dillorc
+# Sample dillo initialization file.
+# Lines that start with a '#' are comments.
+
+# Set the desired initial browser size
+geometry=240x310
+
+# Set the home location
+home=http://www.google.com/palm/
+
+# Set the proxy information for http
+#http_proxy=http://localhost:8080/
+
+# Set the domain to access without proxy
+#no_proxy = http://www.mynet.com/
+
+# If you prefer oblique over italic fonts, uncoment next line
+use_oblique=YES
+
+# Color Section
+# Here we can use the standard (and extended) html named color or 
+# the hexdecimal version (in C style)
+
+# Set the background color
+# bg_color=gray
+# bg_color=0xd6d6c0
+# bg_color=0xdcd1ba
+
+# Set the text color
+text_color=black
+
+# Set the link color
+link_color=blue
+
+# If you like white backgrounds, uncomment next line
+allow_white_bg=YES
+
+# Use the same colors with all documents?
+force_my_colors=NO
+
+# All fontsizes are scaled by this value (default is 1.0)
+font_factor=0.6
+
+# Show ALT popup for images?
+show_alt=YES
+
+# Size of dillo panel (used to enlarge the browsing area)
+# tiny   :  recommended for iPAQ (with small_icons)
+# medium :  nice!
+# large  :  Traditional
+panel_size=stack
+small_icons=YES
+
+# Set this to YES, if you want to limit the word wrap width to the vieport
+# width (may be useful for iPAQ)
+limit_text_width=YES
+
+use_dicache=YES
+
+show_back               = YES
+show_forw               = YES
+show_home               = YES
+show_save               = YES
+show_stop               = YES
+show_menubar            = YES
+show_clear_url          = YES
+show_url                = YES
+show_progress_box       = NO
+transient_dialogs       = YES
+
+# dillorc ends here.
diff --git a/initscripts/initscripts-1.0/collie/devices b/initscripts/initscripts-1.0/collie/devices
index 68570e4fef..d9ddba1b31 100644
--- a/initscripts/initscripts-1.0/collie/devices
+++ b/initscripts/initscripts-1.0/collie/devices
@@ -52,6 +52,11 @@ else
 	ln -sf /proc/self/fd /dev/fd
 	ln -sf /proc/kcore /dev/core
 	/sbin/makedevs -r / -D /etc/device_table
+	# Remove apm_bios - causes Zaurus to freeze on resume
+	rm -f /dev/apm_bios
+	# Change some permissions for non-root users
+	chmod 666 /dev/collie-fl
+	chmod 666 /dev/dsp
 	if test $? -ne 0; then
 		if test "$VERBOSE" != "no"; then echo "failed"; fi
 	else
diff --git a/pcmcia-cs/pcmcia-cs-3.2.8/ide.opts b/pcmcia-cs/pcmcia-cs-3.2.8/ide.opts
index bd3ac63fd5..e28cccda1a 100644
--- a/pcmcia-cs/pcmcia-cs-3.2.8/ide.opts
+++ b/pcmcia-cs/pcmcia-cs-3.2.8/ide.opts
@@ -8,7 +8,7 @@
 case "$ADDRESS" in
 *,*,*,1)
     #INFO="Sample IDE setup"
-    #DO_FSTAB="y";
+    DO_FSTAB="y";
     #DO_FSCK="y" ;
     DO_MOUNT="y"
     #FSTYPE="msdos"