ipcop-svn Mailing List for IPCop Firewall (Page 300)

ipcop-svn — IPCop Subversion mailing list

You can subscribe to this list here.

2007	Jan	Feb	Mar	Apr (330)	May (46)	Jun (52)	Jul (39)	Aug (26)	Sep (12)	Oct (110)	Nov (178)	Dec (161)
2008	Jan (99)	Feb (106)	Mar (97)	Apr (93)	May (81)	Jun (112)	Jul (84)	Aug (142)	Sep (165)	Oct (89)	Nov (120)	Dec (117)
2009	Jan (141)	Feb (137)	Mar (121)	Apr (96)	May (207)	Jun (194)	Jul (210)	Aug (155)	Sep (91)	Oct (159)	Nov (123)	Dec (166)
2010	Jan (142)	Feb (79)	Mar (137)	Apr (126)	May (78)	Jun (69)	Jul (54)	Aug (161)	Sep (76)	Oct (98)	Nov (113)	Dec (95)
2011	Jan (101)	Feb (118)	Mar (74)	Apr (75)	May (32)	Jun (32)	Jul (39)	Aug (74)	Sep (48)	Oct (134)	Nov (133)	Dec (55)
2012	Jan (94)	Feb (143)	Mar (80)	Apr (75)	May (36)	Jun (46)	Jul (47)	Aug (51)	Sep (10)	Oct (36)	Nov (38)	Dec (19)
2013	Jan (26)	Feb (40)	Mar (48)	Apr (26)	May (34)	Jun (20)	Jul (18)	Aug (10)	Sep (8)	Oct (6)	Nov (64)	Dec (18)
2014	Jan (26)	Feb (42)	Mar (126)	Apr (122)	May (73)	Jun (33)	Jul (14)	Aug (20)	Sep (12)	Oct (33)	Nov (20)	Dec (49)
2015	Jan (79)	Feb (64)	Mar (49)	Apr (6)	May (9)	Jun (2)	Jul (27)	Aug	Sep	Oct (4)	Nov (1)	Dec (12)
2016	Jan (72)	Feb (9)	Mar (13)	Apr (1)	May	Jun (1)	Jul	Aug (1)	Sep (1)	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 298 299 300 301 302 .. 325 > >> (Page 300 of 325)

[Ipcop-svn] SF.net SVN: ipcop: [634] ipcop/trunk/lfs/hwinfo2

From: <dot...@us...> - 2007-11-02 15:54:25

Revision: 634
          http://ipcop.svn.sourceforge.net/ipcop/?rev=634&view=rev
Author:   dotzball
Date:     2007-11-02 08:54:28 -0700 (Fri, 02 Nov 2007)

Log Message:
-----------
Fix file name.

Modified Paths:
--------------
    ipcop/trunk/lfs/hwinfo2

Modified: ipcop/trunk/lfs/hwinfo2
===================================================================
--- ipcop/trunk/lfs/hwinfo2	2007-11-02 12:19:22 UTC (rev 633)
+++ ipcop/trunk/lfs/hwinfo2	2007-11-02 15:54:28 UTC (rev 634)
@@ -53,10 +53,10 @@
 objects = $(DL_FILE) \
 $(PKG_NAME)_$(VER)-1.diff.gz \
 dbus_1.1.1.orig.tar.gz \
-hal_0.5.9.1.orig.tar.gz 
+hal_0.5.9.1.orig.tar.gz
 
 $(DL_FILE)			= $(DL_FROM)/$(DL_FILE)
-$(PKG_NAME)_$(VER)-1.diff.gz	= $(DL_FROM)/$(THISAPP)-1.diff.gz
+$(PKG_NAME)_$(VER)-1.diff.gz	= $(DL_FROM)/$(PKG_NAME)_$(VER)-1.diff.gz
 dbus_1.1.1.orig.tar.gz		= $(URL_DEBIAN)/d/dbus/dbus_1.1.1.orig.tar.gz
 hal_0.5.9.1.orig.tar.gz		= $(URL_DEBIAN)/h/hal/hal_0.5.9.1.orig.tar.gz
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Ipcop-svn] SF.net SVN: ipcop: [633] ipcop/trunk

From: <ow...@us...> - 2007-11-02 12:19:17

Revision: 633
          http://ipcop.svn.sourceforge.net/ipcop/?rev=633&view=rev
Author:   owes
Date:     2007-11-02 05:19:22 -0700 (Fri, 02 Nov 2007)

Log Message:
-----------
Logwatch v7 has moved it's paths to /etc/logwatch, follow that.
Copy wanted scripts instead of removing unwanted, much easier when logwatch adds scripts. 

Modified Paths:
--------------
    ipcop/trunk/config/rootfiles/common/logwatch
    ipcop/trunk/lfs/logwatch
    ipcop/trunk/src/misc-progs/logwatch.c

Modified: ipcop/trunk/config/rootfiles/common/logwatch
===================================================================
--- ipcop/trunk/config/rootfiles/common/logwatch	2007-11-02 11:32:30 UTC (rev 632)
+++ ipcop/trunk/config/rootfiles/common/logwatch	2007-11-02 12:19:22 UTC (rev 633)
@@ -1,106 +1,42 @@
-## logwatch-7.2.1
+## logwatch-7.3.6
 ##
-etc/log.d
-#etc/log.d/conf
-#etc/log.d/conf/html
-#etc/log.d/conf/html/footer.html
-#etc/log.d/conf/html/header.html
-#etc/log.d/conf/ignore.conf
-#etc/log.d/conf/logfiles
-#etc/log.d/conf/logfiles/daemon.conf
-#etc/log.d/conf/logfiles/dnssec.conf
-#etc/log.d/conf/logfiles/http.conf
-#etc/log.d/conf/logfiles/iptables.conf
-#etc/log.d/conf/logfiles/kernel.conf
-#etc/log.d/conf/logfiles/messages.conf
-#etc/log.d/conf/logfiles/qmail-pop3d-current.conf
-#etc/log.d/conf/logfiles/qmail-pop3ds-current.conf
-#etc/log.d/conf/logfiles/qmail-send-current.conf
-#etc/log.d/conf/logfiles/qmail-smtpd-current.conf
-#etc/log.d/conf/logfiles/resolver.conf
-#etc/log.d/conf/logfiles/secure.conf
-#etc/log.d/conf/logfiles/syslog.conf
-#etc/log.d/conf/logfiles/windows.conf
-#etc/log.d/conf/logwatch.conf
-#etc/log.d/conf/services
-#etc/log.d/conf/services/dhcpd.conf
-#etc/log.d/conf/services/dnssec.conf
-#etc/log.d/conf/services/dovecot.conf
-#etc/log.d/conf/services/eximstats.conf
-#etc/log.d/conf/services/http.conf
-#etc/log.d/conf/services/init.conf
-#etc/log.d/conf/services/iptables.conf
-#etc/log.d/conf/services/kernel.conf
-#etc/log.d/conf/services/modprobe.conf
-#etc/log.d/conf/services/openvpn.conf
-#etc/log.d/conf/services/pam_unix.conf
-#etc/log.d/conf/services/pluto.conf
-#etc/log.d/conf/services/qmail-pop3d.conf
-#etc/log.d/conf/services/qmail-pop3ds.conf
-#etc/log.d/conf/services/qmail-send.conf
-#etc/log.d/conf/services/qmail-smtpd.conf
-#etc/log.d/conf/services/raid.conf
-#etc/log.d/conf/services/resolver.conf
-#etc/log.d/conf/services/scsi.conf
-#etc/log.d/conf/services/secure.conf
-#etc/log.d/conf/services/slon.conf
-#etc/log.d/conf/services/sshd.conf
-#etc/log.d/conf/services/sshd2.conf
-#etc/log.d/conf/services/syslogd.conf
-#etc/log.d/conf/services/windows.conf
-#etc/log.d/conf/services/xntpd.conf
-#etc/log.d/conf/services/zz-disk_space.conf
-#etc/log.d/conf/services/zz-network.conf
-#etc/log.d/conf/services/zz-sys.conf
-#etc/log.d/lib
-#etc/log.d/lib/Logwatch.pm
-#etc/log.d/scripts
-#etc/log.d/scripts/logwatch.pl
-#etc/log.d/scripts/services
-#etc/log.d/scripts/services/dhcpd
-#etc/log.d/scripts/services/dnssec
-#etc/log.d/scripts/services/dovecot
-#etc/log.d/scripts/services/eximstats
-#etc/log.d/scripts/services/http
-#etc/log.d/scripts/services/init
-#etc/log.d/scripts/services/iptables
-#etc/log.d/scripts/services/kernel
-#etc/log.d/scripts/services/modprobe
-#etc/log.d/scripts/services/openvpn
-#etc/log.d/scripts/services/pam_unix
-#etc/log.d/scripts/services/pluto
-#etc/log.d/scripts/services/qmail-pop3d
-#etc/log.d/scripts/services/qmail-pop3ds
-#etc/log.d/scripts/services/qmail-send
-#etc/log.d/scripts/services/qmail-smtpd
-#etc/log.d/scripts/services/raid
-#etc/log.d/scripts/services/resolver
-#etc/log.d/scripts/services/scsi
-#etc/log.d/scripts/services/secure
-#etc/log.d/scripts/services/slon
-#etc/log.d/scripts/services/sshd
-#etc/log.d/scripts/services/sshd2
-#etc/log.d/scripts/services/syslogd
-#etc/log.d/scripts/services/windows
-#etc/log.d/scripts/services/xntpd
-#etc/log.d/scripts/services/zz-disk_space
-#etc/log.d/scripts/services/zz-network
-#etc/log.d/scripts/services/zz-sys
-#etc/log.d/scripts/shared
-#etc/log.d/scripts/shared/applybinddate
-#etc/log.d/scripts/shared/applyhttpdate
-#etc/log.d/scripts/shared/applystddate
-#etc/log.d/scripts/shared/applytaidate
-#etc/log.d/scripts/shared/applyusdate
-#etc/log.d/scripts/shared/expandrepeats
-#etc/log.d/scripts/shared/hosthash
-#etc/log.d/scripts/shared/hostlist
-#etc/log.d/scripts/shared/multiservice
-#etc/log.d/scripts/shared/onlycontains
-#etc/log.d/scripts/shared/onlyhost
-#etc/log.d/scripts/shared/onlyservice
-#etc/log.d/scripts/shared/remove
-#etc/log.d/scripts/shared/removeheaders
-#etc/log.d/scripts/shared/removeservice
+etc/logwatch
+#etc/logwatch/conf/logfiles/http.conf
+#etc/logwatch/conf/logfiles/messages.conf
+#etc/logwatch/conf/logfiles/secure.conf
+#etc/logwatch/conf/services/dhcpd.conf
+#etc/logwatch/conf/services/http.conf
+#etc/logwatch/conf/services/init.conf
+#etc/logwatch/conf/services/kernel.conf
+#etc/logwatch/conf/services/modprobe.conf
+#etc/logwatch/conf/services/openvpn.conf
+#etc/logwatch/conf/services/pam_unix.conf
+#etc/logwatch/conf/services/pluto.conf
+#etc/logwatch/conf/services/raid.conf
+#etc/logwatch/conf/services/scsi.conf
+#etc/logwatch/conf/services/secure.conf
+#etc/logwatch/conf/services/sshd.conf
+#etc/logwatch/conf/services/sshd2.conf
+#etc/logwatch/conf/services/syslogd.conf
+#etc/logwatch/conf/services/xntpd.conf
+#etc/logwatch/conf/services/zz-disk_space.conf
+#etc/logwatch/conf/services/zz-network.conf
+#etc/logwatch/scripts/services/dhcpd
+#etc/logwatch/scripts/services/http
+#etc/logwatch/scripts/services/init
+#etc/logwatch/scripts/services/kernel
+#etc/logwatch/scripts/services/modprobe
+#etc/logwatch/scripts/services/openvpn
+#etc/logwatch/scripts/services/pam_unix
+#etc/logwatch/scripts/services/pluto
+#etc/logwatch/scripts/services/raid
+#etc/logwatch/scripts/services/scsi
+#etc/logwatch/scripts/services/secure
+#etc/logwatch/scripts/services/sshd
+#etc/logwatch/scripts/services/sshd2
+#etc/logwatch/scripts/services/syslogd
+#etc/logwatch/scripts/services/xntpd
+#etc/logwatch/scripts/services/zz-disk_space
+#etc/logwatch/scripts/services/zz-network
 #usr/share/man/man8/logwatch.8
 var/log/logwatch

Modified: ipcop/trunk/lfs/logwatch
===================================================================
--- ipcop/trunk/lfs/logwatch	2007-11-02 11:32:30 UTC (rev 632)
+++ ipcop/trunk/lfs/logwatch	2007-11-02 12:19:22 UTC (rev 633)
@@ -82,42 +82,54 @@
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 
-	-mkdir -p /etc/log.d /var/log/logwatch
+	-mkdir -p /etc/logwatch/lib /var/log/logwatch
+	-mkdir -p /etc/logwatch/conf/{logfiles,services}
+	-mkdir -p /etc/logwatch/scripts/{services,shared}
 	chown logwatch:nobody /var/log/logwatch
-	cd $(DIR_APP) && cp -Rf conf scripts lib /etc/log.d
-	cd $(DIR_APP) && install -m 0755 scripts/logwatch.pl /etc/log.d/scripts/logwatch.pl
+	cd $(DIR_APP) && cp -Rf lib /etc/logwatch
+	cd $(DIR_APP) && cp conf/{logwatch.conf,ignore.conf} /etc/logwatch/conf
+	cd $(DIR_APP) && cp scripts/shared/* /etc/logwatch/scripts/shared
+	cd $(DIR_APP) && install -m 0755 scripts/logwatch.pl /etc/logwatch/scripts/logwatch.pl
 	cd $(DIR_APP) && install -m 0644 logwatch.8 /usr/share/man/man8
-	sed -i 's/^Print = .*$$/Print = Yes/' /etc/log.d/conf/logwatch.conf
-	# comment out line with unused example
-	sed -i '/-zz-network/s/Service/#Service/' /etc/log.d/conf/logwatch.conf
-	# fix typo in output
-	sed -i '/MB transfered/s/transfered/transferred/' /etc/log.d/scripts/services/http
 
-	# Strip out some filters for services we don't run - no point wasting log keeping them
+        # change BaseDir
+	sed -i -e 's/my $$BaseDir = .*/my $$BaseDir = "\/etc\/logwatch";/' /etc/logwatch/scripts/logwatch.pl
+	# change TmpDir
+	sed -i -e 's/TmpDir = .*/TmpDir = \/tmp/' /etc/logwatch/conf/logwatch.conf
+	sed -i 's/^Print = .*$$/Print = Yes/' /etc/logwatch/conf/logwatch.conf
+	# comment out lines with unused example
+	sed -i '/-zz-network/s/Service/#Service/' /etc/logwatch/conf/logwatch.conf
+	sed -i '/-zz-sys/s/Service/#Service/' /etc/logwatch/conf/logwatch.conf
+	sed -i '/-eximstats/s/Service/#Service/' /etc/logwatch/conf/logwatch.conf
+
+	# Copy only those filters for services we run
 	# cron filter don't support fcron
-	# final selection for remaining files is in rootfile
-	UNNEEDED="afpd amavis arpwatch audit automount autorpm cisco clamav clamav-milter \
-		clam-update courier cron emerge exim extreme-networks ftpd-messages ftpd-xferlog \
-		imapd identd in.qpopper ipop3d maillog mailscanner mountd named netopia netscreen \
-		oidentd pam pam_pwdb pop3 portsentry postfix pound proftpd-messages pureftp \
-		pureftpd qmail rt314 saslauthd samba sendmail sendmail-largeboxes shaperd smartd \
-		sonicwall stunnel sudo tac_acc up2date vpopmail vsftpd xferlog yum zz-fortune" && \
-		for i in $$UNNEEDED ; do \
-			rm -f /etc/log.d/{conf,scripts}/services/$$i{,.conf} /etc/log.d/conf/logfiles/$$i.conf; \
+	NEEDED="dhcpd http init kernel modprobe openvpn pam_unix pluto \
+		raid scsi secure sshd sshd2 syslogd xntpd \
+		zz-disk_space zz-network" && \
+		for i in $$NEEDED ; do \
+			cp -f $(DIR_APP)/conf/services/$$i.conf /etc/logwatch/conf/services; \
+			cp -f $(DIR_APP)/scripts/services/$$i   /etc/logwatch/scripts/services; \
 		done
-	rm -rf /etc/log.d/scripts/logfiles
+	# Copy logfiles
+	NEEDED="http messages secure" && \
+		for i in $$NEEDED ; do \
+			cp -f $(DIR_APP)/conf/logfiles/$$i.conf /etc/logwatch/conf/logfiles; \
+		done
 
-	sed -i 's/df -h/df -h -x rootfs/' /etc/log.d/scripts/services/zz-disk_space
+	# fix typo in output
+	sed -i '/MB transfered/s/transfered/transferred/' /etc/logwatch/scripts/services/http
+	sed -i 's/df -h/df -h -x rootfs/' /etc/logwatch/scripts/services/zz-disk_space
 
-	for i in `find /etc/log.d -type f`; do \
+	for i in `find /etc/logwatch -type f`; do \
 		sed -i 's/perl -w/perl/' $$i; \
 	done
 
 	# The httpd log checker script considers any request containing the word
 	# null to be an exploit attempt, reverse this behaviour as we have a
 	# null.gif
-	sed -i -e "/ 'null',/d" /etc/log.d/scripts/services/http
-	chmod -R 755 /etc/log.d
+	sed -i -e "/ 'null',/d" /etc/logwatch/scripts/services/http
+	chmod -R 755 /etc/logwatch
 
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)

Modified: ipcop/trunk/src/misc-progs/logwatch.c
===================================================================
--- ipcop/trunk/src/misc-progs/logwatch.c	2007-11-02 11:32:30 UTC (rev 632)
+++ ipcop/trunk/src/misc-progs/logwatch.c	2007-11-02 12:19:22 UTC (rev 633)
@@ -21,7 +21,7 @@
 
 /* Lots of distros just run logwatch as root from cron, but logwatch doesn't
  * need any root privs, just the ability to access it's filter scripts
- * (/etc/log.d/) and the log files (under /var/log/). By creating a logwatch
+ * (/etc/logwatch/) and the log files (under /var/log/). By creating a logwatch
  * user and group and ensuring it has read access to the logs we can run
  * logwatch unprivileged. Apart from the principle of least privilege running
  * logwatch as root turns out to be doubly a bad idea because a flaw in the way
@@ -33,7 +33,7 @@
  * it's basic aim is to allow a root cron job to safely run logcheck; as such
  * it will drop privileges, becoming the locheck user & group then run
  * logcheck. In many ways this is much the same as getting cron to run
- *    su -s /etc/log.d/scripts/logwatch.pl
+ *    su -s /etc/logwatch/scripts/logwatch.pl
  * the wrapper however is able to read configuration info from /var/ipcop and
  * pass the correct args to logwatch
  */
@@ -104,7 +104,7 @@
    argv[1] = "--detail";
    argv[2] = buffer;
    argv[3] = NULL;
-   execve("/etc/log.d/scripts/logwatch.pl", argv, trusted_env);
+   execve("/etc/logwatch/scripts/logwatch.pl", argv, trusted_env);
 
    /* shouldn't get here - execve replaces current running process */
    perror("logwatch: execve failed");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Ipcop-svn] SF.net SVN: ipcop: [632] ipcop/trunk

From: <ow...@us...> - 2007-11-02 11:32:26

Revision: 632
          http://ipcop.svn.sourceforge.net/ipcop/?rev=632&view=rev
Author:   owes
Date:     2007-11-02 04:32:30 -0700 (Fri, 02 Nov 2007)

Log Message:
-----------
initialize some logfiles properly

Modified Paths:
--------------
    ipcop/trunk/config/rootfiles/common/sysklogd
    ipcop/trunk/lfs/sysklogd

Modified: ipcop/trunk/config/rootfiles/common/sysklogd
===================================================================
--- ipcop/trunk/config/rootfiles/common/sysklogd	2007-11-02 10:39:42 UTC (rev 631)
+++ ipcop/trunk/config/rootfiles/common/sysklogd	2007-11-02 11:32:30 UTC (rev 632)
@@ -1,4 +1,4 @@
-## sysklogd-1.4.1
+## sysklogd-1.5
 ##
 usr/sbin/klogd
 usr/sbin/syslogd
@@ -6,6 +6,6 @@
 #usr/share/man/man8/klogd.8
 #usr/share/man/man8/sysklogd.8
 #usr/share/man/man8/syslogd.8
-#var/log/boot.log
-#var/log/dhcpcd.log
-#var/log/messages
+var/log/boot.log
+var/log/dhcpcd.log
+var/log/messages

Modified: ipcop/trunk/lfs/sysklogd
===================================================================
--- ipcop/trunk/lfs/sysklogd	2007-11-02 10:39:42 UTC (rev 631)
+++ ipcop/trunk/lfs/sysklogd	2007-11-02 11:32:30 UTC (rev 632)
@@ -89,6 +89,9 @@
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-caen-owl-klogd-drop-root.diff
 	cd $(DIR_APP) && make -j $(PARALLELISM)
 	cd $(DIR_APP) && make install
-
+	# create some logfiles with appropriate rights & owner
+	touch /var/log/{boot.log,dhcpcd.log,messages}
+	chmod 664 /var/log/{boot.log,dhcpcd.log,messages}
+	chown 0:105 /var/log/{boot.log,dhcpcd.log,messages}
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Ipcop-svn] SF.net SVN: ipcop: [631] ipcop/trunk

From: <ow...@us...> - 2007-11-02 10:39:38

Revision: 631
          http://ipcop.svn.sourceforge.net/ipcop/?rev=631&view=rev
Author:   owes
Date:     2007-11-02 03:39:42 -0700 (Fri, 02 Nov 2007)

Log Message:
-----------
Also apply drop root patch to klogd
Remove old patches

Modified Paths:
--------------
    ipcop/trunk/lfs/sysklogd

Added Paths:
-----------
    ipcop/trunk/src/patches/sysklogd-1.5-caen-owl-klogd-drop-root.diff

Removed Paths:
-------------
    ipcop/trunk/src/patches/sysklogd-1.4.1-caen-owl-syslogd-bind.diff
    ipcop/trunk/src/patches/sysklogd-1.4.1-caen-owl-syslogd-drop-root.diff

Modified: ipcop/trunk/lfs/sysklogd
===================================================================
--- ipcop/trunk/lfs/sysklogd	2007-11-02 08:18:46 UTC (rev 630)
+++ ipcop/trunk/lfs/sysklogd	2007-11-02 10:39:42 UTC (rev 631)
@@ -85,6 +85,8 @@
 	# apply bind patch first, then drop-root
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-caen-owl-syslogd-bind.diff
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-caen-owl-syslogd-drop-root.diff
+	# also patch klogd
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-caen-owl-klogd-drop-root.diff
 	cd $(DIR_APP) && make -j $(PARALLELISM)
 	cd $(DIR_APP) && make install
 

Deleted: ipcop/trunk/src/patches/sysklogd-1.4.1-caen-owl-syslogd-bind.diff
===================================================================
--- ipcop/trunk/src/patches/sysklogd-1.4.1-caen-owl-syslogd-bind.diff	2007-11-02 08:18:46 UTC (rev 630)
+++ ipcop/trunk/src/patches/sysklogd-1.4.1-caen-owl-syslogd-bind.diff	2007-11-02 10:39:42 UTC (rev 631)
@@ -1,111 +0,0 @@
-diff -ur sysklogd-1.4.1.orig/sysklogd.8 sysklogd-1.4.1/sysklogd.8
---- sysklogd-1.4.1.orig/sysklogd.8	Sun Mar 11 22:35:51 2001
-+++ sysklogd-1.4.1/sysklogd.8	Mon Oct  8 07:20:31 2001
-@@ -2,7 +2,7 @@
- .\" May be distributed under the GNU General Public License
- .\" Sun Aug 30 11:35:55 MET: Martin Schulze: Updates
- .\"
--.TH SYSKLOGD 8 "12 October 1998" "Version 1.3" "Linux System Administration"
-+.TH SYSKLOGD 8 "8 October, 2001" "Version 1.4.1+CAEN/OW" "Linux System Administration"
- .SH NAME
- sysklogd \- Linux system logging utilities.
- .SH SYNOPSIS
-@@ -15,6 +15,9 @@
- .I config file
- ]
- .RB [ " \-h " ] 
-+.RB [ " \-i "
-+.I IP address
-+]
- .RB [ " \-l "
- .I hostlist
- ]
-@@ -103,6 +106,13 @@
- Specifying this switch on the command line will cause the log daemon to
- forward any remote messages it receives to forwarding hosts which have been
- defined.
-+.TP
-+.BI "\-i " "IP address"
-+If
-+.B syslogd
-+is configured to accept log input from a UDP port, specify an IP address
-+to bind to, rather than the default of INADDR_ANY.  The address must be in
-+dotted quad notation, DNS host names are not allowed.
- .TP
- .BI "\-l " "hostlist"
- Specify a hostname that should be logged only with its simple hostname
-diff -ur sysklogd-1.4.1.orig/syslogd.c sysklogd-1.4.1/syslogd.c
---- sysklogd-1.4.1.orig/syslogd.c	Sun Mar 11 22:40:10 2001
-+++ sysklogd-1.4.1/syslogd.c	Mon Oct  8 07:24:41 2001
-@@ -736,6 +736,8 @@
- int	NoHops = 1;		/* Can we bounce syslog messages through an
- 				   intermediate host. */
- 
-+char	*bind_addr = NULL;	/* bind UDP port to this interface only */
-+
- extern	int errno;
- 
- /* Function prototypes. */
-@@ -829,7 +831,7 @@
- 		funix[i]  = -1;
- 	}
- 
--	while ((ch = getopt(argc, argv, "a:dhf:l:m:np:rs:v")) != EOF)
-+	while ((ch = getopt(argc, argv, "a:dhf:i:l:m:np:rs:v")) != EOF)
- 		switch((char)ch) {
- 		case 'a':
- 			if (nfunix < MAXFUNIX)
-@@ -846,9 +848,17 @@
- 		case 'h':
- 			NoHops = 0;
- 			break;
-+		case 'i':
-+			if (bind_addr) {
-+				fprintf(stderr, "Only one -i argument allowed, "
-+					"the first one is taken.\n");
-+				break;
-+			}
-+			bind_addr = optarg;
-+			break;
- 		case 'l':
- 			if (LocalHosts) {
--				fprintf (stderr, "Only one -l argument allowed," \
-+				fprintf(stderr, "Only one -l argument allowed, "
- 					"the first one is taken.\n");
- 				break;
- 			}
-@@ -1175,7 +1185,7 @@
- int usage()
- {
- 	fprintf(stderr, "usage: syslogd [-drvh] [-l hostlist] [-m markinterval] [-n] [-p path]\n" \
--		" [-s domainlist] [-f conffile]\n");
-+		" [-s domainlist] [-f conffile] [-i IP address]\n");
- 	exit(1);
- }
- 
-@@ -1217,15 +1227,22 @@
- 	int fd, on = 1;
- 	struct sockaddr_in sin;
- 
-+	memset(&sin, 0, sizeof(sin));
-+	sin.sin_family = AF_INET;
-+	sin.sin_port = LogPort;
-+	if (bind_addr) {
-+		if (!inet_aton(bind_addr, &sin.sin_addr)) {
-+			logerror("syslog: not a valid IP address to bind to.");
-+			return -1;
-+		}
-+	}
-+
- 	fd = socket(AF_INET, SOCK_DGRAM, 0);
- 	if (fd < 0) {
- 		logerror("syslog: Unknown protocol, suspending inet service.");
- 		return fd;
- 	}
- 
--	memset(&sin, 0, sizeof(sin));
--	sin.sin_family = AF_INET;
--	sin.sin_port = LogPort;
- 	if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, \
- 		       (char *) &on, sizeof(on)) < 0 ) {
- 		logerror("setsockopt(REUSEADDR), suspending inet");

Deleted: ipcop/trunk/src/patches/sysklogd-1.4.1-caen-owl-syslogd-drop-root.diff
===================================================================
--- ipcop/trunk/src/patches/sysklogd-1.4.1-caen-owl-syslogd-drop-root.diff	2007-11-02 08:18:46 UTC (rev 630)
+++ ipcop/trunk/src/patches/sysklogd-1.4.1-caen-owl-syslogd-drop-root.diff	2007-11-02 10:39:42 UTC (rev 631)
@@ -1,117 +0,0 @@
-diff -ur sysklogd-1.4.1-caen-owl-syslogd-bind/sysklogd.8 sysklogd-1.4.1/sysklogd.8
---- sysklogd-1.4.1-caen-owl-syslogd-bind/sysklogd.8	Mon Oct  8 07:26:27 2001
-+++ sysklogd-1.4.1/sysklogd.8	Mon Oct  8 07:30:31 2001
-@@ -32,6 +32,9 @@
- .RB [ " \-s "
- .I domainlist
- ]
-+.RB [ " \-u"
-+.IB username
-+]
- .RB [ " \-v " ]
- .LP
- .SH DESCRIPTION
-@@ -159,6 +162,19 @@
- is specified and the host logging resolves to satu.infodrom.north.de
- no domain would be cut, you will have to specify two domains like:
- .BR "\-s north.de:infodrom.north.de" .
-+.TP
-+.BI "\-u " "username"
-+This causes the
-+.B syslogd
-+daemon to become the named user before starting up logging.
-+
-+Note that when this option is in use,
-+.B syslogd
-+will open all log files as root when the daemon is first started;
-+however, after a
-+.B SIGHUP
-+the files will be reopened as the non-privileged user.  You should
-+take this into account when deciding the ownership of the log files.
- .TP
- .B "\-v"
- Print version and exit.
-diff -ur sysklogd-1.4.1-caen-owl-syslogd-bind/syslogd.c sysklogd-1.4.1/syslogd.c
---- sysklogd-1.4.1-caen-owl-syslogd-bind/syslogd.c	Mon Oct  8 07:26:27 2001
-+++ sysklogd-1.4.1/syslogd.c	Mon Oct  8 07:40:35 2001
-@@ -491,6 +491,10 @@
- #include <arpa/nameser.h>
- #include <arpa/inet.h>
- #include <resolv.h>
-+
-+#include <pwd.h>
-+#include <grp.h>
-+
- #ifndef TESTING
- #include "pidfile.h"
- #endif
-@@ -737,6 +741,7 @@
- 				   intermediate host. */
- 
- char	*bind_addr = NULL;	/* bind UDP port to this interface only */
-+char	*server_user = NULL;	/* user name to run server as */
- 
- extern	int errno;
- 
-@@ -778,6 +783,21 @@
- static int create_inet_socket();
- #endif
- 
-+static int drop_root(void)
-+{
-+	struct passwd *pw;
-+
-+	if (!(pw = getpwnam(server_user))) return -1;
-+
-+	if (!pw->pw_uid) return -1;
-+
-+	if (initgroups(server_user, pw->pw_gid)) return -1;
-+	if (setgid(pw->pw_gid)) return -1;
-+	if (setuid(pw->pw_uid)) return -1;
-+
-+	return 0;
-+}
-+
- int main(argc, argv)
- 	int argc;
- 	char **argv;
-@@ -831,7 +851,7 @@
- 		funix[i]  = -1;
- 	}
- 
--	while ((ch = getopt(argc, argv, "a:dhf:i:l:m:np:rs:v")) != EOF)
-+	while ((ch = getopt(argc, argv, "a:dhf:i:l:m:np:rs:u:v")) != EOF)
- 		switch((char)ch) {
- 		case 'a':
- 			if (nfunix < MAXFUNIX)
-@@ -884,6 +904,9 @@
- 			}
- 			StripDomains = crunch_list(optarg);
- 			break;
-+		case 'u':
-+			server_user = optarg;
-+			break;
- 		case 'v':
- 			printf("syslogd %s.%s\n", VERSION, PATCHLEVEL);
- 			exit (0);
-@@ -1031,6 +1054,11 @@
- 		kill (ppid, SIGTERM);
- #endif
- 
-+	if (server_user && drop_root()) {
-+		dprintf("syslogd: failed to drop root\n");
-+		exit(1);
-+	}
-+
- 	/* Main loop begins here. */
- 	for (;;) {
- 		int nfds;
-@@ -1185,7 +1213,7 @@
- int usage()
- {
- 	fprintf(stderr, "usage: syslogd [-drvh] [-l hostlist] [-m markinterval] [-n] [-p path]\n" \
--		" [-s domainlist] [-f conffile] [-i IP address]\n");
-+		" [-s domainlist] [-f conffile] [-i IP address] [-u username]\n");
- 	exit(1);
- }
- 

Added: ipcop/trunk/src/patches/sysklogd-1.5-caen-owl-klogd-drop-root.diff
===================================================================
--- ipcop/trunk/src/patches/sysklogd-1.5-caen-owl-klogd-drop-root.diff	                        (rev 0)
+++ ipcop/trunk/src/patches/sysklogd-1.5-caen-owl-klogd-drop-root.diff	2007-11-02 10:39:42 UTC (rev 631)
@@ -0,0 +1,171 @@
+diff -ur sysklogd-1.5-orig/klogd.8 sysklogd-1.5/klogd.8
+--- sysklogd-1.5-orig/klogd.8	2007-05-28 19:25:43.000000000 +0200
++++ sysklogd-1.5/klogd.8	2007-11-02 11:04:02.000000000 +0100
+@@ -2,7 +2,8 @@
+ .\" Copyright 1997-2007 Martin Schulze <jo...@in...>
+ .\" May be distributed under the GNU General Public License
+ .\"
+-.TH KLOGD 8 "27 May 2007" "Version 1.5" "Linux System Administration"
++.\" Thu Feb 17 2000: Chris Wing: Unprivileged klogd feature
++.TH KLOGD 8 "02 Nov 2007" "Version 1.5+CAEN/OW" "Linux System Administration"
+ .SH NAME
+ klogd \- Kernel Log Daemon
+ .SH SYNOPSIS
+@@ -14,6 +15,12 @@
+ .RB [ " \-f "
+ .I fname
+ ]
++.RB [ " \-u "
++.I username
++]
++.RB [ " \-j "
++.I chroot_dir
++]
+ .RB [ " \-iI " ]
+ .RB [ " \-n " ]
+ .RB [ " \-o " ]
+@@ -41,6 +48,20 @@
+ .BI "\-f " file
+ Log messages to the specified filename rather than to the syslog facility.
+ .TP
++.BI "\-u " username
++Tells klogd to become the specified user and drop root privileges before
++starting logging.
++.TP
++.BI "\-j " chroot_dir
++Tells klogd to
++.BR chroot (2)
++into this directory after initializing.
++This option is only valid if the \-u option is also used to run klogd
++without root privileges.
++Note that the use of this option will prevent \-i and \-I from working
++unless you set up the chroot directory in such a way that klogd can still
++read the kernel module symbols.
++.TP
+ .BI "\-i \-I"
+ Signal the currently executing klogd daemon.  Both of these switches control
+ the loading/reloading of symbol information.  The \-i switch signals the
+diff -ur sysklogd-1.5-orig/klogd.c sysklogd-1.5/klogd.c
+--- sysklogd-1.5-orig/klogd.c	2007-06-17 21:21:55.000000000 +0200
++++ sysklogd-1.5/klogd.c	2007-11-02 11:14:20.000000000 +0100
+@@ -268,6 +268,8 @@
+ #include <stdarg.h>
+ #include <paths.h>
+ #include <stdlib.h>
++#include <pwd.h>
++#include <grp.h>
+ #include "klogd.h"
+ #include "ksyms.h"
+ #ifndef TESTING
+@@ -318,6 +320,9 @@
+ int debugging = 0;
+ int symbols_twice = 0;
+ 
++char *server_user = NULL;
++char *chroot_dir = NULL;
++int log_flags = 0;
+ 
+ /* Function prototypes. */
+ extern int ksyslog(int type, char *buf, int len);
+@@ -547,8 +552,9 @@
+ 	 * First do a stat to determine whether or not the proc based
+ 	 * file system is available to get kernel messages from.
+ 	 */
+-	if ( use_syscall ||
+-	    ((stat(_PATH_KLOG, &sb) < 0) && (errno == ENOENT)) )
++	if (!server_user &&
++	    (use_syscall ||
++	    ((stat(_PATH_KLOG, &sb) < 0) && (errno == ENOENT))))
+ 	{
+ 	  	/* Initialize kernel logging. */
+ 	  	ksyslog(1, NULL, 0);
+@@ -972,6 +978,27 @@
+ }
+ 
+ 
++static int drop_root(void)
++{
++	struct passwd *pw;
++
++	if (!(pw = getpwnam(server_user))) return -1;
++
++	if (!pw->pw_uid) return -1;
++
++	if (chroot_dir) {
++		if (chroot(chroot_dir)) return -1;
++		if (chdir("/")) return -1;
++	}
++
++	if (setgroups(0, NULL)) return -1;
++	if (setgid(pw->pw_gid)) return -1;
++	if (setuid(pw->pw_uid)) return -1;
++
++	return 0;
++}
++
++
+ int main(argc, argv)
+ 
+ 	int argc;
+@@ -990,7 +1017,7 @@
+ 	chdir ("/");
+ #endif
+ 	/* Parse the command-line. */
+-	while ((ch = getopt(argc, argv, "c:df:iIk:nopsvx2")) != EOF)
++	while ((ch = getopt(argc, argv, "c:df:u:j:iIk:nopsvx2")) != EOF)
+ 		switch((char)ch)
+ 		{
+ 		    case '2':		/* Print lines with symbols twice. */
+@@ -1012,6 +1039,10 @@
+ 		    case 'I':
+ 			SignalDaemon(SIGUSR2);
+ 			return(0);
++		    case 'j':		/* chroot 'j'ail */
++			chroot_dir = optarg;
++			log_flags |= LOG_NDELAY;
++			break;
+ 		    case 'k':		/* Kernel symbol file. */
+ 			symfile = optarg;
+ 			break;
+@@ -1027,6 +1058,9 @@
+ 		    case 's':		/* Use syscall interface. */
+ 			use_syscall = 1;
+ 			break;
++		    case 'u':		/* Run as this user */
++			server_user = optarg;
++			break;
+ 		    case 'v':
+ 			printf("klogd %s.%s\n", VERSION, PATCHLEVEL);
+ 			exit (1);
+@@ -1035,6 +1069,10 @@
+ 			break;
+ 		}
+ 
++	if (chroot_dir && !server_user) {
++		fputs("'-j' is only valid with '-u'", stderr);
++		exit(1);
++	}
+ 
+ 	/* Set console logging level. */
+ 	if ( log_level != (char *) 0 )
+@@ -1144,7 +1182,7 @@
+ 		}
+ 	}
+ 	else
+-		openlog("kernel", 0, LOG_KERN);
++		openlog("kernel", log_flags, LOG_KERN);
+ 
+ 
+ 	/* Handle one-shot logging. */
+@@ -1176,6 +1214,11 @@
+ 		kill (ppid, SIGTERM);
+ #endif
+ 
++	if (server_user && drop_root()) {
++		syslog(LOG_ALERT, "klogd: failed to drop root");
++		Terminate();
++	}
++
+         /* The main loop. */
+ 	while (1)
+ 	{


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Ipcop-svn] SF.net SVN: ipcop: [630] ipcop/trunk/lfs/scsi.img

From: <ch...@us...> - 2007-11-02 08:18:42

Revision: 630
          http://ipcop.svn.sourceforge.net/ipcop/?rev=630&view=rev
Author:   chepati
Date:     2007-11-02 01:18:46 -0700 (Fri, 02 Nov 2007)

Log Message:
-----------
Combine x86, ppc and alpha if blocks.

Modified Paths:
--------------
    ipcop/trunk/lfs/scsi.img

Modified: ipcop/trunk/lfs/scsi.img
===================================================================
--- ipcop/trunk/lfs/scsi.img	2007-11-02 06:52:13 UTC (rev 629)
+++ ipcop/trunk/lfs/scsi.img	2007-11-02 08:18:46 UTC (rev 630)
@@ -62,15 +62,13 @@
 	-mkdir -p $(INSTALLER_DIR)/images
 	cd /tmp && rm -rf scsi.tar.gz bin etc lib var
 
-ifeq "$(MACHINE)" "i486"
-	cd / && tar -cf /tmp/scsi.tar lib/modules/$(KVER)/kernel/drivers/{scsi,pcmcia,message/fusion} \
-		lib/modules/$(KVER)/kernel/drivers/block/{DAC960.ko,cpqarray.ko,cciss.ko} \
+ifeq "$(MACHINE)" "sparc"
+	cd / && tar -cf /tmp/scsi.tar lib/modules/$(KVER)/kernel/drivers/{scsi,message/fusion} \
+		lib/modules/$(KVER)/kernel/drivers/block/DAC960.ko \
 		lib/modules/$(KVER)/kernel/drivers/{ata,ide} \
 		lib/modules/$(KVER)/kernel/drivers/ieee1394 \
 		lib/modules/$(KVER)/kernel/drivers/cdrom
-endif
-
-ifeq "$(MACHINE)" "alpha"
+else
 	cd / && tar -cf /tmp/scsi.tar lib/modules/$(KVER)/kernel/drivers/{scsi,pcmcia,message/fusion} \
 		lib/modules/$(KVER)/kernel/drivers/block/{DAC960.ko,cpqarray.ko,cciss.ko} \
 		lib/modules/$(KVER)/kernel/drivers/{ata,ide} \
@@ -78,21 +76,6 @@
 		lib/modules/$(KVER)/kernel/drivers/cdrom
 endif
 
-ifeq "$(MACHINE)" "ppc"
-	cd / && tar -cf /tmp/scsi.tar lib/modules/$(KVER)/kernel/drivers/{scsi,pcmcia,message/fusion} \
-		lib/modules/$(KVER)/kernel/drivers/block/{DAC960.ko,cpqarray.ko,cciss.ko} \
-		lib/modules/$(KVER)/kernel/drivers/{ata,ide} \
-		lib/modules/$(KVER)/kernel/drivers/ieee1394
-endif
-
-ifeq "$(MACHINE)" "sparc"
-	cd / && tar -cf /tmp/scsi.tar lib/modules/$(KVER)/kernel/drivers/{scsi,message/fusion} \
-		lib/modules/$(KVER)/kernel/drivers/block/DAC960.ko \
-		lib/modules/$(KVER)/kernel/drivers/{ata,ide} \
-		lib/modules/$(KVER)/kernel/drivers/ieee1394 \
-		lib/modules/$(KVER)/kernel/drivers/cdrom
-endif
-
 	cd /tmp && tar xf scsi.tar
 	cd /tmp && rm -f lib/modules/$(KVER)/kernel/drivers/message/fusion/mptlan*
 	cd /tmp && mkdir -p {bin,var/run}
@@ -100,15 +83,7 @@
 	#as we are near the 1.44 floppy size limit, always use high compression
 	cd /tmp && tar -czf scsi.tar.gz bin var lib/modules/$(KVER)
 
-#ifeq "$(MACHINE)" "i486"
-	#dd if=/tmp/scsi.tar.gz of=$(INSTALLER_DIR)/images/scsidrv-$(VERSION).img bs=1440k count=1 conv=sync
-#else
 	cp /tmp/scsi.tar.gz $(INSTALLER_DIR)/images/scsidrv-$(VERSION).img
-#endif
-
-	# Show size used
-	ls -l /tmp/scsi.tar.gz
-
 	rm -f /tmp/scsi.tar.gz
 
 	### If this fails, the disk is TOO FULL !!!!


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Ipcop-svn] SF.net SVN: ipcop: [629] ipcop/trunk/lfs

From: <ch...@us...> - 2007-11-02 06:52:09

Revision: 629
          http://ipcop.svn.sourceforge.net/ipcop/?rev=629&view=rev
Author:   chepati
Date:     2007-11-01 23:52:13 -0700 (Thu, 01 Nov 2007)

Log Message:
-----------
Trying to reduce the size of ppc instroot.img so it boots on machines with 32MB RAM.  As sparc is the only platform so far that requires firmware to load some of the Fiberchanel HBAs, exclude firmware from the rest of the platforms to save some 600K

Modified Paths:
--------------
    ipcop/trunk/lfs/driver.img
    ipcop/trunk/lfs/initrd

Modified: ipcop/trunk/lfs/driver.img
===================================================================
--- ipcop/trunk/lfs/driver.img	2007-11-01 21:05:08 UTC (rev 628)
+++ ipcop/trunk/lfs/driver.img	2007-11-02 06:52:13 UTC (rev 629)
@@ -63,7 +63,6 @@
 	# Create drivers floppy
 	cd /tmp && rm -rf drivers.tar.gz bin lib etc var
 
-ifeq "$(MACHINE)" "i486"
 	cd / && tar -cf /tmp/drivers.tar \
 		--exclude=lib/modules/$(KVER)/kernel/{arch,crypto,fs} \
 		--exclude=lib/modules/$(KVER)/kernel/drivers/{acpi,ata,atm,base,bluetooth,block,char,cdrom} \
@@ -77,16 +76,7 @@
 		--exclude=lib/modules/$(KVER)/kernel/net/{mac80211,rfkill,rxrpc,wanrouter,netfilter,sched,wireless} \
 		--exclude=lib/modules/$(KVER)/{build,extra,misc,modules.*,source} \
 		lib/modules/$(KVER)
-endif
 
-ifeq "$(MACHINE)" "ppc"
-	cd / && tar -cf /tmp/drivers.tar lib/modules/$(KVER)
-endif
-
-ifeq "$(MACHINE)" "sparc"
-	cd / && tar -cf /tmp/drivers.tar lib/modules/$(KVER)
-endif
-
 	cd /tmp && tar xf drivers.tar
 	cd /tmp && mkdir -p {bin,var/run}
 	#as we are near the 1.44 floppy size limit, always use high compression
@@ -106,4 +96,4 @@
 	### If this fails, the disk is TOO FULL !!!!
 	tar tzf $(INSTALLER_DIR)/images/drivers-$(VERSION).img #>/dev/null 2>&1
 
-	# yes we want it rebuild at each time, so no POSTBUILD
+	# yes we want it rebuilt at each time, so no POSTBUILD

Modified: ipcop/trunk/lfs/initrd
===================================================================
--- ipcop/trunk/lfs/initrd	2007-11-01 21:05:08 UTC (rev 628)
+++ ipcop/trunk/lfs/initrd	2007-11-02 06:52:13 UTC (rev 629)
@@ -108,7 +108,7 @@
 	cd $(INSTALLER_DIR)/mnt && find ./bin -maxdepth 1 -type f -exec $(TOOLS_DIR)/bin/strip --strip-all '{}' ';'
 	cd $(INSTALLER_DIR)/mnt && find ./lib -maxdepth 1 -type f -exec $(TOOLS_DIR)/bin/strip --strip-all '{}' ';'
 
-	# Now squash everything and put it in root.img
+	# Now create a cpio archive and call it root-VERSION.img
 	cd $(INSTALLER_DIR)/mnt && find . | cpio -o -H newc | gzip -9 > $(INSTALLER_DIR)/images/root-$(VERSION).img
 
 	# Create a file list for root floppy
@@ -122,10 +122,12 @@
 		done
 	rm $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/root.list
 
+ifeq "$(MACHINE)" "sparc"
 	# From this point on, we're building cdinitrd.img
-	# add firmwares on cdinitrd
+	# add firmwares on cdinitrd, only for sparc
 	mkdir -p $(INSTALLER_DIR)/mnt/lib/firmware
 	cp -aR $(INSTALLER_DIR)/initrd/lib/firmware/* $(INSTALLER_DIR)/mnt/lib/firmware
+endif
 
 	#just debug purpose, to remove with installer counterpart, copy mkinitrd into installer
 	cd $(INSTALLER_DIR)/initrd/bin && cp $(DIR_SRC)/src/nash/mkinitrd .


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Ipcop-svn] SF.net SVN: ipcop: [628] ipcop/trunk/config/rc.d/rc.sysinit

From: <ow...@us...> - 2007-11-01 21:05:03

Revision: 628
          http://ipcop.svn.sourceforge.net/ipcop/?rev=628&view=rev
Author:   owes
Date:     2007-11-01 14:05:08 -0700 (Thu, 01 Nov 2007)

Log Message:
-----------
Works so much better if mounts comply with /etc/fstab ;-)

Modified Paths:
--------------
    ipcop/trunk/config/rc.d/rc.sysinit

Modified: ipcop/trunk/config/rc.d/rc.sysinit
===================================================================
--- ipcop/trunk/config/rc.d/rc.sysinit	2007-11-01 18:14:42 UTC (rev 627)
+++ ipcop/trunk/config/rc.d/rc.sysinit	2007-11-01 21:05:08 UTC (rev 628)
@@ -32,12 +32,12 @@
 fi
 
 echo "Mounting sysfs"
-/bin/mount -n -t sysfs none /sys
+/bin/mount -n -t sysfs sysfs /sys
 echo "Mounting dev"
-/bin/mount -n -t tmpfs none /dev -o mode=755
+/bin/mount -n -t tmpfs tmpfs /dev -o mode=755
 /bin/mkdir -p -m 0755 /dev/pts
 /bin/mkdir -p -m 0755 /dev/shm
-/bin/mount -n -t devpts none /dev/pts
+/bin/mount -n -t devpts devpts /dev/pts
 
 # Start udev
 echo "Starting UDEV"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Ipcop-svn] SF.net SVN: ipcop: [627] ipcop/trunk/config/rootfiles/common/stage2

From: <ow...@us...> - 2007-11-01 18:14:37

Revision: 627
          http://ipcop.svn.sourceforge.net/ipcop/?rev=627&view=rev
Author:   owes
Date:     2007-11-01 11:14:42 -0700 (Thu, 01 Nov 2007)

Log Message:
-----------
Remove etc/fstab.squashfs from rootfiles. 

Modified Paths:
--------------
    ipcop/trunk/config/rootfiles/common/stage2

Modified: ipcop/trunk/config/rootfiles/common/stage2
===================================================================
--- ipcop/trunk/config/rootfiles/common/stage2	2007-11-01 15:27:34 UTC (rev 626)
+++ ipcop/trunk/config/rootfiles/common/stage2	2007-11-01 18:14:42 UTC (rev 627)
@@ -8,7 +8,6 @@
 etc/certparams
 etc/domainname
 etc/fstab
-etc/fstab.squashfs
 etc/group
 etc/host.conf
 etc/hostname


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Ipcop-svn] SF.net SVN: ipcop: [626] ipcop/trunk/config

From: <ow...@us...> - 2007-11-01 15:27:30

Revision: 626
          http://ipcop.svn.sourceforge.net/ipcop/?rev=626&view=rev
Author:   owes
Date:     2007-11-01 08:27:34 -0700 (Thu, 01 Nov 2007)

Log Message:
-----------
Do not build some conntrack modules.
Suppress some error messages about missing modules.
Alpha Kernel config needs much more work.

Modified Paths:
--------------
    ipcop/trunk/config/kernel/kernel.config.i486
    ipcop/trunk/config/kernel/kernel.config.ppc
    ipcop/trunk/config/kernel/kernel.config.sparc
    ipcop/trunk/config/rc.d/rc.network

Modified: ipcop/trunk/config/kernel/kernel.config.i486
===================================================================
--- ipcop/trunk/config/kernel/kernel.config.i486	2007-11-01 14:32:01 UTC (rev 625)
+++ ipcop/trunk/config/kernel/kernel.config.i486	2007-11-01 15:27:34 UTC (rev 626)
@@ -419,7 +419,6 @@
 # CONFIG_NETWORK_SECMARK is not set
 CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_DEBUG is not set
-CONFIG_BRIDGE_NETFILTER=y
 
 #
 # Core Netfilter Configuration
@@ -438,9 +437,9 @@
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_H323=m
 CONFIG_NF_CONNTRACK_IRC=m
-CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
 CONFIG_NF_CONNTRACK_PPTP=m
-CONFIG_NF_CONNTRACK_SANE=m
+# CONFIG_NF_CONNTRACK_SANE is not set
 CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CT_NETLINK=m
@@ -526,26 +525,6 @@
 #
 # Bridge: Netfilter Configuration
 #
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_ARP=m
-CONFIG_BRIDGE_EBT_IP=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_MARK=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_MARK_T=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
-CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_ULOG=m
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
 # CONFIG_TIPC is not set
@@ -555,7 +534,7 @@
 # CONFIG_ATM_LANE is not set
 CONFIG_ATM_BR2684=m
 # CONFIG_ATM_BR2684_IPFILTER is not set
-CONFIG_BRIDGE=m
+# CONFIG_BRIDGE is not set
 CONFIG_VLAN_8021Q=m
 # CONFIG_DECNET is not set
 CONFIG_LLC=y
@@ -2038,10 +2017,6 @@
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
 # CONFIG_CRAMFS is not set
-CONFIG_SQUASHFS=y
-CONFIG_SQUASHFS_EMBEDDED=y
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-CONFIG_SQUASHFS_VMALLOC=y
 # CONFIG_VXFS_FS is not set
 # CONFIG_HPFS_FS is not set
 # CONFIG_QNX4FS_FS is not set

Modified: ipcop/trunk/config/kernel/kernel.config.ppc
===================================================================
--- ipcop/trunk/config/kernel/kernel.config.ppc	2007-11-01 14:32:01 UTC (rev 625)
+++ ipcop/trunk/config/kernel/kernel.config.ppc	2007-11-01 15:27:34 UTC (rev 626)
@@ -337,7 +337,6 @@
 # CONFIG_NETWORK_SECMARK is not set
 CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_DEBUG is not set
-CONFIG_BRIDGE_NETFILTER=y
 
 #
 # Core Netfilter Configuration
@@ -356,9 +355,9 @@
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_H323=m
 CONFIG_NF_CONNTRACK_IRC=m
-CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
 CONFIG_NF_CONNTRACK_PPTP=m
-CONFIG_NF_CONNTRACK_SANE=m
+# CONFIG_NF_CONNTRACK_SANE is not set
 CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CT_NETLINK=m
@@ -430,26 +429,6 @@
 #
 # Bridge: Netfilter Configuration
 #
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_ARP=m
-CONFIG_BRIDGE_EBT_IP=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_MARK=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_MARK_T=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
-CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_ULOG=m
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
 # CONFIG_TIPC is not set
@@ -459,7 +438,7 @@
 # CONFIG_ATM_LANE is not set
 CONFIG_ATM_BR2684=m
 # CONFIG_ATM_BR2684_IPFILTER is not set
-CONFIG_BRIDGE=m
+# CONFIG_BRIDGE is not set
 CONFIG_VLAN_8021Q=m
 # CONFIG_DECNET is not set
 CONFIG_LLC=y

Modified: ipcop/trunk/config/kernel/kernel.config.sparc
===================================================================
--- ipcop/trunk/config/kernel/kernel.config.sparc	2007-11-01 14:32:01 UTC (rev 625)
+++ ipcop/trunk/config/kernel/kernel.config.sparc	2007-11-01 15:27:34 UTC (rev 626)
@@ -244,7 +244,6 @@
 # CONFIG_NETWORK_SECMARK is not set
 CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_DEBUG is not set
-CONFIG_BRIDGE_NETFILTER=y
 
 #
 # Core Netfilter Configuration
@@ -263,9 +262,9 @@
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_H323=m
 CONFIG_NF_CONNTRACK_IRC=m
-CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
 CONFIG_NF_CONNTRACK_PPTP=m
-CONFIG_NF_CONNTRACK_SANE=m
+# CONFIG_NF_CONNTRACK_SANE is not set
 CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CT_NETLINK=m
@@ -337,26 +336,6 @@
 #
 # Bridge: Netfilter Configuration
 #
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_ARP=m
-CONFIG_BRIDGE_EBT_IP=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_MARK=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_MARK_T=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
-CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_ULOG=m
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
 # CONFIG_TIPC is not set
@@ -366,7 +345,7 @@
 # CONFIG_ATM_LANE is not set
 CONFIG_ATM_BR2684=m
 # CONFIG_ATM_BR2684_IPFILTER is not set
-CONFIG_BRIDGE=m
+# CONFIG_BRIDGE is not set
 CONFIG_VLAN_8021Q=m
 # CONFIG_DECNET is not set
 CONFIG_LLC=y

Modified: ipcop/trunk/config/rc.d/rc.network
===================================================================
--- ipcop/trunk/config/rc.d/rc.network	2007-11-01 14:32:01 UTC (rev 625)
+++ ipcop/trunk/config/rc.d/rc.network	2007-11-01 15:27:34 UTC (rev 626)
@@ -16,14 +16,12 @@
 modprobe ip_nat_h323
 modprobe ip_conntrack_irc
 modprobe ip_nat_irc
-modprobe ip_conntrack_mms
-modprobe ip_nat_mms
+#modprobe ip_conntrack_mms
+#modprobe ip_nat_mms
 modprobe ip_conntrack_pptp
 modprobe ip_nat_pptp
-modprobe ip_conntrack_proto_gre
-modprobe ip_nat_proto_gre
-modprobe ip_conntrack_quake3
-modprobe ip_nat_quake3
+modprobe nf_conntrack_proto_gre
+modprobe nf_nat_proto_gre
 
 # came from rc.local, not sure yet if this is needed !?
 # connections.cgi needs to be able to read this


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Ipcop-svn] SF.net SVN: ipcop: [625] ipcop/trunk

From: <ow...@us...> - 2007-11-01 14:31:59

Revision: 625
          http://ipcop.svn.sourceforge.net/ipcop/?rev=625&view=rev
Author:   owes
Date:     2007-11-01 07:32:01 -0700 (Thu, 01 Nov 2007)

Log Message:
-----------
Start klogd in sysinit
Upgrade sysklogd to 1.5

Modified Paths:
--------------
    ipcop/trunk/config/rc.d/rc.sysinit
    ipcop/trunk/lfs/sysklogd

Added Paths:
-----------
    ipcop/trunk/src/patches/sysklogd-1.5-caen-owl-syslogd-bind.diff
    ipcop/trunk/src/patches/sysklogd-1.5-caen-owl-syslogd-drop-root.diff

Modified: ipcop/trunk/config/rc.d/rc.sysinit
===================================================================
--- ipcop/trunk/config/rc.d/rc.sysinit	2007-11-01 13:50:07 UTC (rev 624)
+++ ipcop/trunk/config/rc.d/rc.sysinit	2007-11-01 14:32:01 UTC (rev 625)
@@ -189,8 +189,10 @@
 echo "Starting syslogd"
 /usr/sbin/syslogd -u syslogd -m 0
 # Something broke while upgrading that causes this to suck CPU
-#echo "Starting klogd"
-#/usr/sbin/klogd -u klogd -j /var/empty
+# Olaf: is this still true ?  
+#   Works on my box, and klogd is really very usefull to have around
+echo "Starting klogd"
+/usr/sbin/klogd -u klogd -j /var/empty
 
 echo "Running /etc/rc.d/rc.network"
 . /etc/rc.d/rc.network

Modified: ipcop/trunk/lfs/sysklogd
===================================================================
--- ipcop/trunk/lfs/sysklogd	2007-11-01 13:50:07 UTC (rev 624)
+++ ipcop/trunk/lfs/sysklogd	2007-11-01 14:32:01 UTC (rev 625)
@@ -33,7 +33,7 @@
 include Config
 
 PKG_NAME   = sysklogd
-VER        = 1.4.1
+VER        = 1.5
 HOST_ARCH  = all
 OTHER_SRC  = yes
 
@@ -47,17 +47,11 @@
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) \
-$(THISAPP)-fixes-2.patch \
-$(THISAPP)-8bit-1.patch
+objects = $(DL_FILE) 
 
 $(DL_FILE)				= $(DL_FROM)/$(DL_FILE)
-$(THISAPP)-fixes-2.patch		= $(URL_LFS)/$(PKG_NAME)/$(THISAPP)-fixes-2.patch
-$(THISAPP)-8bit-1.patch			= $(URL_LFS)/$(PKG_NAME)/$(THISAPP)-8bit-1.patch
 
-$(DL_FILE)_MD5				= d214aa40beabf7bdb0c9b3c64432c774
-$(THISAPP)-fixes-2.patch_MD5		= ed5b25ca9a4eeb4f4f82b300a27b1ef4
-$(THISAPP)-8bit-1.patch_MD5		= cc0d9c3bd67a6b6357e42807cf06073e
+$(DL_FILE)_MD5				= e053094e8103165f98ddafe828f6ae4b
 
 install : $(TARGET)
 
@@ -88,8 +82,7 @@
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 
-	cd $(DIR_APP) && patch -Np1 -i $(DIR_DL)/$(THISAPP)-fixes-2.patch
-	cd $(DIR_APP) && patch -Np1 -i $(DIR_DL)/$(THISAPP)-8bit-1.patch
+	# apply bind patch first, then drop-root
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-caen-owl-syslogd-bind.diff
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-caen-owl-syslogd-drop-root.diff
 	cd $(DIR_APP) && make -j $(PARALLELISM)

Added: ipcop/trunk/src/patches/sysklogd-1.5-caen-owl-syslogd-bind.diff
===================================================================
--- ipcop/trunk/src/patches/sysklogd-1.5-caen-owl-syslogd-bind.diff	                        (rev 0)
+++ ipcop/trunk/src/patches/sysklogd-1.5-caen-owl-syslogd-bind.diff	2007-11-01 14:32:01 UTC (rev 625)
@@ -0,0 +1,107 @@
+diff -ur sysklogd-1.5.orig/sysklogd.8 sysklogd-1.5/sysklogd.8
+--- sysklogd-1.5.orig/sysklogd.8	2007-10-22 07:38:17.000000000 +0200
++++ sysklogd-1.5/sysklogd.8	2007-10-22 06:45:49.000000000 +0200
+@@ -2,7 +2,7 @@
+ .\" Copyright 2004,6,7 Martin Schulze <jo...@in...>
+ .\" May be distributed under the GNU General Public License
+ .\"
+-.TH SYSKLOGD 8 "27 May 2007" "Version 1.5" "Linux System Administration"
++.TH SYSKLOGD 8 "22 Ocotober 2007" "Version 1.5+CAEN/OW" "Linux System Administration"
+ .SH NAME
+ sysklogd \- Linux system logging utilities.
+ .SH SYNOPSIS
+@@ -15,6 +15,9 @@
+ .I config file
+ ]
+ .RB [ " \-h " ] 
++.RB [ " \-i "
++.I IP address
++]
+ .RB [ " \-l "
+ .I hostlist
+ ]
+@@ -103,6 +106,13 @@
+ This can cause syslog loops that fill up hard disks quite fast and
+ thus needs to be used with caution.
+ .TP
++.BI "\-i " "IP address"
++If
++.B syslogd
++is configured to accept log input from a UDP port, specify an IP address
++to bind to, rather than the default of INADDR_ANY.  The address must be in
++dotted quad notation, DNS host names are not allowed.
++.TP
+ .BI "\-l " "hostlist"
+ Specify a hostname that should be logged only with its simple hostname
+ and not the fqdn.  Multiple hosts may be specified using the colon
+diff -ur sysklogd-1.5.orig/syslogd.c sysklogd-1.5/syslogd.c
+--- sysklogd-1.5.orig/syslogd.c	2007-10-22 07:46:53.000000000 +0200
++++ sysklogd-1.5/syslogd.c	2007-10-22 06:54:31.000000000 +0200
+@@ -790,6 +790,8 @@
+ int	NoHops = 1;		/* Can we bounce syslog messages through an
+ 				   intermediate host. */
+ 
++char   *bind_addr = NULL;      /* bind UDP port to this interface only */
++
+ extern	int errno;
+ 
+ /* Function prototypes. */
+@@ -886,7 +888,7 @@
+ 		funix[i]  = -1;
+ 	}
+ 
+-	while ((ch = getopt(argc, argv, "a:dhf:l:m:np:rs:v")) != EOF)
++	while ((ch = getopt(argc, argv, "a:dhf:i:l:m:np:rs:v")) != EOF)
+ 		switch((char)ch) {
+ 		case 'a':
+ 			if (nfunix < MAXFUNIX)
+@@ -903,6 +905,14 @@
+ 		case 'h':
+ 			NoHops = 0;
+ 			break;
++		case 'i':
++			if (bind_addr) {
++				fprintf(stderr, "Only one -i argument allowed, "
++					"the first one is taken.\n");
++				break;
++			}
++			bind_addr = optarg;
++			break;
+ 		case 'l':
+ 			if (LocalHosts) {
+ 				fprintf (stderr, "Only one -l argument allowed," \
+@@ -1239,7 +1249,7 @@
+ int usage()
+ {
+ 	fprintf(stderr, "usage: syslogd [-drvh] [-l hostlist] [-m markinterval] [-n] [-p path]\n" \
+-		" [-s domainlist] [-f conffile]\n");
++		" [-s domainlist] [-f conffile]] [-i IP address]\n");
+ 	exit(1);
+ }
+ 
+@@ -1282,15 +1292,22 @@
+ 	struct sockaddr_in sin;
+ 	int sockflags;
+ 
++	memset(&sin, 0, sizeof(sin));
++	sin.sin_family = AF_INET;
++	sin.sin_port = LogPort;
++	if (bind_addr) {
++		if (!inet_aton(bind_addr, &sin.sin_addr)) {
++			logerror("syslog: not a valid IP address to bind to.");
++			return -1;
++		}
++	}
++
+ 	fd = socket(AF_INET, SOCK_DGRAM, 0);
+ 	if (fd < 0) {
+ 		logerror("syslog: Unknown protocol, suspending inet service.");
+ 		return fd;
+ 	}
+ 
+-	memset(&sin, 0, sizeof(sin));
+-	sin.sin_family = AF_INET;
+-	sin.sin_port = LogPort;
+ 	if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, \
+ 		       (char *) &on, sizeof(on)) < 0 ) {
+ 		logerror("setsockopt(REUSEADDR), suspending inet");

Added: ipcop/trunk/src/patches/sysklogd-1.5-caen-owl-syslogd-drop-root.diff
===================================================================
--- ipcop/trunk/src/patches/sysklogd-1.5-caen-owl-syslogd-drop-root.diff	                        (rev 0)
+++ ipcop/trunk/src/patches/sysklogd-1.5-caen-owl-syslogd-drop-root.diff	2007-11-01 14:32:01 UTC (rev 625)
@@ -0,0 +1,119 @@
+diff -ur sysklogd-1.5-bind/sysklogd.8 sysklogd-1.5/sysklogd.8
+--- sysklogd-1.5-bind/sysklogd.8	2007-10-22 06:45:49.000000000 +0200
++++ sysklogd-1.5/sysklogd.8	2007-10-22 07:14:06.000000000 +0200
+@@ -32,6 +32,9 @@
+ .RB [ " \-s "
+ .I domainlist
+ ]
++.RB [ " \-u"
++.IB username
++]
+ .RB [ " \-v " ]
+ .SH DESCRIPTION
+ .B Sysklogd
+@@ -160,6 +163,19 @@
+ no domain would be cut, you will have to specify two domains like:
+ .BR "\-s north.de:infodrom.north.de" .
+ .TP
++.BI "\-u " "username"
++This causes the
++.B syslogd
++daemon to become the named user before starting up logging.
++
++Note that when this option is in use,
++.B syslogd
++will open all log files as root when the daemon is first started;
++however, after a
++.B SIGHUP
++the files will be reopened as the non-privileged user.  You should
++take this into account when deciding the ownership of the log files.
++.TP
+ .B "\-v"
+ Print version and exit.
+ .SH SIGNALS
+diff -ur sysklogd-1.5-bind/syslogd.c sysklogd-1.5/syslogd.c
+--- sysklogd-1.5-bind/syslogd.c	2007-10-22 06:54:31.000000000 +0200
++++ sysklogd-1.5/syslogd.c	2007-10-22 07:22:26.000000000 +0200
+@@ -544,6 +544,10 @@
+ #include <arpa/nameser.h>
+ #include <arpa/inet.h>
+ #include <resolv.h>
++
++#include <pwd.h>
++#include <grp.h>
++
+ #ifndef TESTING
+ #include "pidfile.h"
+ #endif
+@@ -790,7 +794,8 @@
+ int	NoHops = 1;		/* Can we bounce syslog messages through an
+ 				   intermediate host. */
+ 
+-char   *bind_addr = NULL;      /* bind UDP port to this interface only */
++char	*bind_addr = NULL;	/* bind UDP port to this interface only */
++char	*server_user = NULL;	/* user name to run server as */
+ 
+ extern	int errno;
+ 
+@@ -832,6 +837,21 @@
+ static int create_inet_socket();
+ #endif
+ 
++static int drop_root(void)
++{
++	struct passwd *pw;
++
++	if (!(pw = getpwnam(server_user))) return -1;
++
++	if (!pw->pw_uid) return -1;
++
++	if (initgroups(server_user, pw->pw_gid)) return -1;
++	if (setgid(pw->pw_gid)) return -1;
++	if (setuid(pw->pw_uid)) return -1;
++
++	return 0;
++}
++
+ int main(argc, argv)
+ 	int argc;
+ 	char **argv;
+@@ -888,7 +908,7 @@
+ 		funix[i]  = -1;
+ 	}
+ 
+-	while ((ch = getopt(argc, argv, "a:dhf:i:l:m:np:rs:v")) != EOF)
++	while ((ch = getopt(argc, argv, "a:dhf:i:l:m:np:rs:u:v")) != EOF)
+ 		switch((char)ch) {
+ 		case 'a':
+ 			if (nfunix < MAXFUNIX)
+@@ -896,6 +916,9 @@
+ 			else
+ 				fprintf(stderr, "Out of descriptors, ignoring %s\n", optarg);
+ 			break;
++		case 'u':
++			server_user = optarg;
++			break;
+ 		case 'd':		/* debug */
+ 			Debug = 1;
+ 			break;
+@@ -1097,6 +1120,11 @@
+ 		kill (ppid, SIGTERM);
+ #endif
+ 
++	if (server_user && drop_root()) {
++		dprintf("syslogd: failed to drop root\n");
++		exit(1);
++	}
++
+ 	/* Main loop begins here. */
+ 	for (;;) {
+ 		int nfds;
+@@ -1249,7 +1277,7 @@
+ int usage()
+ {
+ 	fprintf(stderr, "usage: syslogd [-drvh] [-l hostlist] [-m markinterval] [-n] [-p path]\n" \
+-		" [-s domainlist] [-f conffile]] [-i IP address]\n");
++		" [-s domainlist] [-f conffile]] [-i IP address] [-u username]\n");
+ 	exit(1);
+ }
+ 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Ipcop-svn] SF.net SVN: ipcop: [624] ipcop/trunk/config

From: <ow...@us...> - 2007-11-01 13:50:06

Revision: 624
          http://ipcop.svn.sourceforge.net/ipcop/?rev=624&view=rev
Author:   owes
Date:     2007-11-01 06:50:07 -0700 (Thu, 01 Nov 2007)

Log Message:
-----------
/dev is now 755 (not 1777)
udev is working much better, there is some error left with pcmcia rules 

Modified Paths:
--------------
    ipcop/trunk/config/etc/group
    ipcop/trunk/config/install/udev/rules.d/25-lfs.rules
    ipcop/trunk/config/install/udev/rules.d/50-udev.rules
    ipcop/trunk/config/rc.d/rc.sysinit
    ipcop/trunk/config/udev/rules.d/25-lfs.rules
    ipcop/trunk/config/udev/rules.d/50-udev.rules
    ipcop/trunk/config/udev/rules.d/60-ipcop.rules

Modified: ipcop/trunk/config/etc/group
===================================================================
--- ipcop/trunk/config/etc/group	2007-11-01 11:04:50 UTC (rev 623)
+++ ipcop/trunk/config/etc/group	2007-11-01 13:50:07 UTC (rev 624)
@@ -11,6 +11,7 @@
 mail:x:12:mail
 uucp:x:14:
 dialout:x:16:
+cdrom:x:18:root
 floppy:x:19:
 tape:x:20:
 utmp:x:22:

Modified: ipcop/trunk/config/install/udev/rules.d/25-lfs.rules
===================================================================
--- ipcop/trunk/config/install/udev/rules.d/25-lfs.rules	2007-11-01 11:04:50 UTC (rev 623)
+++ ipcop/trunk/config/install/udev/rules.d/25-lfs.rules	2007-11-01 13:50:07 UTC (rev 624)
@@ -2,140 +2,100 @@
 
 # Create the /dev/cdrom symlink.
 
-BUS="ide", KERNEL="*[!0-9]", PROGRAM="/bin/cat /proc/ide/%k/media", RESULT="cdrom", NAME="%k", SYMLINK="cdrom"
+BUS=="ide", KERNEL=="*[!0-9]", PROGRAM=="/bin/cat /proc/ide/%k/media", RESULT=="cdrom", NAME=="%k", SYMLINK="cdrom"
 
 # Core kernel devices
 
-KERNEL="ptmx",    GROUP="tty",  MODE="0666"
-KERNEL="random",                MODE="0444"
-KERNEL="urandom",               MODE="0444"
-KERNEL="kmem",    GROUP="kmem", MODE="0640"
-KERNEL="mem",     GROUP="kmem", MODE="0640"
-KERNEL="port",    GROUP="kmem", MODE="0640"
-KERNEL="null",                  MODE="0666"
-KERNEL="zero",                  MODE="0666"
-KERNEL="full",                  MODE="0666"
-KERNEL="aio",                   MODE="0444"
-KERNEL="kmsg",                  MODE="0600"
-KERNEL="rtc",                   MODE="0666"
+KERNEL=="ptmx",    GROUP="tty",  MODE="0666"
+KERNEL=="random",                MODE="0444"
+KERNEL=="urandom",               MODE="0444"
+KERNEL=="kmem",    GROUP="kmem", MODE="0640"
+KERNEL=="mem",     GROUP="kmem", MODE="0640"
+KERNEL=="port",    GROUP="kmem", MODE="0640"
+KERNEL=="null",                  MODE="0666"
+KERNEL=="zero",                  MODE="0666"
+KERNEL=="full",                  MODE="0666"
+KERNEL=="aio",                   MODE="0444"
+KERNEL=="kmsg",                  MODE="0600"
+KERNEL=="rtc",                   MODE="0666"
 
 # Comms devices
 
-KERNEL="ttyS[0-9]*",                   GROUP="dialout"
-KERNEL="ttyUSB[0-9]*",                 GROUP="dialout"
-KERNEL="rfcomm[0-9]*",                 GROUP="dialout"
-KERNEL="tty[BCDEFHILMPRSTUVWX][0-9]*", GROUP="dialout"
-KERNEL="ttyS[ACIR][0-9]*",             GROUP="dialout"
-KERNEL="ttyUSB[0-9]*",                 GROUP="dialout"
-KERNEL="ttyACM[0-9]*",                 GROUP="dialout"
-KERNEL="ippp[0-9]*",                   GROUP="dialout"
-KERNEL="isdn[0-9]*",                   GROUP="dialout"
-KERNEL="isdnctrl[0-9]*",               GROUP="dialout"
-KERNEL="capi",         NAME="capi20",  SYMLINK="isdn/capi20"
-KERNEL="capi*",        NAME="capi/%n", GROUP="dialout"
-KERNEL="dcbri[0-9]*",                  GROUP="dialout"
-KERNEL="ircomm[0-9]*",                 GROUP="dialout"
+KERNEL=="ttyS[0-9]*",                   GROUP="dialout"
+KERNEL=="ttyUSB[0-9]*",                 GROUP="dialout"
+KERNEL=="rfcomm[0-9]*",                 GROUP="dialout"
+KERNEL=="tty[BCDEFHILMPRSTUVWX][0-9]*", GROUP="dialout"
+KERNEL=="ttyS[ACIR][0-9]*",             GROUP="dialout"
+KERNEL=="ttyUSB[0-9]*",                 GROUP="dialout"
+KERNEL=="ttyACM[0-9]*",                 GROUP="dialout"
+KERNEL=="ippp[0-9]*",                   GROUP="dialout"
+KERNEL=="isdn[0-9]*",                   GROUP="dialout"
+KERNEL=="isdnctrl[0-9]*",               GROUP="dialout"
+KERNEL=="capi",         NAME="capi20",  SYMLINK="isdn/capi20"
+KERNEL=="capi*",        NAME="capi/%n", GROUP="dialout"
+KERNEL=="dcbri[0-9]*",                  GROUP="dialout"
+KERNEL=="ircomm[0-9]*",                 GROUP="dialout"
 
 # TTY's
 
-KERNEL="tty",       GROUP="tty", MODE="0666"
-KERNEL="tty[0-9]*", GROUP="tty", MODE="0666"
-KERNEL="vcs*",                   MODE="0600"
-KERNEL="console",   GROUP="tty", MODE="0622"
+KERNEL=="tty",       GROUP="tty", MODE="0666"
+KERNEL=="tty[0-9]*", GROUP="tty", MODE="0666"
+KERNEL=="vcs*",                   MODE="0600"
+KERNEL=="console",   GROUP="tty", MODE="0622"
 
-# ALSA devices go in their own subdirectory
-
-KERNEL="controlC[0-9]*", NAME="snd/%k", GROUP="audio"
-KERNEL="hw[CD0-9]*",	 NAME="snd/%k", GROUP="audio"
-KERNEL="pcm[CD0-9cp]*",  NAME="snd/%k", GROUP="audio"
-KERNEL="midiC[D0-9]*",	 NAME="snd/%k", GROUP="audio"
-KERNEL="timer",		     NAME="snd/%k", GROUP="audio"
-KERNEL="seq",		     NAME="snd/%k", GROUP="audio"
-
-# Sound devices
-
-KERNEL="admmidi*",                      GROUP="audio"
-KERNEL="adsp*",                         GROUP="audio"
-KERNEL="aload*",                        GROUP="audio"
-KERNEL="amidi*",                        GROUP="audio"
-KERNEL="amixer*",                       GROUP="audio"
-KERNEL="audio*",                        GROUP="audio"
-KERNEL="dmfm*",                         GROUP="audio"
-KERNEL="dmmidi*",                       GROUP="audio"
-KERNEL="dsp*",                          GROUP="audio"
-KERNEL="midi*",                         GROUP="audio"
-KERNEL="mixer*",                        GROUP="audio"
-KERNEL="music",                         GROUP="audio"
-KERNEL="sequencer*",                    GROUP="audio"
-
 # Printing devices
 
-KERNEL="lp[0-9]*",      GROUP="lp"
-KERNEL="parport[0-9]*", GROUP="lp"
-KERNEL="irlpt[0-9]*",   GROUP="lp"
+KERNEL=="lp[0-9]*",      GROUP="lp"
+KERNEL=="parport[0-9]*", GROUP="lp"
+KERNEL=="irlpt[0-9]*",   GROUP="lp"
 
 # Input devices go in their own subdirectory
 
-KERNEL="mice",		NAME="input/%k", MODE="0644"
-KERNEL="mouse*",	NAME="input/%k", MODE="0644", SYMLINK="mouse"
-KERNEL="event*",	NAME="input/%k", MODE="0644"
-KERNEL="js*",		NAME="input/%k", MODE="0644"
-KERNEL="ts*",		NAME="input/%k", MODE="0644"
+KERNEL=="mice",		NAME="input/%k", MODE="0644"
+KERNEL=="mouse*",	NAME="input/%k", MODE="0644", SYMLINK="mouse"
+KERNEL=="event*",	NAME="input/%k", MODE="0644"
+KERNEL=="js*",		NAME="input/%k", MODE="0644"
+KERNEL=="ts*",		NAME="input/%k", MODE="0644"
 
-KERNEL="psaux",                      MODE="0644"
-KERNEL="js",                         MODE="0644"
-KERNEL="djs",                        MODE="0644"
+KERNEL=="psaux",                      MODE="0644"
+KERNEL=="js",                         MODE="0644"
+KERNEL=="djs",                        MODE="0644"
 
 # USB devices go in their own subdirectory
 
-KERNEL="hiddev*",       NAME="usb/%k"
-KERNEL="auer*",		    NAME="usb/%k"
-KERNEL="legousbtower*", NAME="usb/%k"
-KERNEL="dabusb*",       NAME="usb/%k"
-BUS="usb", KERNEL="lp[0-9]*", NAME="usb/%k", GROUP="lp"
+KERNEL=="hiddev*",       NAME="usb/%k"
+KERNEL=="auer*",		    NAME="usb/%k"
+KERNEL=="legousbtower*", NAME="usb/%k"
+KERNEL=="dabusb*",       NAME="usb/%k"
+BUS=="usb", KERNEL=="lp[0-9]*", NAME=="usb/%k", GROUP="lp"
 
-# DRI devices go in their own subdirectory for FHS compliance
-
-KERNEL="card*",          NAME="dri/card%n", GROUP="video"
-
-# Video devices
-
-KERNEL="fb[0-9]*",     GROUP="video", MODE="0620"
-KERNEL="agpgart",      GROUP="video"
-KERNEL="nvidia[0-9]*", GROUP="video"
-KERNEL="nvidiactl",    GROUP="video"
-KERNEL="video[0-9]*",  GROUP="video"
-KERNEL="radio[0-9]*",  GROUP="video"
-KERNEL="vbi[0-9]*",    GROUP="video"
-KERNEL="vtx[0-9]*",    GROUP="video"
-
 # Storage/memory devices
 
-KERNEL="fd[0-9]*",                 GROUP="disk" SYMLINK="floppy"
-KERNEL="ram[0-9]*",                GROUP="disk"
-KERNEL="raw[0-9]*", NAME="raw/%k", GROUP="disk"
-KERNEL="hd*",                      GROUP="disk"
-KERNEL="sd[a-z]",                  GROUP="disk"
-KERNEL="sd[a-z][0-9]*",            GROUP="disk"
-KERNEL="sd[a-i][a-z]",             GROUP="disk"
-KERNEL="sd[a-i][a-z][0-9]*",       GROUP="disk"
-KERNEL="sr[0-9]*",                 GROUP="burning" MODE="0664"
-KERNEL="s[gt][0-9]*",              GROUP="disk"
-KERNEL="scd[0-9]*",                GROUP="cdrom"
-KERNEL="dasd[0-9]*",               GROUP="disk"
-KERNEL="ataraid[0-9]*",            GROUP="disk"
-KERNEL="loop[0-9]*",               GROUP="disk"
-KERNEL="md[0-9]*",                 GROUP="disk"
-KERNEL="dm-*",                     GROUP="disk",   MODE="0640"
-KERNEL="ht[0-9]*",                 GROUP="tape"
-KERNEL="nht[0-9]*",                GROUP="tape"
-KERNEL="pt[0-9]*",                 GROUP="tape"
-KERNEL="npt[0-9]*",                GROUP="tape"
-KERNEL="st[0-9]*",                 GROUP="tape"
-KERNEL="nst[0-9]*",                GROUP="tape"
-KERNEL="iseries/vcd*",             GROUP="disk"
-KERNEL="iseries/vd*",              GROUP="disk"
+KERNEL=="fd[0-9]*",                 GROUP="disk" SYMLINK="floppy"
+KERNEL=="ram[0-9]*",                GROUP="disk"
+KERNEL=="raw[0-9]*", NAME="raw/%k", GROUP="disk"
+KERNEL=="hd*",                      GROUP="disk"
+KERNEL=="sd[a-z]",                  GROUP="disk"
+KERNEL=="sd[a-z][0-9]*",            GROUP="disk"
+KERNEL=="sd[a-i][a-z]",             GROUP="disk"
+KERNEL=="sd[a-i][a-z][0-9]*",       GROUP="disk"
+KERNEL=="sr[0-9]*",                 GROUP="disk"
+KERNEL=="s[gt][0-9]*",              GROUP="disk"
+KERNEL=="scd[0-9]*",                GROUP="disk"
+KERNEL=="dasd[0-9]*",               GROUP="disk"
+KERNEL=="ataraid[0-9]*",            GROUP="disk"
+KERNEL=="loop[0-9]*",               GROUP="disk"
+KERNEL=="md[0-9]*",                 GROUP="disk"
+KERNEL=="dm-*",                     GROUP="disk",   MODE="0640"
+KERNEL=="ht[0-9]*",                 GROUP="tape"
+KERNEL=="nht[0-9]*",                GROUP="tape"
+KERNEL=="pt[0-9]*",                 GROUP="tape"
+KERNEL=="npt[0-9]*",                GROUP="tape"
+KERNEL=="st[0-9]*",                 GROUP="tape"
+KERNEL=="nst[0-9]*",                GROUP="tape"
+KERNEL=="iseries/vcd*",             GROUP="disk"
+KERNEL=="iseries/vd*",              GROUP="disk"
 
 # Network devices
 
-KERNEL="tun", NAME="net/%k"
+KERNEL=="tun", NAME="net/%k"

Modified: ipcop/trunk/config/install/udev/rules.d/50-udev.rules
===================================================================
--- ipcop/trunk/config/install/udev/rules.d/50-udev.rules	2007-11-01 11:04:50 UTC (rev 623)
+++ ipcop/trunk/config/install/udev/rules.d/50-udev.rules	2007-11-01 13:50:07 UTC (rev 624)
@@ -5,43 +5,43 @@
 #
 
 # if this is a ide cdrom, name it the default name, and create a symlink to cdrom
-BUS="ide", KERNEL="*[!0-9]", PROGRAM="/bin/cat /proc/ide/%k/media", RESULT="cdrom", NAME="%k", SYMLINK="cdrom"
+BUS=="ide", KERNEL=="*[!0-9]", PROGRAM=="/bin/cat /proc/ide/%k/media", RESULT=="cdrom", NAME=="%k", SYMLINK="cdrom"
 
 # create a symlink named after the device map name
 # note devmap_name comes with extras/multipath
-KERNEL="dm-[0-9]*", PROGRAM="/sbin/devmap_name %M %m", NAME="%k", SYMLINK="%c"
+KERNEL=="dm-[0-9]*", PROGRAM="/sbin/devmap_name %M %m", NAME="%k", SYMLINK="%c"
 
 # DRI devices always go into a subdirectory (as per the LSB spec)
-KERNEL="card*", NAME="dri/card%n"
+KERNEL=="card*", NAME="dri/card%n"
 
 # alsa devices
-KERNEL="controlC[0-9]*", NAME="snd/%k"
-KERNEL="hw[CD0-9]*",     NAME="snd/%k"
-KERNEL="pcm[CD0-9cp]*",  NAME="snd/%k"
-KERNEL="midiC[D0-9]*",   NAME="snd/%k"
-KERNEL="timer",          NAME="snd/%k"
-KERNEL="seq",            NAME="snd/%k"
+KERNEL=="controlC[0-9]*", NAME="snd/%k"
+KERNEL=="hw[CD0-9]*",     NAME="snd/%k"
+KERNEL=="pcm[CD0-9cp]*",  NAME="snd/%k"
+KERNEL=="midiC[D0-9]*",   NAME="snd/%k"
+KERNEL=="timer",          NAME="snd/%k"
+KERNEL=="seq",            NAME="snd/%k"
 
 # input devices
-KERNEL="mice",		NAME="input/%k"
-KERNEL="mouse*",	NAME="input/%k"
-KERNEL="event*",	NAME="input/%k"
-KERNEL="js*",		NAME="input/%k"
-KERNEL="ts*",		NAME="input/%k"
+KERNEL=="mice",		NAME="input/%k"
+KERNEL=="mouse*",	NAME="input/%k"
+KERNEL=="event*",	NAME="input/%k"
+KERNEL=="js*",		NAME="input/%k"
+KERNEL=="ts*",		NAME="input/%k"
 
 # USB devices
-KERNEL="hiddev*",	NAME="usb/%k"
-KERNEL="auer*",		NAME="usb/%k"
-KERNEL="legousbtower*",	NAME="usb/%k"
-KERNEL="dabusb*",	NAME="usb/%k"
-BUS="usb", KERNEL="lp[0-9]*",	NAME="usb/%k"
+KERNEL=="hiddev*",	NAME="usb/%k"
+KERNEL=="auer*",		NAME="usb/%k"
+KERNEL=="legousbtower*",	NAME="usb/%k"
+KERNEL=="dabusb*",	NAME="usb/%k"
+BUS=="usb", KERNEL=="lp[0-9]*",	NAME="usb/%k"
 
 # CAPI devices
-KERNEL="capi",		NAME="capi20", SYMLINK="isdn/capi20"
-KERNEL="capi*",		NAME="capi/%n"
+KERNEL=="capi",		NAME="capi20", SYMLINK="isdn/capi20"
+KERNEL=="capi*",		NAME="capi/%n"
 
 # Network devices
-KERNEL="tun",		NAME="net/%k"
+KERNEL=="tun",		NAME="net/%k"
 
 # raw devices
-KERNEL="raw[0-9]*",	NAME="raw/%k" 
+KERNEL=="raw[0-9]*",	NAME="raw/%k" 

Modified: ipcop/trunk/config/rc.d/rc.sysinit
===================================================================
--- ipcop/trunk/config/rc.d/rc.sysinit	2007-11-01 11:04:50 UTC (rev 623)
+++ ipcop/trunk/config/rc.d/rc.sysinit	2007-11-01 13:50:07 UTC (rev 624)
@@ -34,7 +34,7 @@
 echo "Mounting sysfs"
 /bin/mount -n -t sysfs none /sys
 echo "Mounting dev"
-/bin/mount -n -t tmpfs none /dev
+/bin/mount -n -t tmpfs none /dev -o mode=755
 /bin/mkdir -p -m 0755 /dev/pts
 /bin/mkdir -p -m 0755 /dev/shm
 /bin/mount -n -t devpts none /dev/pts

Modified: ipcop/trunk/config/udev/rules.d/25-lfs.rules
===================================================================
--- ipcop/trunk/config/udev/rules.d/25-lfs.rules	2007-11-01 11:04:50 UTC (rev 623)
+++ ipcop/trunk/config/udev/rules.d/25-lfs.rules	2007-11-01 13:50:07 UTC (rev 624)
@@ -2,140 +2,100 @@
 
 # Create the /dev/cdrom symlink.
 
-BUS="ide", KERNEL="*[!0-9]", PROGRAM="/bin/cat /proc/ide/%k/media", RESULT="cdrom", NAME="%k", SYMLINK="cdrom"
+BUS=="ide", KERNEL=="*[!0-9]", PROGRAM=="/bin/cat /proc/ide/%k/media", RESULT=="cdrom", NAME=="%k", SYMLINK="cdrom"
 
 # Core kernel devices
 
-KERNEL="ptmx",    GROUP="tty",  MODE="0666"
-KERNEL="random",                MODE="0444"
-KERNEL="urandom",               MODE="0444"
-KERNEL="kmem",    GROUP="kmem", MODE="0640"
-KERNEL="mem",     GROUP="kmem", MODE="0640"
-KERNEL="port",    GROUP="kmem", MODE="0640"
-KERNEL="null",                  MODE="0666"
-KERNEL="zero",                  MODE="0666"
-KERNEL="full",                  MODE="0666"
-KERNEL="aio",                   MODE="0444"
-KERNEL="kmsg",                  MODE="0600"
-KERNEL="rtc",                   MODE="0666"
+KERNEL=="ptmx",    GROUP="tty",  MODE="0666"
+KERNEL=="random",                MODE="0444"
+KERNEL=="urandom",               MODE="0444"
+KERNEL=="kmem",    GROUP="kmem", MODE="0640"
+KERNEL=="mem",     GROUP="kmem", MODE="0640"
+KERNEL=="port",    GROUP="kmem", MODE="0640"
+KERNEL=="null",                  MODE="0666"
+KERNEL=="zero",                  MODE="0666"
+KERNEL=="full",                  MODE="0666"
+KERNEL=="aio",                   MODE="0444"
+KERNEL=="kmsg",                  MODE="0600"
+KERNEL=="rtc",                   MODE="0666"
 
 # Comms devices
 
-KERNEL="ttyS[0-9]*",                   GROUP="dialout"
-KERNEL="ttyUSB[0-9]*",                 GROUP="dialout"
-KERNEL="rfcomm[0-9]*",                 GROUP="dialout"
-KERNEL="tty[BCDEFHILMPRSTUVWX][0-9]*", GROUP="dialout"
-KERNEL="ttyS[ACIR][0-9]*",             GROUP="dialout"
-KERNEL="ttyUSB[0-9]*",                 GROUP="dialout"
-KERNEL="ttyACM[0-9]*",                 GROUP="dialout"
-KERNEL="ippp[0-9]*",                   GROUP="dialout"
-KERNEL="isdn[0-9]*",                   GROUP="dialout"
-KERNEL="isdnctrl[0-9]*",               GROUP="dialout"
-KERNEL="capi",         NAME="capi20",  SYMLINK="isdn/capi20"
-KERNEL="capi*",        NAME="capi/%n", GROUP="dialout"
-KERNEL="dcbri[0-9]*",                  GROUP="dialout"
-KERNEL="ircomm[0-9]*",                 GROUP="dialout"
+KERNEL=="ttyS[0-9]*",                   GROUP="dialout"
+KERNEL=="ttyUSB[0-9]*",                 GROUP="dialout"
+KERNEL=="rfcomm[0-9]*",                 GROUP="dialout"
+KERNEL=="tty[BCDEFHILMPRSTUVWX][0-9]*", GROUP="dialout"
+KERNEL=="ttyS[ACIR][0-9]*",             GROUP="dialout"
+KERNEL=="ttyUSB[0-9]*",                 GROUP="dialout"
+KERNEL=="ttyACM[0-9]*",                 GROUP="dialout"
+KERNEL=="ippp[0-9]*",                   GROUP="dialout"
+KERNEL=="isdn[0-9]*",                   GROUP="dialout"
+KERNEL=="isdnctrl[0-9]*",               GROUP="dialout"
+KERNEL=="capi",         NAME="capi20",  SYMLINK="isdn/capi20"
+KERNEL=="capi*",        NAME="capi/%n", GROUP="dialout"
+KERNEL=="dcbri[0-9]*",                  GROUP="dialout"
+KERNEL=="ircomm[0-9]*",                 GROUP="dialout"
 
 # TTY's
 
-KERNEL="tty",       GROUP="tty", MODE="0666"
-KERNEL="tty[0-9]*", GROUP="tty", MODE="0666"
-KERNEL="vcs*",                   MODE="0600"
-KERNEL="console",   GROUP="tty", MODE="0622"
+KERNEL=="tty",       GROUP="tty", MODE="0666"
+KERNEL=="tty[0-9]*", GROUP="tty", MODE="0666"
+KERNEL=="vcs*",                   MODE="0600"
+KERNEL=="console",   GROUP="tty", MODE="0622"
 
-# ALSA devices go in their own subdirectory
-
-KERNEL="controlC[0-9]*", NAME="snd/%k", GROUP="audio"
-KERNEL="hw[CD0-9]*",	 NAME="snd/%k", GROUP="audio"
-KERNEL="pcm[CD0-9cp]*",  NAME="snd/%k", GROUP="audio"
-KERNEL="midiC[D0-9]*",	 NAME="snd/%k", GROUP="audio"
-KERNEL="timer",		     NAME="snd/%k", GROUP="audio"
-KERNEL="seq",		     NAME="snd/%k", GROUP="audio"
-
-# Sound devices
-
-KERNEL="admmidi*",                      GROUP="audio"
-KERNEL="adsp*",                         GROUP="audio"
-KERNEL="aload*",                        GROUP="audio"
-KERNEL="amidi*",                        GROUP="audio"
-KERNEL="amixer*",                       GROUP="audio"
-KERNEL="audio*",                        GROUP="audio"
-KERNEL="dmfm*",                         GROUP="audio"
-KERNEL="dmmidi*",                       GROUP="audio"
-KERNEL="dsp*",                          GROUP="audio"
-KERNEL="midi*",                         GROUP="audio"
-KERNEL="mixer*",                        GROUP="audio"
-KERNEL="music",                         GROUP="audio"
-KERNEL="sequencer*",                    GROUP="audio"
-
 # Printing devices
 
-KERNEL="lp[0-9]*",      GROUP="lp"
-KERNEL="parport[0-9]*", GROUP="lp"
-KERNEL="irlpt[0-9]*",   GROUP="lp"
+KERNEL=="lp[0-9]*",      GROUP="lp"
+KERNEL=="parport[0-9]*", GROUP="lp"
+KERNEL=="irlpt[0-9]*",   GROUP="lp"
 
 # Input devices go in their own subdirectory
 
-KERNEL="mice",		NAME="input/%k", MODE="0644"
-KERNEL="mouse*",	NAME="input/%k", MODE="0644", SYMLINK="mouse"
-KERNEL="event*",	NAME="input/%k", MODE="0644"
-KERNEL="js*",		NAME="input/%k", MODE="0644"
-KERNEL="ts*",		NAME="input/%k", MODE="0644"
+KERNEL=="mice",		NAME="input/%k", MODE="0644"
+KERNEL=="mouse*",	NAME="input/%k", MODE="0644", SYMLINK="mouse"
+KERNEL=="event*",	NAME="input/%k", MODE="0644"
+KERNEL=="js*",		NAME="input/%k", MODE="0644"
+KERNEL=="ts*",		NAME="input/%k", MODE="0644"
 
-KERNEL="psaux",                      MODE="0644"
-KERNEL="js",                         MODE="0644"
-KERNEL="djs",                        MODE="0644"
+KERNEL=="psaux",                      MODE="0644"
+KERNEL=="js",                         MODE="0644"
+KERNEL=="djs",                        MODE="0644"
 
 # USB devices go in their own subdirectory
 
-KERNEL="hiddev*",       NAME="usb/%k"
-KERNEL="auer*",		    NAME="usb/%k"
-KERNEL="legousbtower*", NAME="usb/%k"
-KERNEL="dabusb*",       NAME="usb/%k"
-BUS="usb", KERNEL="lp[0-9]*", NAME="usb/%k", GROUP="lp"
+KERNEL=="hiddev*",       NAME="usb/%k"
+KERNEL=="auer*",		    NAME="usb/%k"
+KERNEL=="legousbtower*", NAME="usb/%k"
+KERNEL=="dabusb*",       NAME="usb/%k"
+BUS=="usb", KERNEL=="lp[0-9]*", NAME=="usb/%k", GROUP="lp"
 
-# DRI devices go in their own subdirectory for FHS compliance
-
-KERNEL="card*",          NAME="dri/card%n", GROUP="video"
-
-# Video devices
-
-KERNEL="fb[0-9]*",     GROUP="video", MODE="0620"
-KERNEL="agpgart",      GROUP="video"
-KERNEL="nvidia[0-9]*", GROUP="video"
-KERNEL="nvidiactl",    GROUP="video"
-KERNEL="video[0-9]*",  GROUP="video"
-KERNEL="radio[0-9]*",  GROUP="video"
-KERNEL="vbi[0-9]*",    GROUP="video"
-KERNEL="vtx[0-9]*",    GROUP="video"
-
 # Storage/memory devices
 
-KERNEL="fd[0-9]*",                 GROUP="floppy" SYMLINK="floppy"
-KERNEL="ram[0-9]*",                GROUP="disk"
-KERNEL="raw[0-9]*", NAME="raw/%k", GROUP="disk"
-KERNEL="hd*",                      GROUP="disk"
-KERNEL="sd[a-z]",                  GROUP="disk"
-KERNEL="sd[a-z][0-9]*",            GROUP="disk"
-KERNEL="sd[a-i][a-z]",             GROUP="disk"
-KERNEL="sd[a-i][a-z][0-9]*",       GROUP="disk"
-KERNEL="sr[0-9]*",                 GROUP="burning" MODE="0664"
-KERNEL="s[gt][0-9]*",              GROUP="disk"
-KERNEL="scd[0-9]*",                GROUP="cdrom"
-KERNEL="dasd[0-9]*",               GROUP="disk"
-KERNEL="ataraid[0-9]*",            GROUP="disk"
-KERNEL="loop[0-9]*",               GROUP="disk"
-KERNEL="md[0-9]*",                 GROUP="disk"
-KERNEL="dm-*",                     GROUP="disk",   MODE="0640"
-KERNEL="ht[0-9]*",                 GROUP="tape"
-KERNEL="nht[0-9]*",                GROUP="tape"
-KERNEL="pt[0-9]*",                 GROUP="tape"
-KERNEL="npt[0-9]*",                GROUP="tape"
-KERNEL="st[0-9]*",                 GROUP="tape"
-KERNEL="nst[0-9]*",                GROUP="tape"
-KERNEL="iseries/vcd*",             GROUP="disk"
-KERNEL="iseries/vd*",              GROUP="disk"
+KERNEL=="fd[0-9]*",                 GROUP="floppy" SYMLINK="floppy"
+KERNEL=="ram[0-9]*",                GROUP="disk"
+KERNEL=="raw[0-9]*", NAME="raw/%k", GROUP="disk"
+KERNEL=="hd*",                      GROUP="disk"
+KERNEL=="sd[a-z]",                  GROUP="disk"
+KERNEL=="sd[a-z][0-9]*",            GROUP="disk"
+KERNEL=="sd[a-i][a-z]",             GROUP="disk"
+KERNEL=="sd[a-i][a-z][0-9]*",       GROUP="disk"
+KERNEL=="sr[0-9]*",                 GROUP="cdrom", MODE="0644"
+KERNEL=="s[gt][0-9]*",              GROUP="disk"
+KERNEL=="scd[0-9]*",                GROUP="cdrom"
+KERNEL=="dasd[0-9]*",               GROUP="disk"
+KERNEL=="ataraid[0-9]*",            GROUP="disk"
+KERNEL=="loop[0-9]*",               GROUP="disk"
+KERNEL=="md[0-9]*",                 GROUP="disk"
+KERNEL=="dm-*",                     GROUP="disk", MODE="0640"
+KERNEL=="ht[0-9]*",                 GROUP="tape"
+KERNEL=="nht[0-9]*",                GROUP="tape"
+KERNEL=="pt[0-9]*",                 GROUP="tape"
+KERNEL=="npt[0-9]*",                GROUP="tape"
+KERNEL=="st[0-9]*",                 GROUP="tape"
+KERNEL=="nst[0-9]*",                GROUP="tape"
+KERNEL=="iseries/vcd*",             GROUP="disk"
+KERNEL=="iseries/vd*",              GROUP="disk"
 
 # Network devices
 
-KERNEL="tun", NAME="net/%k"
+KERNEL=="tun", NAME="net/%k"

Modified: ipcop/trunk/config/udev/rules.d/50-udev.rules
===================================================================
--- ipcop/trunk/config/udev/rules.d/50-udev.rules	2007-11-01 11:04:50 UTC (rev 623)
+++ ipcop/trunk/config/udev/rules.d/50-udev.rules	2007-11-01 13:50:07 UTC (rev 624)
@@ -5,43 +5,43 @@
 #
 
 # if this is a ide cdrom, name it the default name, and create a symlink to cdrom
-BUS="ide", KERNEL="*[!0-9]", PROGRAM="/bin/cat /proc/ide/%k/media", RESULT="cdrom", NAME="%k", SYMLINK="cdrom"
+BUS=="ide", KERNEL=="*[!0-9]", PROGRAM=="/bin/cat /proc/ide/%k/media", RESULT=="cdrom", NAME=="%k", SYMLINK="cdrom"
 
 # create a symlink named after the device map name
 # note devmap_name comes with extras/multipath
-KERNEL="dm-[0-9]*", PROGRAM="/sbin/devmap_name %M %m", NAME="%k", SYMLINK="%c"
+KERNEL=="dm-[0-9]*", PROGRAM="/sbin/devmap_name %M %m", NAME="%k", SYMLINK="%c"
 
 # DRI devices always go into a subdirectory (as per the LSB spec)
-KERNEL="card*", NAME="dri/card%n"
+KERNEL=="card*", NAME="dri/card%n"
 
 # alsa devices
-KERNEL="controlC[0-9]*", NAME="snd/%k"
-KERNEL="hw[CD0-9]*",     NAME="snd/%k"
-KERNEL="pcm[CD0-9cp]*",  NAME="snd/%k"
-KERNEL="midiC[D0-9]*",   NAME="snd/%k"
-KERNEL="timer",          NAME="snd/%k"
-KERNEL="seq",            NAME="snd/%k"
+KERNEL=="controlC[0-9]*", NAME="snd/%k"
+KERNEL=="hw[CD0-9]*",     NAME="snd/%k"
+KERNEL=="pcm[CD0-9cp]*",  NAME="snd/%k"
+KERNEL=="midiC[D0-9]*",   NAME="snd/%k"
+KERNEL=="timer",          NAME="snd/%k"
+KERNEL=="seq",            NAME="snd/%k"
 
 # input devices
-KERNEL="mice",		NAME="input/%k"
-KERNEL="mouse*",	NAME="input/%k"
-KERNEL="event*",	NAME="input/%k"
-KERNEL="js*",		NAME="input/%k"
-KERNEL="ts*",		NAME="input/%k"
+KERNEL=="mice",		NAME="input/%k"
+KERNEL=="mouse*",	NAME="input/%k"
+KERNEL=="event*",	NAME="input/%k"
+KERNEL=="js*",		NAME="input/%k"
+KERNEL=="ts*",		NAME="input/%k"
 
 # USB devices
-KERNEL="hiddev*",	NAME="usb/%k"
-KERNEL="auer*",		NAME="usb/%k"
-KERNEL="legousbtower*",	NAME="usb/%k"
-KERNEL="dabusb*",	NAME="usb/%k"
-BUS="usb", KERNEL="lp[0-9]*",	NAME="usb/%k"
+KERNEL=="hiddev*",	NAME="usb/%k"
+KERNEL=="auer*",		NAME="usb/%k"
+KERNEL=="legousbtower*",	NAME="usb/%k"
+KERNEL=="dabusb*",	NAME="usb/%k"
+BUS=="usb", KERNEL=="lp[0-9]*",	NAME="usb/%k"
 
 # CAPI devices
-KERNEL="capi",		NAME="capi20", SYMLINK="isdn/capi20"
-KERNEL="capi*",		NAME="capi/%n"
+KERNEL=="capi",		NAME="capi20", SYMLINK="isdn/capi20"
+KERNEL=="capi*",		NAME="capi/%n"
 
 # Network devices
-KERNEL="tun",		NAME="net/%k"
+KERNEL=="tun",		NAME="net/%k"
 
 # raw devices
-KERNEL="raw[0-9]*",	NAME="raw/%k" 
+KERNEL=="raw[0-9]*",	NAME="raw/%k" 

Modified: ipcop/trunk/config/udev/rules.d/60-ipcop.rules
===================================================================
--- ipcop/trunk/config/udev/rules.d/60-ipcop.rules	2007-11-01 11:04:50 UTC (rev 623)
+++ ipcop/trunk/config/udev/rules.d/60-ipcop.rules	2007-11-01 13:50:07 UTC (rev 624)
@@ -1,3 +1,3 @@
-KERNEL="hd[a-z]", BUS="ide", SYSFS{removable}="1", RESULT="floppy", SYMLINK="floppy%e, NAME{ignore_remove, all_partitions}="%k", GROUP="floppy"
+KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", RESULT=="floppy", SYMLINK="floppy%e, NAME{ignore_remove, all_partitions}="%k", GROUP="floppy"
 
-KERNEL="sd[a-z]", BUS="usb", SYSFS{manufacturer}="TEAC", SYMLINK="floppy%e", GROUP="floppy"
+KERNEL=="sd[a-z]", BUS=="usb", SYSFS{manufacturer}=="TEAC", SYMLINK="floppy%e", GROUP="floppy"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Ipcop-svn] SF.net SVN: ipcop: [623] ipcop/trunk

From: <ow...@us...> - 2007-11-01 11:04:49

Revision: 623
          http://ipcop.svn.sourceforge.net/ipcop/?rev=623&view=rev
Author:   owes
Date:     2007-11-01 04:04:50 -0700 (Thu, 01 Nov 2007)

Log Message:
-----------
Move keymaps to /usr/share/kbd, we do not need /lib/kbd.
Fix default keyboard selection (qwerty/us) for Installer.

Modified Paths:
--------------
    ipcop/trunk/config/rootfiles/common/kbd
    ipcop/trunk/lfs/kbd
    ipcop/trunk/lfs/stage5
    ipcop/trunk/src/installer/keymap.c

Modified: ipcop/trunk/config/rootfiles/common/kbd
===================================================================
--- ipcop/trunk/config/rootfiles/common/kbd	2007-11-01 08:28:07 UTC (rev 622)
+++ ipcop/trunk/config/rootfiles/common/kbd	2007-11-01 11:04:50 UTC (rev 623)
@@ -26,489 +26,489 @@
 usr/bin/unicode_start
 usr/bin/unicode_stop
 #usr/share/kbd
-#lib/kbd/consolefonts
-#lib/kbd/consolefonts/161.cp.gz
-#lib/kbd/consolefonts/162.cp.gz
-#lib/kbd/consolefonts/163.cp.gz
-#lib/kbd/consolefonts/164.cp.gz
-#lib/kbd/consolefonts/165.cp.gz
-#lib/kbd/consolefonts/737.cp.gz
-#lib/kbd/consolefonts/880.cp.gz
-#lib/kbd/consolefonts/928.cp.gz
-#lib/kbd/consolefonts/972.cp.gz
-#lib/kbd/consolefonts/Agafari-12.psfu.gz
-#lib/kbd/consolefonts/Agafari-14.psfu.gz
-#lib/kbd/consolefonts/Agafari-16.psfu.gz
-#lib/kbd/consolefonts/Cyr_a8x14.psfu.gz
-#lib/kbd/consolefonts/Cyr_a8x16.psfu.gz
-#lib/kbd/consolefonts/Cyr_a8x8.psfu.gz
-#lib/kbd/consolefonts/ERRORS
-#lib/kbd/consolefonts/Goha-12.psfu.gz
-#lib/kbd/consolefonts/Goha-14.psfu.gz
-#lib/kbd/consolefonts/Goha-16.psfu.gz
-#lib/kbd/consolefonts/GohaClassic-12.psfu.gz
-#lib/kbd/consolefonts/GohaClassic-14.psfu.gz
-#lib/kbd/consolefonts/GohaClassic-16.psfu.gz
-#lib/kbd/consolefonts/LatArCyrHeb-08.psfu.gz
-#lib/kbd/consolefonts/LatArCyrHeb-14.psfu.gz
-#lib/kbd/consolefonts/LatArCyrHeb-16+.psfu.gz
-#lib/kbd/consolefonts/LatArCyrHeb-16.psfu.gz
-#lib/kbd/consolefonts/LatArCyrHeb-19.psfu.gz
-#lib/kbd/consolefonts/Mik_8x16.gz
-#lib/kbd/consolefonts/README.12x22
-#lib/kbd/consolefonts/README.Arabic
-#lib/kbd/consolefonts/README.Cyrillic
-#lib/kbd/consolefonts/README.Ethiopic
-#lib/kbd/consolefonts/README.Greek
-#lib/kbd/consolefonts/README.Hebrew
-#lib/kbd/consolefonts/README.cp1250
-#lib/kbd/consolefonts/README.cybercafe
-#lib/kbd/consolefonts/README.drdos
-#lib/kbd/consolefonts/README.lat0
-#lib/kbd/consolefonts/README.lat7
-#lib/kbd/consolefonts/README.lat9
-#lib/kbd/consolefonts/README.psfu
-#lib/kbd/consolefonts/alt-8x14.gz
-#lib/kbd/consolefonts/alt-8x16.gz
-#lib/kbd/consolefonts/alt-8x8.gz
-#lib/kbd/consolefonts/altc-8x16.gz
-#lib/kbd/consolefonts/aply16.psf.gz
-#lib/kbd/consolefonts/arm8.fnt.gz
-#lib/kbd/consolefonts/cp1250.psfu.gz
-#lib/kbd/consolefonts/cp850-8x14.psfu.gz
-#lib/kbd/consolefonts/cp850-8x16.psfu.gz
-#lib/kbd/consolefonts/cp850-8x8.psfu.gz
-#lib/kbd/consolefonts/cp857.08.gz
-#lib/kbd/consolefonts/cp857.14.gz
-#lib/kbd/consolefonts/cp857.16.gz
-#lib/kbd/consolefonts/cp865-8x14.psfu.gz
-#lib/kbd/consolefonts/cp865-8x16.psfu.gz
-#lib/kbd/consolefonts/cp865-8x8.psfu.gz
-#lib/kbd/consolefonts/cp866-8x14.psf.gz
-#lib/kbd/consolefonts/cp866-8x16.psf.gz
-#lib/kbd/consolefonts/cp866-8x8.psf.gz
-#lib/kbd/consolefonts/cybercafe.fnt.gz
-#lib/kbd/consolefonts/cyr-sun16.psfu.gz
-#lib/kbd/consolefonts/default8x16.psfu.gz
-#lib/kbd/consolefonts/default8x9.psfu.gz
-#lib/kbd/consolefonts/drdos8x14.psfu.gz
-#lib/kbd/consolefonts/drdos8x16.psfu.gz
-#lib/kbd/consolefonts/drdos8x6.psfu.gz
-#lib/kbd/consolefonts/drdos8x8.psfu.gz
-#lib/kbd/consolefonts/gr737a-8x8.psfu.gz
-#lib/kbd/consolefonts/gr737a-9x14.psfu.gz
-#lib/kbd/consolefonts/gr737a-9x16.psfu.gz
-#lib/kbd/consolefonts/gr737b-8x11.psfu.gz
-#lib/kbd/consolefonts/gr737b-9x16-medieval.psfu.gz
-#lib/kbd/consolefonts/gr737c-8x14.psfu.gz
-#lib/kbd/consolefonts/gr737c-8x16.psfu.gz
-#lib/kbd/consolefonts/gr737c-8x6.psfu.gz
-#lib/kbd/consolefonts/gr737c-8x7.psfu.gz
-#lib/kbd/consolefonts/gr737c-8x8.psfu.gz
-#lib/kbd/consolefonts/gr737d-8x16.psfu.gz
-#lib/kbd/consolefonts/gr928-8x16-thin.psfu.gz
-#lib/kbd/consolefonts/gr928-9x14.psfu.gz
-#lib/kbd/consolefonts/gr928-9x16.psfu.gz
-#lib/kbd/consolefonts/gr928a-8x14.psfu.gz
-#lib/kbd/consolefonts/gr928a-8x16.psfu.gz
-#lib/kbd/consolefonts/gr928b-8x14.psfu.gz
-#lib/kbd/consolefonts/gr928b-8x16.psfu.gz
-#lib/kbd/consolefonts/greek-polytonic.psfu.gz
-#lib/kbd/consolefonts/iso01-12x22.psfu.gz
-#lib/kbd/consolefonts/iso01.08.gz
-#lib/kbd/consolefonts/iso01.14.gz
-#lib/kbd/consolefonts/iso01.16.gz
-#lib/kbd/consolefonts/iso02-12x22.psfu.gz
-#lib/kbd/consolefonts/iso02.08.gz
-#lib/kbd/consolefonts/iso02.14.gz
-#lib/kbd/consolefonts/iso02.16.gz
-#lib/kbd/consolefonts/iso03.08.gz
-#lib/kbd/consolefonts/iso03.14.gz
-#lib/kbd/consolefonts/iso03.16.gz
-#lib/kbd/consolefonts/iso04.08.gz
-#lib/kbd/consolefonts/iso04.14.gz
-#lib/kbd/consolefonts/iso04.16.gz
-#lib/kbd/consolefonts/iso05.08.gz
-#lib/kbd/consolefonts/iso05.14.gz
-#lib/kbd/consolefonts/iso05.16.gz
-#lib/kbd/consolefonts/iso06.08.gz
-#lib/kbd/consolefonts/iso06.14.gz
-#lib/kbd/consolefonts/iso06.16.gz
-#lib/kbd/consolefonts/iso07.14.gz
-#lib/kbd/consolefonts/iso07.16.gz
-lib/kbd/consolefonts/iso07u-16.psfu.gz
-#lib/kbd/consolefonts/iso08.08.gz
-#lib/kbd/consolefonts/iso08.14.gz
-#lib/kbd/consolefonts/iso08.16.gz
-#lib/kbd/consolefonts/iso09.08.gz
-#lib/kbd/consolefonts/iso09.14.gz
-#lib/kbd/consolefonts/iso09.16.gz
-#lib/kbd/consolefonts/iso10.08.gz
-#lib/kbd/consolefonts/iso10.14.gz
-#lib/kbd/consolefonts/iso10.16.gz
-#lib/kbd/consolefonts/koi8-14.psf.gz
-#lib/kbd/consolefonts/koi8c-8x16.gz
-#lib/kbd/consolefonts/koi8r-8x14.gz
-#lib/kbd/consolefonts/koi8r-8x16.gz
-#lib/kbd/consolefonts/koi8r-8x8.gz
-#lib/kbd/consolefonts/koi8r.8x8.psfu.gz
-#lib/kbd/consolefonts/koi8u_8x14.psfu.gz
-#lib/kbd/consolefonts/koi8u_8x16.psfu.gz
-#lib/kbd/consolefonts/koi8u_8x8.psfu.gz
-#lib/kbd/consolefonts/lat0-08.psfu.gz
-#lib/kbd/consolefonts/lat0-10.psfu.gz
-#lib/kbd/consolefonts/lat0-12.psfu.gz
-#lib/kbd/consolefonts/lat0-14.psfu.gz
-lib/kbd/consolefonts/lat0-16.psfu.gz
-#lib/kbd/consolefonts/lat1-08.psfu.gz
-#lib/kbd/consolefonts/lat1-10.psfu.gz
-#lib/kbd/consolefonts/lat1-12.psfu.gz
-#lib/kbd/consolefonts/lat1-14.psfu.gz
-lib/kbd/consolefonts/lat1-16.psfu.gz
-#lib/kbd/consolefonts/lat2-08.psfu.gz
-#lib/kbd/consolefonts/lat2-10.psfu.gz
-#lib/kbd/consolefonts/lat2-12.psfu.gz
-#lib/kbd/consolefonts/lat2-14.psfu.gz
-lib/kbd/consolefonts/lat2-16.psfu.gz
-#lib/kbd/consolefonts/lat2a-16.psfu.gz
-#lib/kbd/consolefonts/lat4-08.psfu.gz
-#lib/kbd/consolefonts/lat4-10.psfu.gz
-#lib/kbd/consolefonts/lat4-12.psfu.gz
-#lib/kbd/consolefonts/lat4-14.psfu.gz
-#lib/kbd/consolefonts/lat4-16+.psfu.gz
-#lib/kbd/consolefonts/lat4-16.psfu.gz
-#lib/kbd/consolefonts/lat4-19.psfu.gz
-#lib/kbd/consolefonts/lat4a-08.psfu.gz
-#lib/kbd/consolefonts/lat4a-10.psfu.gz
-#lib/kbd/consolefonts/lat4a-12.psfu.gz
-#lib/kbd/consolefonts/lat4a-14.psfu.gz
-#lib/kbd/consolefonts/lat4a-16+.psfu.gz
-#lib/kbd/consolefonts/lat4a-16.psfu.gz
-#lib/kbd/consolefonts/lat4a-19.psfu.gz
-#lib/kbd/consolefonts/lat5-12.psfu.gz
-#lib/kbd/consolefonts/lat5-14.psfu.gz
-lib/kbd/consolefonts/lat5-16.psfu.gz
-#lib/kbd/consolefonts/lat7-14.psfu.gz
-#lib/kbd/consolefonts/lat7a-14.psfu.gz
-#lib/kbd/consolefonts/lat7a-16.psf.gz
-#lib/kbd/consolefonts/lat9-08.psf.gz
-#lib/kbd/consolefonts/lat9-10.psf.gz
-#lib/kbd/consolefonts/lat9-12.psf.gz
-#lib/kbd/consolefonts/lat9-14.psf.gz
-#lib/kbd/consolefonts/lat9-16.psf.gz
-#lib/kbd/consolefonts/lat9u-08.psfu.gz
-#lib/kbd/consolefonts/lat9u-10.psfu.gz
-#lib/kbd/consolefonts/lat9u-12.psfu.gz
-#lib/kbd/consolefonts/lat9u-14.psfu.gz
-#lib/kbd/consolefonts/lat9u-16.psfu.gz
-#lib/kbd/consolefonts/lat9v-08.psfu.gz
-#lib/kbd/consolefonts/lat9v-10.psfu.gz
-#lib/kbd/consolefonts/lat9v-12.psfu.gz
-#lib/kbd/consolefonts/lat9v-14.psfu.gz
-#lib/kbd/consolefonts/lat9v-16.psfu.gz
-#lib/kbd/consolefonts/lat9w-08.psfu.gz
-#lib/kbd/consolefonts/lat9w-10.psfu.gz
-#lib/kbd/consolefonts/lat9w-12.psfu.gz
-#lib/kbd/consolefonts/lat9w-14.psfu.gz
-#lib/kbd/consolefonts/lat9w-16.psfu.gz
-#lib/kbd/consolefonts/partialfonts
-#lib/kbd/consolefonts/partialfonts/8859-1.a0-ff.08.gz
-#lib/kbd/consolefonts/partialfonts/8859-1.a0-ff.14.gz
-#lib/kbd/consolefonts/partialfonts/8859-1.a0-ff.16.gz
-#lib/kbd/consolefonts/partialfonts/8859-10.a0-ff.08.gz
-#lib/kbd/consolefonts/partialfonts/8859-10.a0-ff.14.gz
-#lib/kbd/consolefonts/partialfonts/8859-10.a0-ff.16.gz
-#lib/kbd/consolefonts/partialfonts/8859-2.a0-ff.08.gz
-#lib/kbd/consolefonts/partialfonts/8859-2.a0-ff.14.gz
-#lib/kbd/consolefonts/partialfonts/8859-2.a0-ff.16.gz
-#lib/kbd/consolefonts/partialfonts/8859-3.a0-ff.08.gz
-#lib/kbd/consolefonts/partialfonts/8859-3.a0-ff.14.gz
-#lib/kbd/consolefonts/partialfonts/8859-3.a0-ff.16.gz
-#lib/kbd/consolefonts/partialfonts/8859-4.a0-ff.08.gz
-#lib/kbd/consolefonts/partialfonts/8859-4.a0-ff.14.gz
-#lib/kbd/consolefonts/partialfonts/8859-4.a0-ff.16.gz
-#lib/kbd/consolefonts/partialfonts/8859-5.a0-ff.08.gz
-#lib/kbd/consolefonts/partialfonts/8859-5.a0-ff.14.gz
-#lib/kbd/consolefonts/partialfonts/8859-5.a0-ff.16.gz
-#lib/kbd/consolefonts/partialfonts/8859-6.a0-ff.08.gz
-#lib/kbd/consolefonts/partialfonts/8859-6.a0-ff.14.gz
-#lib/kbd/consolefonts/partialfonts/8859-6.a0-ff.16.gz
-#lib/kbd/consolefonts/partialfonts/8859-7.a0-ff.08.gz
-#lib/kbd/consolefonts/partialfonts/8859-7.a0-ff.14.gz
-#lib/kbd/consolefonts/partialfonts/8859-7.a0-ff.16.gz
-#lib/kbd/consolefonts/partialfonts/8859-8.a0-ff.08.gz
-#lib/kbd/consolefonts/partialfonts/8859-8.a0-ff.14.gz
-#lib/kbd/consolefonts/partialfonts/8859-8.a0-ff.16.gz
-#lib/kbd/consolefonts/partialfonts/8859-9.a0-ff.08.gz
-#lib/kbd/consolefonts/partialfonts/8859-9.a0-ff.14.gz
-#lib/kbd/consolefonts/partialfonts/8859-9.a0-ff.16.gz
-#lib/kbd/consolefonts/partialfonts/ascii.20-7f.08.gz
-#lib/kbd/consolefonts/partialfonts/ascii.20-7f.14.gz
-#lib/kbd/consolefonts/partialfonts/ascii.20-7f.16.gz
-#lib/kbd/consolefonts/partialfonts/cp437.00-1f.08.gz
-#lib/kbd/consolefonts/partialfonts/cp437.00-1f.14.gz
-#lib/kbd/consolefonts/partialfonts/cp437.00-1f.16.gz
-#lib/kbd/consolefonts/partialfonts/none.00-17.08.gz
-#lib/kbd/consolefonts/partialfonts/none.00-17.14.gz
-#lib/kbd/consolefonts/partialfonts/none.00-17.16.gz
-#lib/kbd/consolefonts/ruscii_8x16.psfu.gz
-#lib/kbd/consolefonts/ruscii_8x8.psfu.gz
-#lib/kbd/consolefonts/sun12x22.psfu.gz
-#lib/kbd/consolefonts/t.fnt.gz
-#lib/kbd/consolefonts/t850b.fnt.gz
-#lib/kbd/consolefonts/tcvn8x16.psf.gz
-lib/kbd/consolefonts/viscii10-8x16.psfu.gz
-#lib/kbd/consoletrans
-#lib/kbd/consoletrans/8859-10_to_uni.trans
-#lib/kbd/consoletrans/8859-13_to_uni.trans
-#lib/kbd/consoletrans/8859-14_to_uni.trans
-#lib/kbd/consoletrans/8859-15_to_uni.trans
-#lib/kbd/consoletrans/8859-1_to_uni.trans
-#lib/kbd/consoletrans/8859-2_to_uni.trans
-#lib/kbd/consoletrans/8859-3_to_uni.trans
-#lib/kbd/consoletrans/8859-4_to_uni.trans
-#lib/kbd/consoletrans/8859-5_to_uni.trans
-#lib/kbd/consoletrans/8859-6_to_uni.trans
-#lib/kbd/consoletrans/8859-7_to_uni.trans
-#lib/kbd/consoletrans/8859-8_to_uni.trans
-#lib/kbd/consoletrans/8859-9_to_uni.trans
-#lib/kbd/consoletrans/baltic.trans
-#lib/kbd/consoletrans/cp1250_to_uni.trans
-#lib/kbd/consoletrans/cp1251_to_uni.trans
-#lib/kbd/consoletrans/cp437_to_iso01.trans
-#lib/kbd/consoletrans/cp437_to_uni.trans
-#lib/kbd/consoletrans/cp737_to_uni.trans
-#lib/kbd/consoletrans/cp775_to_uni.trans
-#lib/kbd/consoletrans/cp850_to_iso01.trans
-#lib/kbd/consoletrans/cp850_to_uni.trans
-#lib/kbd/consoletrans/cp852_to_uni.trans
-#lib/kbd/consoletrans/cp853_to_uni.trans
-#lib/kbd/consoletrans/cp855_to_uni.trans
-#lib/kbd/consoletrans/cp857_to_uni.trans
-#lib/kbd/consoletrans/cp860_to_uni.trans
-#lib/kbd/consoletrans/cp861_to_uni.trans
-#lib/kbd/consoletrans/cp862_to_uni.trans
-#lib/kbd/consoletrans/cp863_to_uni.trans
-#lib/kbd/consoletrans/cp864_to_uni.trans
-#lib/kbd/consoletrans/cp865_to_uni.trans
-#lib/kbd/consoletrans/cp866_to_uni.trans
-#lib/kbd/consoletrans/cp869_to_uni.trans
-#lib/kbd/consoletrans/cp874_to_uni.trans
-#lib/kbd/consoletrans/iso02_to_cp1250.trans
-#lib/kbd/consoletrans/koi2alt
-#lib/kbd/consoletrans/koi8-r_to_uni.trans
-#lib/kbd/consoletrans/koi8-u_to_uni.trans
-#lib/kbd/consoletrans/koi8u2ruscii
-#lib/kbd/consoletrans/latin2u.trans
-#lib/kbd/consoletrans/null
-#lib/kbd/consoletrans/space
-#lib/kbd/consoletrans/trivial
-#lib/kbd/consoletrans/utflist
-#lib/kbd/consoletrans/vga2iso
-#lib/kbd/consoletrans/viscii1.0_to_tcvn.trans
-#lib/kbd/consoletrans/viscii1.0_to_viscii1.1.trans
-#lib/kbd/consoletrans/zero
-#lib/kbd/keymaps
-#lib/kbd/keymaps/amiga
-#lib/kbd/keymaps/amiga/amiga-de.map.gz
-#lib/kbd/keymaps/amiga/amiga-us.map.gz
-#lib/kbd/keymaps/atari
-#lib/kbd/keymaps/atari/atari-de.map.gz
-#lib/kbd/keymaps/atari/atari-se.map.gz
-#lib/kbd/keymaps/atari/atari-uk-falcon.map.gz
-#lib/kbd/keymaps/atari/atari-us.map.gz
-lib/kbd/keymaps/i386
-#lib/kbd/keymaps/i386/azerty
-#lib/kbd/keymaps/i386/azerty/azerty.map.gz
-#lib/kbd/keymaps/i386/azerty/be-latin1.map.gz
-#lib/kbd/keymaps/i386/azerty/fr-latin1.map.gz
-#lib/kbd/keymaps/i386/azerty/fr-latin9.map.gz
-#lib/kbd/keymaps/i386/azerty/fr-pc.map.gz
-#lib/kbd/keymaps/i386/azerty/fr.map.gz
-#lib/kbd/keymaps/i386/azerty/wangbe.map.gz
-#lib/kbd/keymaps/i386/azerty/wangbe2.map.gz
-#lib/kbd/keymaps/i386/dvorak
-#lib/kbd/keymaps/i386/dvorak/ANSI-dvorak.map.gz
-#lib/kbd/keymaps/i386/dvorak/dvorak-l.map.gz
-#lib/kbd/keymaps/i386/dvorak/dvorak-r.map.gz
-#lib/kbd/keymaps/i386/dvorak/dvorak.map.gz
-#lib/kbd/keymaps/i386/fgGIod
-#lib/kbd/keymaps/i386/fgGIod/tr_f-latin5.map.gz
-#lib/kbd/keymaps/i386/fgGIod/trf.map.gz
-#lib/kbd/keymaps/i386/include
-#lib/kbd/keymaps/i386/include/applkey.map.gz
-#lib/kbd/keymaps/i386/include/azerty-layout.inc
-#lib/kbd/keymaps/i386/include/backspace.map.gz
-#lib/kbd/keymaps/i386/include/ctrl.map.gz
-#lib/kbd/keymaps/i386/include/euro.map.gz
-#lib/kbd/keymaps/i386/include/euro1.inc
-#lib/kbd/keymaps/i386/include/euro1.map.gz
-#lib/kbd/keymaps/i386/include/euro2.map.gz
-#lib/kbd/keymaps/i386/include/keypad.map.gz
-#lib/kbd/keymaps/i386/include/linux-keys-bare.inc
-#lib/kbd/keymaps/i386/include/linux-keys-extd.inc
-#lib/kbd/keymaps/i386/include/linux-with-alt-and-altgr.inc
-#lib/kbd/keymaps/i386/include/linux-with-modeshift-altgr.inc
-#lib/kbd/keymaps/i386/include/linux-with-two-alt-keys.inc
-#lib/kbd/keymaps/i386/include/qwerty-layout.inc
-#lib/kbd/keymaps/i386/include/qwertz-layout.inc
-#lib/kbd/keymaps/i386/include/unicode.map.gz
-#lib/kbd/keymaps/i386/include/windowkeys.map.gz
-#lib/kbd/keymaps/i386/qwerty
-#lib/kbd/keymaps/i386/qwerty/bg-cp1251.map.gz
-#lib/kbd/keymaps/i386/qwerty/bg-cp855.map.gz
-#lib/kbd/keymaps/i386/qwerty/bg_bds-cp1251.map.gz
-#lib/kbd/keymaps/i386/qwerty/bg_bds-utf8.map.gz
-#lib/kbd/keymaps/i386/qwerty/bg_pho-cp1251.map.gz
-#lib/kbd/keymaps/i386/qwerty/bg_pho-utf8.map.gz
-#lib/kbd/keymaps/i386/qwerty/br-abnt.map.gz
-#lib/kbd/keymaps/i386/qwerty/br-abnt2.map.gz
-#lib/kbd/keymaps/i386/qwerty/br-latin1-abnt2.map.gz
-#lib/kbd/keymaps/i386/qwerty/br-latin1-us.map.gz
-#lib/kbd/keymaps/i386/qwerty/by.map.gz
-#lib/kbd/keymaps/i386/qwerty/cf.map.gz
-#lib/kbd/keymaps/i386/qwerty/cz-cp1250.map.gz
-#lib/kbd/keymaps/i386/qwerty/cz-lat2-prog.map.gz
-#lib/kbd/keymaps/i386/qwerty/cz-lat2.map.gz
-#lib/kbd/keymaps/i386/qwerty/cz.map.gz
-#lib/kbd/keymaps/i386/qwerty/defkeymap.map.gz
-#lib/kbd/keymaps/i386/qwerty/defkeymap_V1.0.map.gz
-#lib/kbd/keymaps/i386/qwerty/dk-latin1.map.gz
-#lib/kbd/keymaps/i386/qwerty/dk.map.gz
-#lib/kbd/keymaps/i386/qwerty/emacs.map.gz
-#lib/kbd/keymaps/i386/qwerty/emacs2.map.gz
-#lib/kbd/keymaps/i386/qwerty/es-cp850.map.gz
-#lib/kbd/keymaps/i386/qwerty/es.map.gz
-#lib/kbd/keymaps/i386/qwerty/et-nodeadkeys.map.gz
-#lib/kbd/keymaps/i386/qwerty/et.map.gz
-#lib/kbd/keymaps/i386/qwerty/fi-latin1.map.gz
-#lib/kbd/keymaps/i386/qwerty/fi-latin9.map.gz
-#lib/kbd/keymaps/i386/qwerty/fi.map.gz
-#lib/kbd/keymaps/i386/qwerty/gr-pc.map.gz
-#lib/kbd/keymaps/i386/qwerty/gr.map.gz
-#lib/kbd/keymaps/i386/qwerty/hu101.map.gz
-#lib/kbd/keymaps/i386/qwerty/hypermap.m4
-#lib/kbd/keymaps/i386/qwerty/il-heb.map.gz
-#lib/kbd/keymaps/i386/qwerty/il-phonetic.map.gz
-#lib/kbd/keymaps/i386/qwerty/il.map.gz
-#lib/kbd/keymaps/i386/qwerty/is-latin1-us.map.gz
-#lib/kbd/keymaps/i386/qwerty/is-latin1.map.gz
-#lib/kbd/keymaps/i386/qwerty/it-ibm.map.gz
-#lib/kbd/keymaps/i386/qwerty/it.map.gz
-#lib/kbd/keymaps/i386/qwerty/it2.map.gz
-#lib/kbd/keymaps/i386/qwerty/jp106.map.gz
-#lib/kbd/keymaps/i386/qwerty/la-latin1.map.gz
-#lib/kbd/keymaps/i386/qwerty/lt.baltic.map.gz
-#lib/kbd/keymaps/i386/qwerty/lt.l4.map.gz
-#lib/kbd/keymaps/i386/qwerty/lt.map.gz
-#lib/kbd/keymaps/i386/qwerty/mk-cp1251.map.gz
-#lib/kbd/keymaps/i386/qwerty/mk-utf.map.gz
-#lib/kbd/keymaps/i386/qwerty/mk.map.gz
-#lib/kbd/keymaps/i386/qwerty/mk0.map.gz
-#lib/kbd/keymaps/i386/qwerty/nl.map.gz
-#lib/kbd/keymaps/i386/qwerty/nl2.map.gz
-#lib/kbd/keymaps/i386/qwerty/no-latin1.doc
-#lib/kbd/keymaps/i386/qwerty/no-latin1.map.gz
-#lib/kbd/keymaps/i386/qwerty/no.map.gz
-#lib/kbd/keymaps/i386/qwerty/pc110.map.gz
-#lib/kbd/keymaps/i386/qwerty/pl.map.gz
-#lib/kbd/keymaps/i386/qwerty/pl2.map.gz
-#lib/kbd/keymaps/i386/qwerty/pt-latin1.map.gz
-#lib/kbd/keymaps/i386/qwerty/pt-latin9.map.gz
-#lib/kbd/keymaps/i386/qwerty/ro_win.map.gz
-#lib/kbd/keymaps/i386/qwerty/ru-cp1251.map.gz
-#lib/kbd/keymaps/i386/qwerty/ru-ms.map.gz
-#lib/kbd/keymaps/i386/qwerty/ru-yawerty.map.gz
-#lib/kbd/keymaps/i386/qwerty/ru.map.gz
-#lib/kbd/keymaps/i386/qwerty/ru1.map.gz
-#lib/kbd/keymaps/i386/qwerty/ru2.map.gz
-#lib/kbd/keymaps/i386/qwerty/ru3.map.gz
-#lib/kbd/keymaps/i386/qwerty/ru4.map.gz
-#lib/kbd/keymaps/i386/qwerty/ru_win.map.gz
-#lib/kbd/keymaps/i386/qwerty/se-fi-ir209.map.gz
-#lib/kbd/keymaps/i386/qwerty/se-fi-lat6.map.gz
-#lib/kbd/keymaps/i386/qwerty/se-ir209.map.gz
-#lib/kbd/keymaps/i386/qwerty/se-lat6.map.gz
-#lib/kbd/keymaps/i386/qwerty/sk-prog-qwerty.map.gz
-#lib/kbd/keymaps/i386/qwerty/sk-qwerty.map.gz
-#lib/kbd/keymaps/i386/qwerty/sr-cy.map.gz
-#lib/kbd/keymaps/i386/qwerty/sv-latin1.map.gz
-#lib/kbd/keymaps/i386/qwerty/tr_q-latin5.map.gz
-#lib/kbd/keymaps/i386/qwerty/tralt.map.gz
-#lib/kbd/keymaps/i386/qwerty/trq.map.gz
-#lib/kbd/keymaps/i386/qwerty/ua-utf-ws.map.gz
-#lib/kbd/keymaps/i386/qwerty/ua-utf.map.gz
-#lib/kbd/keymaps/i386/qwerty/ua-ws.map.gz
-#lib/kbd/keymaps/i386/qwerty/ua.map.gz
-#lib/kbd/keymaps/i386/qwerty/uk.map.gz
-#lib/kbd/keymaps/i386/qwerty/us-acentos.map.gz
-#lib/kbd/keymaps/i386/qwerty/us.map.gz
-#lib/kbd/keymaps/i386/qwertz
-#lib/kbd/keymaps/i386/qwertz/croat.map.gz
-#lib/kbd/keymaps/i386/qwertz/cz-us-qwertz.map.gz
-#lib/kbd/keymaps/i386/qwertz/de-latin1-nodeadkeys.map.gz
-#lib/kbd/keymaps/i386/qwertz/de-latin1.map.gz
-#lib/kbd/keymaps/i386/qwertz/de.map.gz
-#lib/kbd/keymaps/i386/qwertz/de_CH-latin1.map.gz
-#lib/kbd/keymaps/i386/qwertz/fr_CH-latin1.map.gz
-#lib/kbd/keymaps/i386/qwertz/fr_CH.map.gz
-#lib/kbd/keymaps/i386/qwertz/hu.map.gz
-#lib/kbd/keymaps/i386/qwertz/sg-latin1-lk450.map.gz
-#lib/kbd/keymaps/i386/qwertz/sg-latin1.map.gz
-#lib/kbd/keymaps/i386/qwertz/sg.map.gz
-#lib/kbd/keymaps/i386/qwertz/sk-prog-qwertz.map.gz
-#lib/kbd/keymaps/i386/qwertz/sk-qwertz.map.gz
-#lib/kbd/keymaps/i386/qwertz/slovene.map.gz
-lib/kbd/keymaps/include
-#lib/kbd/keymaps/include/compose.8859_7
-#lib/kbd/keymaps/include/compose.8859_8
-#lib/kbd/keymaps/include/compose.latin
-#lib/kbd/keymaps/include/compose.latin1
-#lib/kbd/keymaps/include/compose.latin2
-#lib/kbd/keymaps/include/compose.latin3
-#lib/kbd/keymaps/include/compose.latin4
-#lib/kbd/keymaps/include/vim-compose.latin1
-#lib/kbd/keymaps/mac
-#lib/kbd/keymaps/mac/all
-#lib/kbd/keymaps/mac/all/mac-be.map.gz
-#lib/kbd/keymaps/mac/all/mac-de-latin1-nodeadkeys.map.gz
-#lib/kbd/keymaps/mac/all/mac-de-latin1.map.gz
-#lib/kbd/keymaps/mac/all/mac-de_CH.map.gz
-#lib/kbd/keymaps/mac/all/mac-dk-latin1.map.gz
-#lib/kbd/keymaps/mac/all/mac-dvorak.map.gz
-#lib/kbd/keymaps/mac/all/mac-es.map.gz
-#lib/kbd/keymaps/mac/all/mac-fi-latin1.map.gz
-#lib/kbd/keymaps/mac/all/mac-fr.map.gz
-#lib/kbd/keymaps/mac/all/mac-fr_CH-latin1.map.gz
-#lib/kbd/keymaps/mac/all/mac-it.map.gz
-#lib/kbd/keymaps/mac/all/mac-pt-latin1.map.gz
-#lib/kbd/keymaps/mac/all/mac-se.map.gz
-#lib/kbd/keymaps/mac/all/mac-template.map.gz
-#lib/kbd/keymaps/mac/all/mac-uk.map.gz
-#lib/kbd/keymaps/mac/all/mac-us.map.gz
-#lib/kbd/keymaps/mac/include
-#lib/kbd/keymaps/mac/include/mac-azerty-layout.inc
-#lib/kbd/keymaps/mac/include/mac-euro.map.gz
-#lib/kbd/keymaps/mac/include/mac-linux-keys-bare.inc
-#lib/kbd/keymaps/mac/include/mac-qwerty-layout.inc
-#lib/kbd/keymaps/mac/include/mac-qwertz-layout.inc
-#lib/kbd/keymaps/ppc
-#lib/kbd/keymaps/sun
-#lib/kbd/keymaps/sun/sun-pl-altgraph.map.gz
-#lib/kbd/keymaps/sun/sun-pl.map.gz
-#lib/kbd/keymaps/sun/sundvorak.map.gz
-#lib/kbd/keymaps/sun/sunkeymap.map.gz
-#lib/kbd/keymaps/sun/sunt4-es.map.gz
-#lib/kbd/keymaps/sun/sunt4-fi-latin1.map.gz
-#lib/kbd/keymaps/sun/sunt4-no-latin1.map.gz
-#lib/kbd/keymaps/sun/sunt5-cz-us.map.gz
-#lib/kbd/keymaps/sun/sunt5-de-latin1.map.gz
-#lib/kbd/keymaps/sun/sunt5-es.map.gz
-#lib/kbd/keymaps/sun/sunt5-fi-latin1.map.gz
-#lib/kbd/keymaps/sun/sunt5-fr-latin1.map.gz
-#lib/kbd/keymaps/sun/sunt5-ru.map.gz
-#lib/kbd/keymaps/sun/sunt5-uk.map.gz
-#lib/kbd/keymaps/sun/sunt5-us-cz.map.gz
+#usr/share/kbd/consolefonts
+#usr/share/kbd/consolefonts/161.cp.gz
+#usr/share/kbd/consolefonts/162.cp.gz
+#usr/share/kbd/consolefonts/163.cp.gz
+#usr/share/kbd/consolefonts/164.cp.gz
+#usr/share/kbd/consolefonts/165.cp.gz
+#usr/share/kbd/consolefonts/737.cp.gz
+#usr/share/kbd/consolefonts/880.cp.gz
+#usr/share/kbd/consolefonts/928.cp.gz
+#usr/share/kbd/consolefonts/972.cp.gz
+#usr/share/kbd/consolefonts/Agafari-12.psfu.gz
+#usr/share/kbd/consolefonts/Agafari-14.psfu.gz
+#usr/share/kbd/consolefonts/Agafari-16.psfu.gz
+#usr/share/kbd/consolefonts/Cyr_a8x14.psfu.gz
+#usr/share/kbd/consolefonts/Cyr_a8x16.psfu.gz
+#usr/share/kbd/consolefonts/Cyr_a8x8.psfu.gz
+#usr/share/kbd/consolefonts/ERRORS
+#usr/share/kbd/consolefonts/Goha-12.psfu.gz
+#usr/share/kbd/consolefonts/Goha-14.psfu.gz
+#usr/share/kbd/consolefonts/Goha-16.psfu.gz
+#usr/share/kbd/consolefonts/GohaClassic-12.psfu.gz
+#usr/share/kbd/consolefonts/GohaClassic-14.psfu.gz
+#usr/share/kbd/consolefonts/GohaClassic-16.psfu.gz
+#usr/share/kbd/consolefonts/LatArCyrHeb-08.psfu.gz
+#usr/share/kbd/consolefonts/LatArCyrHeb-14.psfu.gz
+#usr/share/kbd/consolefonts/LatArCyrHeb-16+.psfu.gz
+#usr/share/kbd/consolefonts/LatArCyrHeb-16.psfu.gz
+#usr/share/kbd/consolefonts/LatArCyrHeb-19.psfu.gz
+#usr/share/kbd/consolefonts/Mik_8x16.gz
+#usr/share/kbd/consolefonts/README.12x22
+#usr/share/kbd/consolefonts/README.Arabic
+#usr/share/kbd/consolefonts/README.Cyrillic
+#usr/share/kbd/consolefonts/README.Ethiopic
+#usr/share/kbd/consolefonts/README.Greek
+#usr/share/kbd/consolefonts/README.Hebrew
+#usr/share/kbd/consolefonts/README.cp1250
+#usr/share/kbd/consolefonts/README.cybercafe
+#usr/share/kbd/consolefonts/README.drdos
+#usr/share/kbd/consolefonts/README.lat0
+#usr/share/kbd/consolefonts/README.lat7
+#usr/share/kbd/consolefonts/README.lat9
+#usr/share/kbd/consolefonts/README.psfu
+#usr/share/kbd/consolefonts/alt-8x14.gz
+#usr/share/kbd/consolefonts/alt-8x16.gz
+#usr/share/kbd/consolefonts/alt-8x8.gz
+#usr/share/kbd/consolefonts/altc-8x16.gz
+#usr/share/kbd/consolefonts/aply16.psf.gz
+#usr/share/kbd/consolefonts/arm8.fnt.gz
+#usr/share/kbd/consolefonts/cp1250.psfu.gz
+#usr/share/kbd/consolefonts/cp850-8x14.psfu.gz
+#usr/share/kbd/consolefonts/cp850-8x16.psfu.gz
+#usr/share/kbd/consolefonts/cp850-8x8.psfu.gz
+#usr/share/kbd/consolefonts/cp857.08.gz
+#usr/share/kbd/consolefonts/cp857.14.gz
+#usr/share/kbd/consolefonts/cp857.16.gz
+#usr/share/kbd/consolefonts/cp865-8x14.psfu.gz
+#usr/share/kbd/consolefonts/cp865-8x16.psfu.gz
+#usr/share/kbd/consolefonts/cp865-8x8.psfu.gz
+#usr/share/kbd/consolefonts/cp866-8x14.psf.gz
+#usr/share/kbd/consolefonts/cp866-8x16.psf.gz
+#usr/share/kbd/consolefonts/cp866-8x8.psf.gz
+#usr/share/kbd/consolefonts/cybercafe.fnt.gz
+#usr/share/kbd/consolefonts/cyr-sun16.psfu.gz
+#usr/share/kbd/consolefonts/default8x16.psfu.gz
+#usr/share/kbd/consolefonts/default8x9.psfu.gz
+#usr/share/kbd/consolefonts/drdos8x14.psfu.gz
+#usr/share/kbd/consolefonts/drdos8x16.psfu.gz
+#usr/share/kbd/consolefonts/drdos8x6.psfu.gz
+#usr/share/kbd/consolefonts/drdos8x8.psfu.gz
+#usr/share/kbd/consolefonts/gr737a-8x8.psfu.gz
+#usr/share/kbd/consolefonts/gr737a-9x14.psfu.gz
+#usr/share/kbd/consolefonts/gr737a-9x16.psfu.gz
+#usr/share/kbd/consolefonts/gr737b-8x11.psfu.gz
+#usr/share/kbd/consolefonts/gr737b-9x16-medieval.psfu.gz
+#usr/share/kbd/consolefonts/gr737c-8x14.psfu.gz
+#usr/share/kbd/consolefonts/gr737c-8x16.psfu.gz
+#usr/share/kbd/consolefonts/gr737c-8x6.psfu.gz
+#usr/share/kbd/consolefonts/gr737c-8x7.psfu.gz
+#usr/share/kbd/consolefonts/gr737c-8x8.psfu.gz
+#usr/share/kbd/consolefonts/gr737d-8x16.psfu.gz
+#usr/share/kbd/consolefonts/gr928-8x16-thin.psfu.gz
+#usr/share/kbd/consolefonts/gr928-9x14.psfu.gz
+#usr/share/kbd/consolefonts/gr928-9x16.psfu.gz
+#usr/share/kbd/consolefonts/gr928a-8x14.psfu.gz
+#usr/share/kbd/consolefonts/gr928a-8x16.psfu.gz
+#usr/share/kbd/consolefonts/gr928b-8x14.psfu.gz
+#usr/share/kbd/consolefonts/gr928b-8x16.psfu.gz
+#usr/share/kbd/consolefonts/greek-polytonic.psfu.gz
+#usr/share/kbd/consolefonts/iso01-12x22.psfu.gz
+#usr/share/kbd/consolefonts/iso01.08.gz
+#usr/share/kbd/consolefonts/iso01.14.gz
+#usr/share/kbd/consolefonts/iso01.16.gz
+#usr/share/kbd/consolefonts/iso02-12x22.psfu.gz
+#usr/share/kbd/consolefonts/iso02.08.gz
+#usr/share/kbd/consolefonts/iso02.14.gz
+#usr/share/kbd/consolefonts/iso02.16.gz
+#usr/share/kbd/consolefonts/iso03.08.gz
+#usr/share/kbd/consolefonts/iso03.14.gz
+#usr/share/kbd/consolefonts/iso03.16.gz
+#usr/share/kbd/consolefonts/iso04.08.gz
+#usr/share/kbd/consolefonts/iso04.14.gz
+#usr/share/kbd/consolefonts/iso04.16.gz
+#usr/share/kbd/consolefonts/iso05.08.gz
+#usr/share/kbd/consolefonts/iso05.14.gz
+#usr/share/kbd/consolefonts/iso05.16.gz
+#usr/share/kbd/consolefonts/iso06.08.gz
+#usr/share/kbd/consolefonts/iso06.14.gz
+#usr/share/kbd/consolefonts/iso06.16.gz
+#usr/share/kbd/consolefonts/iso07.14.gz
+#usr/share/kbd/consolefonts/iso07.16.gz
+usr/share/kbd/consolefonts/iso07u-16.psfu.gz
+#usr/share/kbd/consolefonts/iso08.08.gz
+#usr/share/kbd/consolefonts/iso08.14.gz
+#usr/share/kbd/consolefonts/iso08.16.gz
+#usr/share/kbd/consolefonts/iso09.08.gz
+#usr/share/kbd/consolefonts/iso09.14.gz
+#usr/share/kbd/consolefonts/iso09.16.gz
+#usr/share/kbd/consolefonts/iso10.08.gz
+#usr/share/kbd/consolefonts/iso10.14.gz
+#usr/share/kbd/consolefonts/iso10.16.gz
+#usr/share/kbd/consolefonts/koi8-14.psf.gz
+#usr/share/kbd/consolefonts/koi8c-8x16.gz
+#usr/share/kbd/consolefonts/koi8r-8x14.gz
+#usr/share/kbd/consolefonts/koi8r-8x16.gz
+#usr/share/kbd/consolefonts/koi8r-8x8.gz
+#usr/share/kbd/consolefonts/koi8r.8x8.psfu.gz
+#usr/share/kbd/consolefonts/koi8u_8x14.psfu.gz
+#usr/share/kbd/consolefonts/koi8u_8x16.psfu.gz
+#usr/share/kbd/consolefonts/koi8u_8x8.psfu.gz
+#usr/share/kbd/consolefonts/lat0-08.psfu.gz
+#usr/share/kbd/consolefonts/lat0-10.psfu.gz
+#usr/share/kbd/consolefonts/lat0-12.psfu.gz
+#usr/share/kbd/consolefonts/lat0-14.psfu.gz
+usr/share/kbd/consolefonts/lat0-16.psfu.gz
+#usr/share/kbd/consolefonts/lat1-08.psfu.gz
+#usr/share/kbd/consolefonts/lat1-10.psfu.gz
+#usr/share/kbd/consolefonts/lat1-12.psfu.gz
+#usr/share/kbd/consolefonts/lat1-14.psfu.gz
+usr/share/kbd/consolefonts/lat1-16.psfu.gz
+#usr/share/kbd/consolefonts/lat2-08.psfu.gz
+#usr/share/kbd/consolefonts/lat2-10.psfu.gz
+#usr/share/kbd/consolefonts/lat2-12.psfu.gz
+#usr/share/kbd/consolefonts/lat2-14.psfu.gz
+usr/share/kbd/consolefonts/lat2-16.psfu.gz
+#usr/share/kbd/consolefonts/lat2a-16.psfu.gz
+#usr/share/kbd/consolefonts/lat4-08.psfu.gz
+#usr/share/kbd/consolefonts/lat4-10.psfu.gz
+#usr/share/kbd/consolefonts/lat4-12.psfu.gz
+#usr/share/kbd/consolefonts/lat4-14.psfu.gz
+#usr/share/kbd/consolefonts/lat4-16+.psfu.gz
+#usr/share/kbd/consolefonts/lat4-16.psfu.gz
+#usr/share/kbd/consolefonts/lat4-19.psfu.gz
+#usr/share/kbd/consolefonts/lat4a-08.psfu.gz
+#usr/share/kbd/consolefonts/lat4a-10.psfu.gz
+#usr/share/kbd/consolefonts/lat4a-12.psfu.gz
+#usr/share/kbd/consolefonts/lat4a-14.psfu.gz
+#usr/share/kbd/consolefonts/lat4a-16+.psfu.gz
+#usr/share/kbd/consolefonts/lat4a-16.psfu.gz
+#usr/share/kbd/consolefonts/lat4a-19.psfu.gz
+#usr/share/kbd/consolefonts/lat5-12.psfu.gz
+#usr/share/kbd/consolefonts/lat5-14.psfu.gz
+usr/share/kbd/consolefonts/lat5-16.psfu.gz
+#usr/share/kbd/consolefonts/lat7-14.psfu.gz
+#usr/share/kbd/consolefonts/lat7a-14.psfu.gz
+#usr/share/kbd/consolefonts/lat7a-16.psf.gz
+#usr/share/kbd/consolefonts/lat9-08.psf.gz
+#usr/share/kbd/consolefonts/lat9-10.psf.gz
+#usr/share/kbd/consolefonts/lat9-12.psf.gz
+#usr/share/kbd/consolefonts/lat9-14.psf.gz
+#usr/share/kbd/consolefonts/lat9-16.psf.gz
+#usr/share/kbd/consolefonts/lat9u-08.psfu.gz
+#usr/share/kbd/consolefonts/lat9u-10.psfu.gz
+#usr/share/kbd/consolefonts/lat9u-12.psfu.gz
+#usr/share/kbd/consolefonts/lat9u-14.psfu.gz
+#usr/share/kbd/consolefonts/lat9u-16.psfu.gz
+#usr/share/kbd/consolefonts/lat9v-08.psfu.gz
+#usr/share/kbd/consolefonts/lat9v-10.psfu.gz
+#usr/share/kbd/consolefonts/lat9v-12.psfu.gz
+#usr/share/kbd/consolefonts/lat9v-14.psfu.gz
+#usr/share/kbd/consolefonts/lat9v-16.psfu.gz
+#usr/share/kbd/consolefonts/lat9w-08.psfu.gz
+#usr/share/kbd/consolefonts/lat9w-10.psfu.gz
+#usr/share/kbd/consolefonts/lat9w-12.psfu.gz
+#usr/share/kbd/consolefonts/lat9w-14.psfu.gz
+#usr/share/kbd/consolefonts/lat9w-16.psfu.gz
+#usr/share/kbd/consolefonts/partialfonts
+#usr/share/kbd/consolefonts/partialfonts/8859-1.a0-ff.08.gz
+#usr/share/kbd/consolefonts/partialfonts/8859-1.a0-ff.14.gz
+#usr/share/kbd/consolefonts/partialfonts/8859-1.a0-ff.16.gz
+#usr/share/kbd/consolefonts/partialfonts/8859-10.a0-ff.08.gz
+#usr/share/kbd/consolefonts/partialfonts/8859-10.a0-ff.14.gz
+#usr/share/kbd/consolefonts/partialfonts/8859-10.a0-ff.16.gz
+#usr/share/kbd/consolefonts/partialfonts/8859-2.a0-ff.08.gz
+#usr/share/kbd/consolefonts/partialfonts/8859-2.a0-ff.14.gz
+#usr/share/kbd/consolefonts/partialfonts/8859-2.a0-ff.16.gz
+#usr/share/kbd/consolefonts/partialfonts/8859-3.a0-ff.08.gz
+#usr/share/kbd/consolefonts/partialfonts/8859-3.a0-ff.14.gz
+#usr/share/kbd/consolefonts/partialfonts/8859-3.a0-ff.16.gz
+#usr/share/kbd/consolefonts/partialfonts/8859-4.a0-ff.08.gz
+#usr/share/kbd/consolefonts/partialfonts/8859-4.a0-ff.14.gz
+#usr/share/kbd/consolefonts/partialfonts/8859-4.a0-ff.16.gz
+#usr/share/kbd/consolefonts/partialfonts/8859-5.a0-ff.08.gz
+#usr/share/kbd/consolefonts/partialfonts/8859-5.a0-ff.14.gz
+#usr/share/kbd/consolefonts/partialfonts/8859-5.a0-ff.16.gz
+#usr/share/kbd/consolefonts/partialfonts/8859-6.a0-ff.08.gz
+#usr/share/kbd/consolefonts/partialfonts/8859-6.a0-ff.14.gz
+#usr/share/kbd/consolefonts/partialfonts/8859-6.a0-ff.16.gz
+#usr/share/kbd/consolefonts/partialfonts/8859-7.a0-ff.08.gz
+#usr/share/kbd/consolefonts/partialfonts/8859-7.a0-ff.14.gz
+#usr/share/kbd/consolefonts/partialfonts/8859-7.a0-ff.16.gz
+#usr/share/kbd/consolefonts/partialfonts/8859-8.a0-ff.08.gz
+#usr/share/kbd/consolefonts/partialfonts/8859-8.a0-ff.14.gz
+#usr/share/kbd/consolefonts/partialfonts/8859-8.a0-ff.16.gz
+#usr/share/kbd/consolefonts/partialfonts/8859-9.a0-ff.08.gz
+#usr/share/kbd/consolefonts/partialfonts/8859-9.a0-ff.14.gz
+#usr/share/kbd/consolefonts/partialfonts/8859-9.a0-ff.16.gz
+#usr/share/kbd/consolefonts/partialfonts/ascii.20-7f.08.gz
+#usr/share/kbd/consolefonts/partialfonts/ascii.20-7f.14.gz
+#usr/share/kbd/consolefonts/partialfonts/ascii.20-7f.16.gz
+#usr/share/kbd/consolefonts/partialfonts/cp437.00-1f.08.gz
+#usr/share/kbd/consolefonts/partialfonts/cp437.00-1f.14.gz
+#usr/share/kbd/consolefonts/partialfonts/cp437.00-1f.16.gz
+#usr/share/kbd/consolefonts/partialfonts/none.00-17.08.gz
+#usr/share/kbd/consolefonts/partialfonts/none.00-17.14.gz
+#usr/share/kbd/consolefonts/partialfonts/none.00-17.16.gz
+#usr/share/kbd/consolefonts/ruscii_8x16.psfu.gz
+#usr/share/kbd/consolefonts/ruscii_8x8.psfu.gz
+#usr/share/kbd/consolefonts/sun12x22.psfu.gz
+#usr/share/kbd/consolefonts/t.fnt.gz
+#usr/share/kbd/consolefonts/t850b.fnt.gz
+#usr/share/kbd/consolefonts/tcvn8x16.psf.gz
+usr/share/kbd/consolefonts/viscii10-8x16.psfu.gz
+#usr/share/kbd/consoletrans
+#usr/share/kbd/consoletrans/8859-10_to_uni.trans
+#usr/share/kbd/consoletrans/8859-13_to_uni.trans
+#usr/share/kbd/consoletrans/8859-14_to_uni.trans
+#usr/share/kbd/consoletrans/8859-15_to_uni.trans
+#usr/share/kbd/consoletrans/8859-1_to_uni.trans
+#usr/share/kbd/consoletrans/8859-2_to_uni.trans
+#usr/share/kbd/consoletrans/8859-3_to_uni.trans
+#usr/share/kbd/consoletrans/8859-4_to_uni.trans
+#usr/share/kbd/consoletrans/8859-5_to_uni.trans
+#usr/share/kbd/consoletrans/8859-6_to_uni.trans
+#usr/share/kbd/consoletrans/8859-7_to_uni.trans
+#usr/share/kbd/consoletrans/8859-8_to_uni.trans
+#usr/share/kbd/consoletrans/8859-9_to_uni.trans
+#usr/share/kbd/consoletrans/baltic.trans
+#usr/share/kbd/consoletrans/cp1250_to_uni.trans
+#usr/share/kbd/consoletrans/cp1251_to_uni.trans
+#usr/share/kbd/consoletrans/cp437_to_iso01.trans
+#usr/share/kbd/consoletrans/cp437_to_uni.trans
+#usr/share/kbd/consoletrans/cp737_to_uni.trans
+#usr/share/kbd/consoletrans/cp775_to_uni.trans
+#usr/share/kbd/consoletrans/cp850_to_iso01.trans
+#usr/share/kbd/consoletrans/cp850_to_uni.trans
+#usr/share/kbd/consoletrans/cp852_to_uni.trans
+#usr/share/kbd/consoletrans/cp853_to_uni.trans
+#usr/share/kbd/consoletrans/cp855_to_uni.trans
+#usr/share/kbd/consoletrans/cp857_to_uni.trans
+#usr/share/kbd/consoletrans/cp860_to_uni.trans
+#usr/share/kbd/consoletrans/cp861_to_uni.trans
+#usr/share/kbd/consoletrans/cp862_to_uni.trans
+#usr/share/kbd/consoletrans/cp863_to_uni.trans
+#usr/share/kbd/consoletrans/cp864_to_uni.trans
+#usr/share/kbd/consoletrans/cp865_to_uni.trans
+#usr/share/kbd/consoletrans/cp866_to_uni.trans
+#usr/share/kbd/consoletrans/cp869_to_uni.trans
+#usr/share/kbd/consoletrans/cp874_to_uni.trans
+#usr/share/kbd/consoletrans/iso02_to_cp1250.trans
+#usr/share/kbd/consoletrans/koi2alt
+#usr/share/kbd/consoletrans/koi8-r_to_uni.trans
+#usr/share/kbd/consoletrans/koi8-u_to_uni.trans
+#usr/share/kbd/consoletrans/koi8u2ruscii
+#usr/share/kbd/consoletrans/latin2u.trans
+#usr/share/kbd/consoletrans/null
+#usr/share/kbd/consoletrans/space
+#usr/share/kbd/consoletrans/trivial
+#usr/share/kbd/consoletrans/utflist
+#usr/share/kbd/consoletrans/vga2iso
+#usr/share/kbd/consoletrans/viscii1.0_to_tcvn.trans
+#usr/share/kbd/consoletrans/viscii1.0_to_viscii1.1.trans
+#usr/share/kbd/consoletrans/zero
+#usr/share/kbd/keymaps
+#usr/share/kbd/keymaps/amiga
+#usr/share/kbd/keymaps/amiga/amiga-de.map.gz
+#usr/share/kbd/keymaps/amiga/amiga-us.map.gz
+#usr/share/kbd/keymaps/atari
+#usr/share/kbd/keymaps/atari/atari-de.map.gz
+#usr/share/kbd/keymaps/atari/atari-se.map.gz
+#usr/share/kbd/keymaps/atari/atari-uk-falcon.map.gz
+#usr/share/kbd/keymaps/atari/atari-us.map.gz
+usr/share/kbd/keymaps/i386
+#usr/share/kbd/keymaps/i386/azerty
+#usr/share/kbd/keymaps/i386/azerty/azerty.map.gz
+#usr/share/kbd/keymaps/i386/azerty/be-latin1.map.gz
+#usr/share/kbd/keymaps/i386/azerty/fr-latin1.map.gz
+#usr/share/kbd/keymaps/i386/azerty/fr-latin9.map.gz
+#usr/share/kbd/keymaps/i386/azerty/fr-pc.map.gz
+#usr/share/kbd/keymaps/i386/azerty/fr.map.gz
+#usr/share/kbd/keymaps/i386/azerty/wangbe.map.gz
+#usr/share/kbd/keymaps/i386/azerty/wangbe2.map.gz
+#usr/share/kbd/keymaps/i386/dvorak
+#usr/share/kbd/keymaps/i386/dvorak/ANSI-dvorak.map.gz
+#usr/share/kbd/keymaps/i386/dvorak/dvorak-l.map.gz
+#usr/share/kbd/keymaps/i386/dvorak/dvorak-r.map.gz
+#usr/share/kbd/keymaps/i386/dvorak/dvorak.map.gz
+#usr/share/kbd/keymaps/i386/fgGIod
+#usr/share/kbd/keymaps/i386/fgGIod/tr_f-latin5.map.gz
+#usr/share/kbd/keymaps/i386/fgGIod/trf.map.gz
+#usr/share/kbd/keymaps/i386/include
+#usr/share/kbd/keymaps/i386/include/applkey.map.gz
+#usr/share/kbd/keymaps/i386/include/azerty-layout.inc
+#usr/share/kbd/keymaps/i386/include/backspace.map.gz
+#usr/share/kbd/keymaps/i386/include/ctrl.map.gz
+#usr/share/kbd/keymaps/i386/include/euro.map.gz
+#usr/share/kbd/keymaps/i386/include/euro1.inc
+#usr/share/kbd/keymaps/i386/include/euro1.map.gz
+#usr/share/kbd/keymaps/i386/include/euro2.map.gz
+#usr/share/kbd/keymaps/i386/include/keypad.map.gz
+#usr/share/kbd/keymaps/i386/include/linux-keys-bare.inc
+#usr/share/kbd/keymaps/i386/include/linux-keys-extd.inc
+#usr/share/kbd/keymaps/i386/include/linux-with-alt-and-altgr.inc
+#usr/share/kbd/keymaps/i386/include/linux-with-modeshift-altgr.inc
+#usr/share/kbd/keymaps/i386/include/linux-with-two-alt-keys.inc
+#usr/share/kbd/keymaps/i386/include/qwerty-layout.inc
+#usr/share/kbd/keymaps/i386/include/qwertz-layout.inc
+#usr/share/kbd/keymaps/i386/include/unicode.map.gz
+#usr/share/kbd/keymaps/i386/include/windowkeys.map.gz
+#usr/share/kbd/keymaps/i386/qwerty
+#usr/share/kbd/keymaps/i386/qwerty/bg-cp1251.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/bg-cp855.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/bg_bds-cp1251.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/bg_bds-utf8.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/bg_pho-cp1251.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/bg_pho-utf8.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/br-abnt.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/br-abnt2.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/br-latin1-abnt2.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/br-latin1-us.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/by.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/cf.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/cz-cp1250.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/cz-lat2-prog.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/cz-lat2.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/cz.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/defkeymap.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/defkeymap_V1.0.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/dk-latin1.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/dk.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/emacs.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/emacs2.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/es-cp850.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/es.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/et-nodeadkeys.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/et.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/fi-latin1.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/fi-latin9.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/fi.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/gr-pc.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/gr.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/hu101.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/hypermap.m4
+#usr/share/kbd/keymaps/i386/qwerty/il-heb.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/il-phonetic.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/il.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/is-latin1-us.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/is-latin1.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/it-ibm.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/it.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/it2.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/jp106.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/la-latin1.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/lt.baltic.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/lt.l4.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/lt.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/mk-cp1251.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/mk-utf.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/mk.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/mk0.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/nl.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/nl2.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/no-latin1.doc
+#usr/share/kbd/keymaps/i386/qwerty/no-latin1.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/no.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/pc110.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/pl.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/pl2.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/pt-latin1.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/pt-latin9.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/ro_win.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/ru-cp1251.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/ru-ms.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/ru-yawerty.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/ru.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/ru1.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/ru2.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/ru3.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/ru4.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/ru_win.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/se-fi-ir209.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/se-fi-lat6.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/se-ir209.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/se-lat6.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/sk-prog-qwerty.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/sk-qwerty.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/sr-cy.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/sv-latin1.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/tr_q-latin5.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/tralt.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/trq.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/ua-utf-ws.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/ua-utf.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/ua-ws.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/ua.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/uk.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/us-acentos.map.gz
+#usr/share/kbd/keymaps/i386/qwerty/us.map.gz
+#usr/share/kbd/keymaps/i386/qwertz
+#usr/share/kbd/keymaps/i386/qwertz/croat.map.gz
+#usr/share/kbd/keymaps/i386/qwertz/cz-us-qwertz.map.gz
+#usr/share/kbd/keymaps/i386/qwertz/de-latin1-nodeadkeys.map.gz
+#usr/share/kbd/keymaps/i386/qwertz/de-latin1.map.gz
+#usr/share/kbd/keymaps/i386/qwertz/de.map.gz
+#usr/share/kbd/keymaps/i386/qwertz/de_CH-latin1.map.gz
+#usr/share/kbd/keymaps/i386/qwertz/fr_CH-latin1.map.gz
+#usr/share/kbd/keymaps/i386/qwertz/fr_CH.map.gz
+#usr/share/kbd/keymaps/i386/qwertz/hu.map.gz
+#usr/share/kbd/keymaps/i386/qwertz/sg-latin1-lk450.map.gz
+#usr/share/kbd/keymaps/i386/qwertz/sg-latin1.map.gz
+#usr/share/kbd/keymaps/i386/qwertz/sg.map.gz
+#usr/share/kbd/keymaps/i386/qwertz/sk-prog-qwertz.map.gz
+#usr/share/kbd/keymaps/i386/qwertz/sk-qwertz.map.gz
+#usr/share/kbd/keymaps/i386/qwertz/slovene.map.gz
+usr/share/kbd/keymaps/include
+#usr/share/kbd/keymaps/include/compose.8859_7
+#usr/share/kbd/keymaps/include/compose.8859_8
+#usr/share/kbd/keymaps/include/compose.latin
+#usr/share/kbd/keymaps/include/compose.latin1
+#usr/share/kbd/keymaps/include/compose.latin2
+#usr/share/kbd/keymaps/include/compose.latin3
+#usr/share/kbd/keymaps/include/compose.latin4
+#usr/share/kbd/keymaps/include/vim-compose.latin1
+#usr/share/kbd/keymaps/mac
+#usr/share/kbd/keymaps/mac/all
+#usr/share/kbd/keymaps/mac/all/mac-be.map.gz
+#usr/share/kbd/keymaps/mac/all/mac-de-latin1-nodeadkeys.map.gz
+#usr/share/kbd/keymaps/mac/all/mac-de-latin1.map.gz
+#usr/share/kbd/keymaps/mac/all/mac-de_CH.map.gz
+#usr/share/kbd/keymaps/mac/all/mac-dk-latin1.map.gz
+#usr/share/kbd/keymaps/mac/all/mac-dvorak.map.gz
+#usr/share/kbd/keymaps/mac/all/mac-es.map.gz
+#usr/share/kbd/keymaps/mac/all/mac-fi-latin1.map.gz
+#usr/share/kbd/keymaps/mac/all/mac-fr.map.gz
+#usr/share/kbd/keymaps/mac/all/mac-fr_CH-latin1.map.gz
+#usr/share/kbd/keymaps/mac/all/mac-it.map.gz
+#usr/share/kbd/keymaps/mac/all/mac-pt-latin1.map.gz
+#usr/share/kbd/keymaps/mac/all/mac-se.map.gz
+#usr/share/kbd/keymaps/mac/all/mac-template.map.gz
+#usr/share/kbd/keymaps/mac/all/mac-uk.map.gz
+#usr/share/kbd/keymaps/mac/all/mac-us.map.gz
+#usr/share/kbd/keymaps/mac/include
+#usr/share/kbd/keymaps/mac/include/mac-azerty-layout.inc
+#usr/share/kbd/keymaps/mac/include/mac-euro.map.gz
+#usr/share/kbd/keymaps/mac/include/mac-linux-keys-bare.inc
+#usr/share/kbd/keymaps/mac/include/mac-qwerty-layout.inc
+#usr/share/kbd/keymaps/mac/include/mac-qwertz-layout.inc
+#usr/share/kbd/keymaps/ppc
+#usr/share/kbd/keymaps/sun
+#usr/share/kbd/keymaps/sun/sun-pl-altgraph.map.gz
+#usr/share/kbd/keymaps/sun/sun-pl.map.gz
+#usr/share/kbd/keymaps/sun/sundvorak.map.gz
+#usr/share/kbd/keymaps/sun/sunkeymap.map.gz
+#usr/share/kbd/keymaps/sun/sunt4-es.map.gz
+#usr/share/kbd/keymaps/sun/sunt4-fi-latin1.map.gz
+#usr/share/kbd/keymaps/sun/sunt4-no-latin1.map.gz
+#usr/share/kbd/keymaps/sun/sunt5-cz-us.map.gz
+#usr/share/kbd/keymaps/sun/sunt5-de-latin1.map.gz
+#usr/share/kbd/keymaps/sun/sunt5-es.map.gz
+#usr/share/kbd/keymaps/sun/sunt5-fi-latin1.map.gz
+#usr/share/kbd/keymaps/sun/sunt5-fr-latin1.map.gz
+#usr/share/kbd/keymaps/sun/sunt5-ru.map.gz
+#usr/share/kbd/keymaps/sun/sunt5-uk.map.gz
+#usr/share/kbd/keymaps/sun/sunt5-us-cz.map.gz
 #usr/share/kbd/unimaps
 #usr/share/kbd/unimaps/8859-1.a0-ff.uni
 #usr/share/kbd/unimaps/8859-10.a0-ff.uni

Modified: ipcop/trunk/lfs/kbd
===================================================================
--- ipcop/trunk/lfs/kbd	2007-11-01 08:28:07 UTC (rev 622)
+++ ipcop/trunk/lfs/kbd	2007-11-01 11:04:50 UTC (rev 623)
@@ -95,7 +95,7 @@
 
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_DL)/kbd-$(VER)-backspace-1.patch
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_DL)/kbd-$(VER)-gcc4_fixes-1.patch
-	cd $(DIR_APP) && ./configure --datadir=/lib/kbd
+	cd $(DIR_APP) && ./configure --datadir=/usr/share/kbd
 	cd $(DIR_APP) && make -j $(PARALLELISM)
 	cd $(DIR_APP) && make install
 	mv -v /usr/bin/{kbd_mode,openvt,setfont} /bin

Modified: ipcop/trunk/lfs/stage5
===================================================================
--- ipcop/trunk/lfs/stage5	2007-11-01 08:28:07 UTC (rev 622)
+++ ipcop/trunk/lfs/stage5	2007-11-01 11:04:50 UTC (rev 623)
@@ -130,19 +130,19 @@
 	install -c -D /usr/bin/showconsolefont		$(INSTALLER_DIR)/initrd/bin/showconsolefont
 	install -c -D /usr/bin/unicode_start		$(INSTALLER_DIR)/initrd/bin/unicode_start
 	install -c -D /usr/bin/unicode_stop		$(INSTALLER_DIR)/initrd/bin/unicode_stop
-	mkdir -p $(INSTALLER_DIR)/initrd/lib/kbd/consolefonts
-	install -m 0644 /lib/kbd/consolefonts/lat0-16.psfu.gz \
-		$(INSTALLER_DIR)/initrd/lib/kbd/consolefonts/lat0-16.psfu.gz
-	install -m 0644 /lib/kbd/consolefonts/lat1-16.psfu.gz \
-		$(INSTALLER_DIR)/initrd/lib/kbd/consolefonts/lat1-16.psfu.gz
-	install -m 0644 /lib/kbd/consolefonts/lat2-16.psfu.gz \
-		$(INSTALLER_DIR)/initrd/lib/kbd/consolefonts/lat2-16.psfu.gz
-	install -m 0644 /lib/kbd/consolefonts/lat5-16.psfu.gz \
-		$(INSTALLER_DIR)/initrd/lib/kbd/consolefonts/lat5-16.psfu.gz
-	install -m 0644 /lib/kbd/consolefonts/iso07u-16.psfu.gz \
-		$(INSTALLER_DIR)/initrd/lib/kbd/consolefonts/iso07u-16.psfu.gz
-	install -m 0644 /lib/kbd/consolefonts/viscii10-8x16.psfu.gz \
-		$(INSTALLER_DIR)/initrd/lib/kbd/consolefonts/viscii10-8x16.psfu.gz
+	mkdir -p $(INSTALLER_DIR)/initrd/usr/share/kbd/consolefonts
+	install -m 0644 /usr/share/kbd/consolefonts/lat0-16.psfu.gz \
+		$(INSTALLER_DIR)/initrd/usr/share/kbd/consolefonts/lat0-16.psfu.gz
+	install -m 0644 /usr/share/kbd/consolefonts/lat1-16.psfu.gz \
+		$(INSTALLER_DIR)/initrd/usr/share/kbd/consolefonts/lat1-16.psfu.gz
+	install -m 0644 /usr/share/kbd/consolefonts/lat2-16.psfu.gz \
+		$(INSTALLER_DIR)/initrd/usr/share/kbd/consolefonts/lat2-16.psfu.gz
+	install -m 0644 /usr/share/kbd/consolefonts/lat5-16.psfu.gz \
+		$(INSTALLER_DIR)/initrd/usr/share/kbd/consolefonts/lat5-16.psfu.gz
+	install -m 0644 /usr/share/kbd/consolefonts/iso07u-16.psfu.gz \
+		$(INSTALLER_DIR)/initrd/usr/share/kbd/consolefonts/iso07u-16.psfu.gz
+	install -m 0644 /usr/share/kbd/consolefonts/viscii10-8x16.psfu.gz \
+		$(INSTALLER_DIR)/initrd/usr/share/kbd/consolefonts/viscii10-8x16.psfu.gz
 
 	# Install mke2fs (from e2fsprogs)
 	install -c -D /sbin/mke2fs			$(INSTALLER_DIR)/initrd/bin/mke2fs

Modified: ipcop/trunk/src/installer/keymap.c
===================================================================
--- ipcop/trunk/src/installer/keymap.c	2007-11-01 08:28:07 UTC (rev 622)
+++ ipcop/trunk/src/installer/keymap.c	2007-11-01 11:04:50 UTC (rev 623)
@@ -21,7 +21,7 @@
  
 
 #define MAX_FILENAMES 5000
-#define KEYMAPROOT "/lib/kbd/keymaps/i386/"
+#define KEYMAPROOT "/usr/share/kbd/keymaps/i386/"
 
 static int filenamecount;
 static char *filenames[MAX_FILENAMES];
@@ -61,6 +61,8 @@
 			strcpy(displaynames[c], filenames[c]);
 		if ( (temp = strstr(displaynames[c], ".map.gz")) )
 			*temp = '\0';
+    else if ( (temp = strstr(displaynames[c], ".kmap.gz")) )
+			*temp = '\0';
 	}
 	displaynames[c] = NULL;
 	
@@ -71,10 +73,10 @@
 		return 0;
 	}	
 	
-	strcpy(keymap, "/usr/share/kbd/keymaps/i386/qwerty/us.map.gz");
+	strcpy(keymap, KEYMAPROOT "qwerty/us.map.gz");
 	find_kv_default(kv, "KEYMAP", keymap);
 	
-	choice = 0;
+  choice = 0;
 	for (c = 0; filenames[c]; c++)
 	{
 		if (strcmp(keymap, filenames[c]) == 0)
@@ -90,7 +92,7 @@
 	{
 		update_kv(&kv, "KEYMAP", keymap);
 		write_kv_to_file(&kv, CONFIG_ROOT "/main/settings");
-		sprintf(commandstring, "/bin/loadkeys %s", keymap);
+		snprintf(commandstring, STRING_SIZE, "/bin/loadkeys %s", keymap);
 		mysystem(commandstring);
 		result = 1;
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Ipcop-svn] SF.net SVN: ipcop: [622] ipcop/trunk/src/installer/partition.c

From: <ow...@us...> - 2007-11-01 08:28:07

Revision: 622
          http://ipcop.svn.sourceforge.net/ipcop/?rev=622&view=rev
Author:   owes
Date:     2007-11-01 01:28:07 -0700 (Thu, 01 Nov 2007)

Log Message:
-----------
Oops goofed up on array indexes, since each Arch. now defines NR_PARTITIONS there is no need for a terminating entry.

Modified Paths:
--------------
    ipcop/trunk/src/installer/partition.c

Modified: ipcop/trunk/src/installer/partition.c
===================================================================
--- ipcop/trunk/src/installer/partition.c	2007-11-01 08:21:30 UTC (rev 621)
+++ ipcop/trunk/src/installer/partition.c	2007-11-01 08:28:07 UTC (rev 622)
@@ -93,7 +93,6 @@
   strcpy(partition_label[0], "/boot");
   strcpy(partition_label[1], "/");
   strcpy(partition_label[2], "/var/log");
-  strcpy(partition_label[3], "");
 
   snprintf(string, STRING_SIZE, "/bin/parted -s %s mklabel msdos", device);
   if (mysystem(string) != 0)
@@ -147,7 +146,6 @@
   strcpy(partition_label[2], "/boot");
   strcpy(partition_label[3], "/");
   strcpy(partition_label[4], "/var/log");
-  strcpy(partition_label[5], "");
 
   snprintf(string, STRING_SIZE, "/bin/parted -s %s mklabel mac", device);
   if ( mysystem(string) != 0 )
@@ -238,7 +236,6 @@
   strcpy(partition_label[1], "/");
   strcpy(partition_label[2], "skip");
   strcpy(partition_label[3], "/var/log");
-  strcpy(partition_label[4], "");
 
   snprintf(string, STRING_SIZE, "/bin/parted -s  %s mklabel sun", device);
   if ( mysystem(string) != 0 )
@@ -289,7 +286,6 @@
   strcpy(partition_label[0], "/boot");
   strcpy(partition_label[1], "/");
   strcpy(partition_label[2], "/var/log");
-  strcpy(partition_label[3], "");
 
   snprintf(string, STRING_SIZE, "/bin/parted -s  %s mklabel bsd", device);
   if ( mysystem(string) != 0 )


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Ipcop-svn] SF.net SVN: ipcop: [621] ipcop/trunk/src/installer

From: <ow...@us...> - 2007-11-01 08:21:27

Revision: 621
          http://ipcop.svn.sourceforge.net/ipcop/?rev=621&view=rev
Author:   owes
Date:     2007-11-01 01:21:30 -0700 (Thu, 01 Nov 2007)

Log Message:
-----------
Add new header for architecture specifics.
Redone partitioning, to better cover powerpc and sparc schemes.

Modified Paths:
--------------
    ipcop/trunk/src/installer/common.h
    ipcop/trunk/src/installer/hardware.c
    ipcop/trunk/src/installer/installer.c
    ipcop/trunk/src/installer/partition.c

Added Paths:
-----------
    ipcop/trunk/src/installer/arch_defs.h

Added: ipcop/trunk/src/installer/arch_defs.h
===================================================================
--- ipcop/trunk/src/installer/arch_defs.h	                        (rev 0)
+++ ipcop/trunk/src/installer/arch_defs.h	2007-11-01 08:21:30 UTC (rev 621)
@@ -0,0 +1,95 @@
+/*
+ * arch_defs.h: Global defines, function definitions etc. concerning portabilty
+ *              Probably only necessary for installer. 
+ *
+ * This program is distributed under the terms of the GNU General Public
+ * Licence.  See the file COPYING for details.
+ *
+ * (c) 2007, the IPCop team
+ *
+ * $Id$
+ * 
+ */
+
+
+/*  
+    Test which arch is used for building.
+    We currently support i386, alpha, powerpc and sparc.
+
+    If you want to compile on a different architecture look in this file for modifications.
+*/
+#if defined (__i386__)
+#elif defined (__alpha__)
+#elif defined (__powerpc__) || defined (__powerpc64__)
+#elif defined (__sparc__) || defined (__sparc64__)
+#else
+  #error "We currently do not support your hardware architecture"
+#endif
+
+
+#include <hd.h>
+
+
+/*
+    Number of partitions
+*/
+#if defined (__i386__)
+  #define NR_PARTITIONS       3
+#elif defined (__alpha__)
+  #define NR_PARTITIONS       3
+#elif defined (__powerpc__) || defined (__powerpc64__)
+  #define NR_PARTITIONS       5
+#elif defined (__sparc__) || defined (__sparc64__)
+  #define NR_PARTITIONS       4
+#endif
+
+/*
+    Partioning settings (all in MByte)
+*/
+#define DISK_MINIMUM    256
+#define ROOT_MINIMUM    128
+#define SWAP_MINIMUM     32
+#define SWAP_MAXIMUM    256
+
+
+/*
+    Size for boot partition, this must be at least 2x size of kernel and initrd
+    so we can manage kernel updates. Also allow some margin, in case kernel size
+    increases.
+*/
+#if defined (__powerpc__)
+#define BOOT_PARTITION   32
+#else
+#define BOOT_PARTITION   16
+#endif
+
+
+/*
+    Various function implemented in hardware.c and partition.c    
+*/
+void scanhardware(int nopcmcia, int nousb);
+int autopart( int selected_hd, long int disk_size);
+int makedisk( int selected_hd, int *bootpartexist);
+void createinitrd(void);
+void make_bootable(int selected_hd, int bootpartexist);
+/*
+    List of partitions.
+    Can be /boot, /, /var/log but also skip and swap.
+*/
+extern char partition_label[NR_PARTITIONS][STRING_SIZE];
+/*
+    Helper, returns the name of the device without '/dev/'
+    Implemented in hardware.c
+*/
+char *short_ddev(int disk);
+
+/*
+    Some global variables used when installing
+*/
+extern char **harddisklist;
+extern char **cdromlist;
+extern char **floppylist;
+extern unsigned int nummodules;
+extern char **modules;
+extern hd_hw_item_t *module_type;
+


Property changes on: ipcop/trunk/src/installer/arch_defs.h
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: ipcop/trunk/src/installer/common.h
===================================================================
--- ipcop/trunk/src/installer/common.h	2007-11-01 05:53:54 UTC (rev 620)
+++ ipcop/trunk/src/installer/common.h	2007-11-01 08:21:30 UTC (rev 621)
@@ -13,7 +13,6 @@
 #ifndef __COMMON_H
 #define __COMMON_H
 
-#include <hd.h>
 #include <stdio.h>
 
 #define TRUE 1
@@ -25,22 +24,6 @@
 
 
 /*
-    Partioning settings (all in MByte)
-*/
-#define DISK_MINIMUM    256
-#define ROOT_MINIMUM    128
-#define SWAP_MINIMUM     32
-#define SWAP_MAXIMUM    256
-
-
-#if defined(__powerpc__)
-#define BOOT_PARTITION   32
-#else
-#define BOOT_PARTITION   16
-#endif
-
-
-/*
     Log and error handles are needed for mysystem helper function.
 */
 extern FILE *flog;
@@ -55,11 +38,6 @@
 int mysystem(char *command);
 int mysystemhidden(char *command);
 /*
-    Helper, returns the name of the device without '/dev/'
-    Implemented in hardware.c
-*/
-char *short_ddev(int disk);
-/*
     Implemented in helper_newt.c
 */
 void statuswindow(int width, int height, char *title, char *text, ...);
@@ -97,36 +75,9 @@
 
 
 /*
-
+    All kinds of functions used by setup
 */
-extern char **harddisklist;
-extern char **cdromlist;
-extern char **floppylist;
-extern unsigned int nummodules;
-extern char **modules;
-extern hd_hw_item_t *module_type;
-
-void scanhardware(int nopcmcia, int nousb);
-
-
-/*
-
-*/
 void setlanguage (NODEKV *kv);
-
-
-/*
-
-*/
-extern char **partition_label;
-
-int autopart( int selected_hd, long int disk_size);
-int makedisk( int selected_hd, int *bootpartexist, int autolabel);
-void createinitrd(void);
-void make_bootable(int selected_hd, int bootpartexist);
-
-
-
 int handlekeymap(void);
 int handletimezone(void);
 int handlehostname(void);
@@ -134,9 +85,8 @@
 int handleisdn(void);
 int handlenetworking(void); 
 int handlepasswords(void); 
-
 /*
-  Dialogs for changing passwords. Possible user: "root", "admin", "backup"
+    Dialogs for changing passwords. Possible user: "root", "admin", "backup"
 */
 int password(char *user);
 

Modified: ipcop/trunk/src/installer/hardware.c
===================================================================
--- ipcop/trunk/src/installer/hardware.c	2007-11-01 05:53:54 UTC (rev 620)
+++ ipcop/trunk/src/installer/hardware.c	2007-11-01 08:21:30 UTC (rev 621)
@@ -16,6 +16,7 @@
 #include <string.h>
 #include <unistd.h>
 #include "common.h"
+#include "arch_defs.h"
 
 
 // Build a list of specified items and load corresponding driver

Modified: ipcop/trunk/src/installer/installer.c
===================================================================
--- ipcop/trunk/src/installer/installer.c	2007-11-01 05:53:54 UTC (rev 620)
+++ ipcop/trunk/src/installer/installer.c	2007-11-01 08:21:30 UTC (rev 621)
@@ -31,6 +31,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "common.h"
+#include "arch_defs.h"
 
 
 NODEKV *kv = NULL;              // contains a list key=value pairs
@@ -232,12 +233,10 @@
                    50, 5, 5, 8,
                    harddisklist,
                    ddisk,
-                   gettext("TR_OK"),
-                   "fdisk", 
-                   gettext("TR_CANCEL"), NULL);
+                   gettext("TR_OK"), gettext("TR_CANCEL"), NULL);
 
-    if (rc == 3)        // cancel choosed!
-        return 3;
+    if (rc == 2)        // cancel choosed!
+        return 2;
 
     sprintf(string, "/sys/block/%s/size", short_ddev(*ddisk));
 
@@ -251,7 +250,7 @@
   {
         fprintf(flog, "HARDDISK %s: really to small.\n", harddisklist[*ddisk]);
         newtWinMessage(get_title(), gettext("TR_OK"), gettext("TR_DISK_TO_SMALL"));
-        return 3; // force cancel
+        return 2; // force cancel
     }
     fclose(handle);
     fprintf(flog, "Hard disk selected %s. Size:%ld MByte\n",
@@ -263,8 +262,7 @@
     fprintf(flog, "Hard disk set to:%ld MByte\n", *disk_size);
   }        
 
-
-  return rc; //(OK or fdisk)
+  return rc; //(OK)
 }
 
 
@@ -364,9 +362,9 @@
 
   switch  (selectdestination (&selected_hd, &disk_size)) 
   {
-    case 3:   //CANCEL
+    case 2:   //CANCEL
       goto EXIT;
-    case 2:   // call manual fdisk
+    case 3:   // call manual fdisk
 #if 0
 // skip for now
       if (!(bigdisk = (disk_size >= SMALL_DISK))) {
@@ -389,8 +387,7 @@
       if (autopart(selected_hd, disk_size))
         goto EXIT;
       if (makedisk( selected_hd,
-                   &bootpartindex,      // return index id '/boot'
-                   TRUE                 // autolabel=yes
+                   &bootpartindex       // return index id '/boot'
                              ))
         goto EXIT;
   }
@@ -446,11 +443,22 @@
   mysystem("/bin/umount -n /harddisk/tmp");
   mysystem("/bin/umount -n /harddisk/sys");
 
-  for (i = 0; partition_label[i] ; i++)
+  for (i = 0; i < NR_PARTITIONS ; i++)
   {
-    char string[STRING_SIZE];
-    snprintf(string, STRING_SIZE, "/bin/umount /harddisk%s", partition_label[i]);
-    mysystem(string);
+    if ( !strcmp(partition_label[i], "skip") )
+    {
+    }
+    else if ( !strcmp(partition_label[i], "swap") )
+    {
+    }
+    else if ( !strcmp(partition_label[i], "/") )
+    { /* /var/log comes after /, so we cannot umount /harddisk/ */
+    }
+    else
+    {
+      snprintf(line, STRING_SIZE, "/bin/umount /harddisk%s", partition_label[i]);
+      mysystem(line);
+    }
   }
 
   // And last /hardisk /mnt and swaps

Modified: ipcop/trunk/src/installer/partition.c
===================================================================
--- ipcop/trunk/src/installer/partition.c	2007-11-01 05:53:54 UTC (rev 620)
+++ ipcop/trunk/src/installer/partition.c	2007-11-01 08:21:30 UTC (rev 621)
@@ -6,6 +6,28 @@
  *
  * (c) 2007, the IPCop team
  *
+ *
+ *
+ *  Partition scheme is:
+ *  i386      partition1 /boot
+ *            partition2 /
+ *            partition3 /var/log
+ *
+ *  alpha     partition1 /boot
+ *            partition2 /
+ *            partition3 /var/log
+ *
+ *  powerpc   partition1 -- reserved, absolutely can't be used
+ *            partition2 -- reserved, absolutely can't be used
+ *            partition3 /boot
+ *            partition4 /
+ *            partition5 /var/log
+ *
+ *  sparc     partition1 /boot
+ *            partition2 /
+ *            partition3 -- reserved, absolutely can't be used
+ *            partition4 /var/log
+ *
  * $Id$
  * 
  */
@@ -18,536 +40,479 @@
 #include <string.h>
 #include <sys/stat.h>
 #include "common.h"
+#include "arch_defs.h"
 
 
+
+static int numpartitions = 0;
+static char partitions [NR_PARTITIONS][STRING_SIZE];       // something like /dev/hda1, /dev/hda2
+char partition_label [NR_PARTITIONS][STRING_SIZE];       // add 1 string for terminator mark
+
+
 /*
     Calculate for the user a useable disk schema partition
     and make it so.
 */
-int 
-autopart( int selected_hd, long int disk_size)
+int autopart( int selected_hd, long int disk_size)
 {
+  long int swap_file, boot_partition, log_partition;
+  long int start_partition, current_free, root_partition;
+  char string[STRING_SIZE];
+  char *device = harddisklist[selected_hd];
 
-        long int swap_file, boot_partition, log_partition;
-        long int start_partition, current_free, root_partition;
-        char string[STRING_SIZE];
+  /* set all the minimum sizes */
+  boot_partition  = BOOT_PARTITION;
+  root_partition  = ROOT_MINIMUM;
+  swap_file       = SWAP_MINIMUM;
+  log_partition   = DISK_MINIMUM - BOOT_PARTITION - ROOT_MINIMUM - SWAP_MINIMUM;
 
-        /* set all the minimum sizes */
-        boot_partition  = BOOT_PARTITION;
-        root_partition  = ROOT_MINIMUM;
-        swap_file       = SWAP_MINIMUM;
-        log_partition   = DISK_MINIMUM - BOOT_PARTITION - ROOT_MINIMUM - SWAP_MINIMUM;
+  current_free    = disk_size - boot_partition - root_partition - log_partition - swap_file;
 
-        current_free    = disk_size - boot_partition - root_partition - log_partition - swap_file;
+  /* 25% of remaining space goes to swap and maximize swap */
+  swap_file += current_free / 4;
+  if ( swap_file > SWAP_MAXIMUM )
+  {
+    swap_file = SWAP_MAXIMUM;
+  }
 
-        /* 25% of remaining space goes to swap and maximize swap */
-        swap_file += current_free / 4;
-        if ( swap_file > SWAP_MAXIMUM )
-        {
-          swap_file = SWAP_MAXIMUM;
-        }
+  /* 25% of remaining space goes to root partition */
+  root_partition += current_free / 4;
+  /* swap is just a file in root partition */
+  root_partition = root_partition + swap_file;
+  /* now that we have boot and root, recalc log */
+  log_partition = disk_size - boot_partition - root_partition;
 
-        /* 25% of remaining space goes to root partition */
-        root_partition += current_free / 4;
-        /* swap is just a file in root partition */
-        root_partition = root_partition + swap_file;
-        /* now that we have boot and root, recalc log */
-        log_partition = disk_size - boot_partition - root_partition;
+  start_partition = 1;            /* in MB */
 
-        start_partition = 1;            /* in MB */
+  /* stupid parted is unable to batch correctly. */
+  snprintf(string, STRING_SIZE, "dd if=/dev/zero of=%s bs=512 count=1", device );
+  mysystem(string);
+  mysystem("sync");
 
-        /* stupid parted is unable to batch correctly. */
-        snprintf(string, STRING_SIZE, "dd if=/dev/zero of=%s bs=512 count=1", harddisklist[selected_hd] );
-        mysystem(string);
-        mysystem("sync");
-
 #if defined(__i386__) || defined(__x86_64__)
-        snprintf(string, STRING_SIZE, "/bin/parted -s %s mklabel msdos", harddisklist[selected_hd]);
-        if (mysystem(string) != 0)
-        {
-                fprintf(flog, "Unable to create msdos disk label (fatal error)\n");
-                /* return 1; */ /* ERROR */
-        }
+  strcpy(partition_label[0], "/boot");
+  strcpy(partition_label[1], "/");
+  strcpy(partition_label[2], "/var/log");
+  strcpy(partition_label[3], "");
 
-        snprintf(string, STRING_SIZE, "/bin/parted -s %s mkpart primary %ld %ld",
-                                                                                harddisklist[selected_hd],
-                                                                                start_partition,
-                                                                                boot_partition);
-        if (mysystem(string) != 0)
-        {
-                fprintf(flog, "Unable to create /boot partition (fatal error)\n");
-                /* return 1; */ /* ERROR */
-        }
+  snprintf(string, STRING_SIZE, "/bin/parted -s %s mklabel msdos", device);
+  if (mysystem(string) != 0)
+  {
+    fprintf(flog, "Unable to create msdos disk label (fatal error)\n");
+    /* return 1; */ /* ERROR */
+  }
 
-        snprintf(string, STRING_SIZE, "/bin/parted -s %s mkpart primary %ld %ld",
-                                                                                harddisklist[selected_hd],
-                                                                                boot_partition,
-                                                                                boot_partition+root_partition);
-        if (mysystem(string) != 0)
-        {
-                fprintf(flog, "Unable to create / partition (fatal error)\n");
-                /* return 1; */ /* ERROR */
-        }
+  snprintf(string, STRING_SIZE, "/bin/parted -s %s mkpart primary %ld %ld",
+                                device,
+                                start_partition,
+                                boot_partition);
+  if ( mysystem(string) != 0 )
+  {
+    fprintf(flog, "Unable to create /boot partition (fatal error)\n");
+    /* return 1; */ /* ERROR */
+  }
 
-        snprintf(string, STRING_SIZE, "/bin/parted -s %s mkpart primary %ld %ld",
-                                                                                harddisklist[selected_hd],
-                                                                                boot_partition+root_partition,
-                                                                                disk_size);
-        if (mysystem(string) != 0)
-        {
-                fprintf(flog, "Unable to create /var/log partition (fatal error)\n");
-                /* return 1; */ /* ERROR */
-        }
+  snprintf(string, STRING_SIZE, "/bin/parted -s %s mkpart primary %ld %ld",
+                                device,
+                                boot_partition,
+                                boot_partition+root_partition);
+  if ( mysystem(string) != 0 )
+  {
+    fprintf(flog, "Unable to create / partition (fatal error)\n");
+    /* return 1; */ /* ERROR */
+  }
 
-        snprintf(string, STRING_SIZE, "/bin/parted -s %s set 1 boot on",
-                                                                                harddisklist[selected_hd]);
-        if (mysystem(string))
-        {
-                fprintf(flog, "Unable to set the boot flag on the /boot partition (fatal error)\n");
-                /* return 1; */ /* ERROR */
-        }
+  snprintf(string, STRING_SIZE, "/bin/parted -s %s mkpart primary %ld %ld",
+                                device,
+                                boot_partition+root_partition,
+                                disk_size);
+  if ( mysystem(string) != 0 )
+  {
+    fprintf(flog, "Unable to create /var/log partition (fatal error)\n");
+    /* return 1; */ /* ERROR */
+  }
+
+  snprintf(string, STRING_SIZE, "/bin/parted -s %s set 1 boot on",
+                                device);
+  if ( mysystem(string) )
+  {
+    fprintf(flog, "Unable to set the boot flag on the /boot partition (fatal error)\n");
+    /* return 1; */ /* ERROR */
+  }
 #endif /* End of i386/x86_64 partitioning block */
 
 #if defined(__powerpc__) || defined(__powerpc64__)
-        snprintf(string, STRING_SIZE, "/bin/parted -s  %s mklabel mac",
-                                                                                harddisklist[selected_hd]);
-        if (mysystem(string) != 0)
-        {
-                fprintf(flog, "Unable to create mac disk label (fatal error)\n");
-                /* return 1; */ /* ERROR */
-        }
+  strcpy(partition_label[0], "skip");
+  strcpy(partition_label[1], "skip");
+  strcpy(partition_label[2], "/boot");
+  strcpy(partition_label[3], "/");
+  strcpy(partition_label[4], "/var/log");
+  strcpy(partition_label[5], "");
 
-        snprintf(string, STRING_SIZE,
-                "/bin/parted -s %s mkpart primary hfs 33k %ld",
-                                                                                harddisklist[selected_hd],
-                                                                                start_partition);
-        if (mysystem(string) != 0)
-        {
-                fprintf(flog, "Unable to create hfs bootstrap partition (fatal error)\n");
-                /* return 1; */ /* ERROR */
-        }
+  snprintf(string, STRING_SIZE, "/bin/parted -s %s mklabel mac", device);
+  if ( mysystem(string) != 0 )
+  {
+    fprintf(flog, "Unable to create mac disk label (fatal error)\n");
+    /* return 1; */ /* ERROR */
+  }
 
-        snprintf(string, STRING_SIZE, "/bin/parted -s %s name 2 bootstrap",
-                                                                                harddisklist[selected_hd]);
-        if (mysystem(string))
-        {
-                fprintf(flog, "Unable to name bootstrap partition (non-fatal error)\n");
-                /* return 1; */ /* ERROR */
-        }
+  snprintf(string, STRING_SIZE, "/bin/parted -s %s mkpart primary hfs 33k %ld",
+                                device,
+                                start_partition);
+  if ( mysystem(string) != 0 )
+  {
+    fprintf(flog, "Unable to create hfs bootstrap partition (fatal error)\n");
+    /* return 1; */ /* ERROR */
+  }
 
-        snprintf(string, STRING_SIZE, "/bin/parted -s %s set 2 boot on",
-                                                                                harddisklist[selected_hd]);
-        if (mysystem(string))
-        {
-                fprintf(flog, "Unable to set the boot flag on the hfs bootstrap partition (fatal error)\n");
-                /* return 1; */ /* ERROR */
-        }
+  snprintf(string, STRING_SIZE, "/bin/parted -s %s name 2 bootstrap",
+                                device);
+  if ( mysystem(string) )
+  {
+    fprintf(flog, "Unable to name bootstrap partition (non-fatal error)\n");
+    /* return 1; */ /* ERROR */
+  }
 
-        snprintf(string, STRING_SIZE, "/bin/parted -s %s mkpart primary %ld %ld",
-                                                                                harddisklist[selected_hd],
-                                                                                start_partition,
-                                                                                boot_partition);
-        if (mysystem(string) != 0)
-        {
-                fprintf(flog, "Unable to create /boot partition (fatal error)\n");
-                /* return 1; */ /* ERROR */
-        }
+  snprintf(string, STRING_SIZE, "/bin/parted -s %s set 2 boot on",
+                                device);
+  if ( mysystem(string) )
+  {
+    fprintf(flog, "Unable to set the boot flag on the hfs bootstrap partition (fatal error)\n");
+    /* return 1; */ /* ERROR */
+  }
 
-        snprintf(string, STRING_SIZE, "/bin/parted -s %s name 3 /boot", harddisklist[selected_hd]);
-        if (mysystem(string) != 0)
-        {
-                fprintf(flog, "Unable to name /boot partition (non-fatal error)\n");
-                /* return 1; */ /* ERROR */
-        }
+  snprintf(string, STRING_SIZE, "/bin/parted -s %s mkpart primary %ld %ld",
+                                device,
+                                start_partition,
+                                boot_partition);
+  if ( mysystem(string) != 0 )
+  {
+    fprintf(flog, "Unable to create /boot partition (fatal error)\n");
+    /* return 1; */ /* ERROR */
+  }
 
-        snprintf(string, STRING_SIZE, "/bin/parted -s %s mkpart primary %ld %ld",
-                                                                                harddisklist[selected_hd],
-                                                                                boot_partition,
-                                                                                root_partition);
-        if (mysystem(string) != 0)
-        {
-                fprintf(flog, "Unable to create / partition (fatal error)\n");
-                /* return 1; */ /* ERROR */
-        }
+  snprintf(string, STRING_SIZE, "/bin/parted -s %s name 3 /boot", device);
+  if ( mysystem(string) != 0 )
+  {
+    fprintf(flog, "Unable to name /boot partition (non-fatal error)\n");
+    /* return 1; */ /* ERROR */
+  }
 
-        snprintf(string, STRING_SIZE, "/bin/parted -s %s name 4 /", harddisklist[selected_hd]);
-        if (mysystem(string) != 0)
-        {
-                fprintf(flog, "Unable to name / partition (non-fatal error)\n");
-                /* return 1; */ /* ERROR */
-        }
+  snprintf(string, STRING_SIZE, "/bin/parted -s %s mkpart primary %ld %ld",
+                                device,
+                                boot_partition,
+                                root_partition);
+  if ( mysystem(string) != 0 )
+  {
+    fprintf(flog, "Unable to create / partition (fatal error)\n");
+    /* return 1; */ /* ERROR */
+  }
 
-        snprintf(string, STRING_SIZE, "/bin/parted -s %s mkpart primary %ld %ld",
-                                                                                harddisklist[selected_hd],
-                                                                                root_partition,
-                                                                                log_partition);
+  snprintf(string, STRING_SIZE, "/bin/parted -s %s name 4 /", device);
+  if ( mysystem(string) != 0 )
+  {
+    fprintf(flog, "Unable to name / partition (non-fatal error)\n");
+    /* return 1; */ /* ERROR */
+  }
 
-        if (mysystem(string) != 0)
-        {
-                fprintf(flog, "Unable to create /var/log partition (fatal error)\n");
-                /* return 1; */ /* ERROR */
-        }
+  snprintf(string, STRING_SIZE, "/bin/parted -s %s mkpart primary %ld %ld",
+                                device,
+                                root_partition,
+                                log_partition);
+  if ( mysystem(string) != 0 )
+  {
+    fprintf(flog, "Unable to create /var/log partition (fatal error)\n");
+    /* return 1; */ /* ERROR */
+  }
 
-        snprintf(string, STRING_SIZE, "/bin/parted -s %s name 5 /var/log",
-                                                                                harddisklist[selected_hd]);
-        if (mysystem(string))
-        {
-                fprintf(flog, "Unable to name /var/log partition (non-fatal error)\n");
-                /* return 1; */ /* ERROR */
-        }
+  snprintf(string, STRING_SIZE, "/bin/parted -s %s name 5 /var/log", device);
+  if ( mysystem(string) )
+  {
+    fprintf(flog, "Unable to name /var/log partition (non-fatal error)\n");
+    /* return 1; */ /* ERROR */
+  }
 #endif /* End of ppc/ppc64 partitioning block */
 
 #if defined(__sparc__) || defined(__sparc64__)
-        snprintf(string, STRING_SIZE, "/bin/parted -s  %s mklabel sun",
-                                                                                harddisklist[selected_hd]);
-        if (mysystem(string) != 0)
-        {
-                fprintf(flog, "Unable to create sun disk label (fatal error)\n");
-                /* return 1; */ /* ERROR */
-        }
+  strcpy(partition_label[0], "/boot");
+  strcpy(partition_label[1], "/");
+  strcpy(partition_label[2], "skip");
+  strcpy(partition_label[3], "/var/log");
+  strcpy(partition_label[4], "");
 
-        snprintf(string, STRING_SIZE, "/bin/parted -s %s mkpart primary %ld %ld",
-                                                                                harddisklist[selected_hd],
-                                                                                start_partition,
-                                                                                boot_partition);
-        if (mysystem(string) != 0)
-        {
-                fprintf(flog, "Unable to create /boot partition (fatal error)\n");
-                /* return 1; */ /* ERROR */
-        }
+  snprintf(string, STRING_SIZE, "/bin/parted -s  %s mklabel sun", device);
+  if ( mysystem(string) != 0 )
+  {
+    fprintf(flog, "Unable to create sun disk label (fatal error)\n");
+    /* return 1; */ /* ERROR */
+  }
 
-        snprintf(string, STRING_SIZE, "/bin/parted -s %s mkpart primary %ld %ld",
-                                                                                harddisklist[selected_hd],
-                                                                                boot_partition,
-                                                                                root_partition);
-        if (mysystem(string) != 0)
-        {
-                fprintf(flog, "Unable to create / partition (fatal error)\n");
-                /* return 1; */ /* ERROR */
-        }
+  snprintf(string, STRING_SIZE, "/bin/parted -s %s mkpart primary %ld %ld",
+                                device,
+                                start_partition,
+                                boot_partition);
+  if ( mysystem(string) != 0 )
+  {
+    fprintf(flog, "Unable to create /boot partition (fatal error)\n");
+    /* return 1; */ /* ERROR */
+  }
 
-        snprintf(string, STRING_SIZE, "/bin/parted -s %s mkpart primary %ld %ld",
-                                                                                harddisklist[selected_hd],
-                                                                                root_partition,
-                                                                                log_partition);
-        if (mysystem(string) != 0)
-        {
-                fprintf(flog, "Unable to create /var/log partition (fatal error)\n");
-                /* return 1; */ /* ERROR */
-        }
+  snprintf(string, STRING_SIZE, "/bin/parted -s %s mkpart primary %ld %ld",
+                                device,
+                                boot_partition,
+                                root_partition);
+  if ( mysystem(string) != 0 )
+  {
+    fprintf(flog, "Unable to create / partition (fatal error)\n");
+    /* return 1; */ /* ERROR */
+  }
 
-        snprintf(string, STRING_SIZE, "/bin/parted -s %s set 1 boot on",
-                                                                                harddisklist[selected_hd]);
-        if (mysystem(string))
-        {
-                fprintf(flog, "Unable to set the boot flag on the /boot partition (fatal error)\n");
-                /* return 1; */ /* ERROR */
-        }
-#endif /* End of sparc/sparc64 partitioning block */
+  snprintf(string, STRING_SIZE, "/bin/parted -s %s mkpart primary %ld %ld",
+                                device,
+                                root_partition,
+                                log_partition);
+  if ( mysystem(string) != 0 )
+  {
+    fprintf(flog, "Unable to create /var/log partition (fatal error)\n");
+    /* return 1; */ /* ERROR */
+  }
 
+  snprintf(string, STRING_SIZE, "/bin/parted -s %s set 1 boot on", device);
+  if ( mysystem(string) )
+  {
+    fprintf(flog, "Unable to set the boot flag on the /boot partition (fatal error)\n");
+    /* return 1; */ /* ERROR */
+  }
+  #endif /* End of sparc/sparc64 partitioning block */
+
 #if defined(__alpha__)
-        snprintf(string, STRING_SIZE, "/bin/parted -s  %s mklabel bsd",
-                                                                                harddisklist[selected_hd]);
-        if (mysystem(string) != 0)
-        {
-                fprintf(flog, "Unable to create bsd disk label (fatal error)\n");
-                /* return 1; */ /* ERROR */
-        }
+  strcpy(partition_label[0], "/boot");
+  strcpy(partition_label[1], "/");
+  strcpy(partition_label[2], "/var/log");
+  strcpy(partition_label[3], "");
 
-        snprintf(string, STRING_SIZE, "/bin/parted -s %s mkpart primary %ld %ld",
-                                                                                harddisklist[selected_hd],
-                                                                                start_partition,
-                                                                                boot_partition);
-        if (mysystem(string) != 0)
-        {
-                fprintf(flog, "Unable to create /boot partition (fatal error)\n");
-                /* return 1; */ /* ERROR */
-        }
+  snprintf(string, STRING_SIZE, "/bin/parted -s  %s mklabel bsd", device);
+  if ( mysystem(string) != 0 )
+  {
+    fprintf(flog, "Unable to create bsd disk label (fatal error)\n");
+    /* return 1; */ /* ERROR */
+  }
 
-        snprintf(string, STRING_SIZE, "/bin/parted -s %s mkpart primary %ld %ld",
-                                                                                harddisklist[selected_hd],
-                                                                                boot_partition,
-                                                                                root_partition);
-        if (mysystem(string) != 0)
-        {
-                fprintf(flog, "Unable to create / partition (fatal error)\n");
-                /* return 1; */ /* ERROR */
-        }
+  snprintf(string, STRING_SIZE, "/bin/parted -s %s mkpart primary %ld %ld",
+                                device,
+                                start_partition,
+                                boot_partition);
+  if ( mysystem(string) != 0 )
+  {
+    fprintf(flog, "Unable to create /boot partition (fatal error)\n");
+    /* return 1; */ /* ERROR */
+  }
 
-        snprintf(string, STRING_SIZE, "/bin/parted -s %s mkpart primary %ld %ld",
-                                                                                harddisklist[selected_hd],
-                                                                                root_partition,
-                                                                                log_partition);
-        if (mysystem(string) != 0)
-        {
-                fprintf(flog, "Unable to create /var/log partition (fatal error)\n");
-                /* return 1; */ /* ERROR */
-        }
+  snprintf(string, STRING_SIZE, "/bin/parted -s %s mkpart primary %ld %ld",
+                                device,
+                                boot_partition,
+                                root_partition);
+  if ( mysystem(string) != 0 )
+  {
+    fprintf(flog, "Unable to create / partition (fatal error)\n");
+    /* return 1; */ /* ERROR */
+  }
 
-        snprintf(string, STRING_SIZE, "/bin/parted -s %s set 1 boot on",
-                                                                                harddisklist[selected_hd]);
-        if (mysystem(string))
-        {
-                fprintf(flog, "Unable to set the boot flag on the /boot partition (fatal error)\n");
-                /* return 1; */ /* ERROR */
-        }
+  snprintf(string, STRING_SIZE, "/bin/parted -s %s mkpart primary %ld %ld",
+                                device,
+                                root_partition,
+                                log_partition);
+  if ( mysystem(string) != 0 )
+  {
+    fprintf(flog, "Unable to create /var/log partition (fatal error)\n");
+    /* return 1; */ /* ERROR */
+  }
+
+  snprintf(string, STRING_SIZE, "/bin/parted -s %s set 1 boot on", device);
+  if ( mysystem(string) != 0 )
+  {
+    fprintf(flog, "Unable to set the boot flag on the /boot partition (fatal error)\n");
+    /* return 1; */ /* ERROR */
+  }
 #endif /* End of alpha partitioning block */
 
-        return 0; /* SUCCESS */
+  return 0; /* SUCCESS */
 } /* End of int autopart() */
 
 
-int
-manualpart( int selected_hd)
+/*
+    Manual partition. Not correctly implemented, not tested.
+    Do not use.
+*/
+int manualpart( int selected_hd)
 {
-    /* Would like to write a frontend based on libparted and get
-    * rid of cfdisk, as it doesn't understand other partitioning 
-    * software.
-    */
-    char string[STRING_SIZE];
-    newtFinished();
-    snprintf(string, STRING_SIZE, "cfdisk %s", harddisklist[selected_hd]);
-    /* dont redirect */
-    system(string);
-    newtInit();
-    newtCls();
-    return 0;
+  /* Would like to write a frontend based on libparted and get
+  * rid of cfdisk, as it doesn't understand other partitioning 
+  * software.
+  */
+  char string[STRING_SIZE];
+  newtFinished();
+  snprintf(string, STRING_SIZE, "cfdisk %s", harddisklist[selected_hd]);
+  /* dont redirect */
+  system(string);
+  newtInit();
+  newtCls();
+  return 0;
 }
 
 
-//
-// After sourcefile are decompressed on harddisk, make room on /tmp
-//
+/*
+    After sourcefile are decompressed on harddisk, make room on /tmp
+*/
 void deletetarballs()
 {
-    mysystem("rm -f /tmp/" SNAME "-" VERSION "-varlog.tar.gz");
-    mysystem("rm -f /tmp/" SNAME "-" VERSION "-config.tar.gz");
-    mysystem("rm -f /tmp/" SNAME "-" VERSION ".tar.gz");
+  mysystem("rm -f /tmp/" SNAME "-" VERSION "-varlog.tar.gz");
+  mysystem("rm -f /tmp/" SNAME "-" VERSION "-config.tar.gz");
+  mysystem("rm -f /tmp/" SNAME "-" VERSION ".tar.gz");
 }
 
 
-// Format and copy ipcop files.
-// Input        : autolabel flag
-// Return value : indexe of boot partition (zero if not)
-// use two global var to unmount properly partition at end.
-char **partition_label = NULL;
 //callback helper funct, select something
 int special_filter_helper;
-int
-filter (const struct dirent *b)
+int filter (const struct dirent *b)
 {
-    return (strstr(b->d_name, short_ddev(special_filter_helper))) ? 1 : 0;
+  return (strstr(b->d_name, short_ddev(special_filter_helper))) ? 1 : 0;
 }
-int
-makedisk( int selected_hd,
-             int *bootpartexist,
-             int autolabel)
-{
-    char string[STRING_SIZE];
-    char message[STRING_SIZE];
-    FILE *handle;
-    struct dirent **names;
-    int i;
-    int alllabelled = 0;
-    int found = 0;
-    int numpartitions = 0;
-    char **partitions = NULL;
-    char **partitionslist = NULL;
-    int choice=0, rc;
-    char *values[] = { NULL, NULL };    /* pointers for the values. */
-    struct newtWinEntry entries[] = { {"", &values[0], 0,}, {NULL, NULL, 0} };
 
-    // Get existing partitions names
-    sprintf(string, "/sys/block/%s", short_ddev(selected_hd));
-    special_filter_helper = selected_hd; // call back needs global var.
-    numpartitions = scandir(string, &names, &filter, alphasort);
 
-    fprintf(flog, "Number of Partitions: %d\n", numpartitions);
+/*
+    Format and copy ipcop files.
+    We assume the disk is partitioned.
+    No manual labelling.
 
-    if (numpartitions == 0)
-    {
-        newtWinMessage(get_title(), gettext("TR_OK"), gettext("TR_UNABLE_TO_PARTITION"));
-        return 1; // cancel
-    }
-    partitions = calloc(1, sizeof(char *) * (numpartitions + 1));
-    partition_label = calloc(1, sizeof(char *) * (numpartitions + 1));
-    for (i = 0; i < numpartitions; i++)
-    {
-        partitions[i] = calloc(1, strlen(names[i]->d_name) + 1);
-        strcpy(partitions[i], names[i]->d_name);
-        partition_label[i] = "";
-        free(names[i]);
-    }
-    free(names);
+    Return value:
+      index of boot partition (zero if not)
+*/
 
-    /* end with a null pointer */
-    partitions[numpartitions] = NULL;
+int makedisk( int selected_hd,
+              int *bootpartexist)
+{
+  char string[STRING_SIZE];
+  char message[STRING_SIZE];
+  FILE *handle;
+  struct dirent **names;
+  int i;
+  int found = 0;
+  int choice=0, rc;
+  char *values[] = { NULL, NULL };    /* pointers for the values. */
+  struct newtWinEntry entries[] = { {"", &values[0], 0,}, {NULL, NULL, 0} };
 
-    for (i = 0; i < numpartitions; i++)
-      fprintf(flog, "PARTITIONS ARE : %s\n", partitions[i]);
+  // Get existing partitions names
+  sprintf(string, "/sys/block/%s", short_ddev(selected_hd));
+  special_filter_helper = selected_hd; // call back needs global var.
+  numpartitions = scandir(string, &names, &filter, alphasort);
 
-    /* auto partitioned, so auto label */
-    if (autolabel == 1)
-    {
-        alllabelled = TRUE;
-    }
-    partition_label[0] = "/boot";
-    partition_label[1] = "/";
-    partition_label[2] = "/var/log";
+  fprintf(flog, "Number of Partitions: %d\n", numpartitions);
 
-    while (!alllabelled)
-    {
-        //reconstruct part + label in a string...
-        partitionslist = calloc(1, sizeof(char *) * (numpartitions + 1));
-        for (i = 0; i < numpartitions; i++)
-        {
-            partitionslist[i] = calloc(1, strlen(partitions[i]) 
-                                        + strlen(partition_label[i]) + 10);
-            sprintf(partitionslist[i],"%s => %s", partitions[i],partition_label[i]);
-        }
-        partitionslist[i] = NULL;
-        
-/*TR*/  rc = newtWinMenu(gettext("Label Partitions"),
-/*TR*/                 gettext("Select the partition to label."), 50,
-                       5, 5, 8, partitionslist, &choice, 
-                       gettext("TR_EDIT"),
-                       gettext("TR_DONE"),
-                       gettext("TR_CANCEL"), NULL);
+  if ( (numpartitions == 0) || (numpartitions > NR_PARTITIONS) )
+  {
+    newtWinMessage(get_title(), gettext("TR_OK"), gettext("TR_UNABLE_TO_PARTITION"));
+    return 1; // cancel
+  }
+  for (i = 0; i < numpartitions; i++)
+  {
+    strncpy(partitions[i], names[i]->d_name, STRING_SIZE);
+    partitions[i][STRING_SIZE-1] = 0;
+    fprintf(flog, "PARTITIONS ARE : %s %s\n", partitions[i], partition_label[i]);
+    free(names[i]);
+  }
+  free(names);
 
-        for (i = 0; i < numpartitions; i++)
-        {
-            free (partitionslist[i]);
-        }
-        free (partitionslist);
-        
-        if (rc == 3)
-            return 1; // cancel
+  statuswindow(60, 4, get_title(), gettext("TR_MAKING_FILESYSTEMS"));
 
-        if ((rc == 1) || (rc == 0)) {
-            char *v = strdup (partition_label[choice]);
-            free (values[0]);
-            values[0] = v;
-/*TR*/              sprintf(message, gettext("Enter Label"));
-            sprintf(string, "%s %s",
-/*TR*/        gettext("Enter the mount point for the partition"),
-              partitions[choice]);
-/*TR*/      if( 2 == newtWinEntries(gettext("Label Partition"),
-                            string, 50, 5, 5, 18,
-                            entries,
-                            gettext("TR_OK"),
-                            gettext("TR_CANCEL"), NULL))
-                continue;
-
-            fprintf(flog, "CHOICE %d VALUE %s\n", choice, values[0]);
-
-            /* Ensure first char is / */
-            if (values[0][0] == '/')
-                strcpy(string,"");
-            else
-                strcpy(string,"/");
-            strcat (string,values[0]);
-            partition_label[choice] = calloc(1, strlen(string) + 1);
-            strcpy(partition_label[choice], string);
-            fprintf(flog, "MOUNT POINT FOR %s is %s\n",
-                partitions[choice], partition_label[choice]);
-        }
-
-        /* test for all labelled up */
-        if (rc == 2)
-        {
-            alllabelled = 1;
-            found = 0;
-            for (i = 0; i < numpartitions; i++)
-            {
-                if (partition_label[i] == NULL)
-                    alllabelled = 0;
-                /* make sure we've found the root partition */
-                else if (strlen(partition_label[i]) == 1)
-                    found = 1;
-            }
-            if (!found)
-                alllabelled = 0;
-        }
-    }
-
-    statuswindow(60, 4, get_title(), gettext("TR_MAKING_FILESYSTEMS"));
-
-    if ((handle=fopen("/etc/fstab", "w")))
+  if ( (handle = fopen("/etc/fstab", "w")) )
+  {
+    for (i = 0; i < numpartitions; i++)
     {
-      for (i = 0; i < numpartitions; i++)
+      if ( !strcmp(partition_label[i], "skip") )
       {
-        if (!strcmp(partition_label[i], "swap"))
-        {
-          sprintf(string, "/sbin/mkswap /dev/%s", partitions[i]);
-          mysystem(string);
-          fprintf(handle, "/dev/%s\tnone%s\tswap\n",
-                  partitions[i], partition_label[i]);
-          mysystem("/bin/swapon -a");
-        } else {
-          sprintf(string, "/sbin/mke2fs -L %s -q -j /dev/%s",
-                                        partition_label[i],
-                                        partitions[i]);
-          mysystem(string);
+      }
+      else if ( !strcmp(partition_label[i], "swap") )
+      {
+        sprintf(string, "/sbin/mkswap /dev/%s", partitions[i]);
+        mysystem(string);
+        fprintf(handle, "/dev/%s\tnone%s\tswap\n", partitions[i], partition_label[i]);
+        mysystem("/bin/swapon -a");
+      } else {
+        sprintf(string, "/sbin/mke2fs -L %s -q -j /dev/%s", partition_label[i], partitions[i]);
+        mysystem(string);
 //        sprintf(string, "/sbin/tune2fs -L %s /dev/%s",
 //              partition_label[i], partitions[i]);
 //        mysystem(string);
-          fprintf(handle, "/dev/%s\t/harddisk%s\text3\n",
-                  partitions[i], partition_label[i]);
-        }
+        fprintf(handle, "/dev/%s\t/harddisk%s\text3\n", partitions[i], partition_label[i]);
       }
-      fclose(handle);
     }
-    newtPopWindow();
+    fclose(handle);
+  }
+  newtPopWindow();
 
-    /* Update device files after partitioning */
-    mysystem("/sbin/udevstart");
 
-    statuswindow(60, 4, get_title(), gettext("TR_MOUTING_FILESYSTEMS"));
+  /* Update device files after partitioning */
+  mysystem("/sbin/udevstart");
 
-    /* load ext3 now */
-    mysystem("/bin/modprobe ext3");
-    mysystem("/bin/mount /harddisk/");
+  statuswindow(60, 4, get_title(), gettext("TR_MOUTING_FILESYSTEMS"));
 
-    *bootpartexist = 0;
-    for (i = 0; i < numpartitions; i++)
+  /* load ext3 now */
+  mysystem("/bin/modprobe ext3");
+  mysystem("/bin/mount /harddisk/");
+
+  *bootpartexist = 0;
+  for (i = 0; i < numpartitions; i++)
+  {
+    if ( !strcmp(partition_label[i], "skip") )
     {
+    }
+    else if ( !strcmp(partition_label[i], "swap") )
+    {
+    }
+    else
+    {
       sprintf(string, "/bin/mkdir -p /harddisk%s", partition_label[i]);
       mysystem(string);
-      if (!strcmp(partition_label[i], "/boot"))
+      if ( !strcmp(partition_label[i], "/boot") )
       {
         *bootpartexist = i + 1;
       }
     }
-    /* this can fail */
-    mysystem("/bin/mount -a");
-    newtPopWindow();
+  }
+  /* this can fail */
+  mysystem("/bin/mount -a");
+  newtPopWindow();
 
-    /* populate files on the partitions */
-    statuswindow(60, 4, get_title(), gettext("TR_INSTALLING_FILES"));
-    mysystem("/bin/tar -C /harddisk -xpzf /tmp/" SNAME "-" VERSION "-varlog.tar.gz");
-    mysystem("/bin/tar -C /harddisk -xpzf /tmp/" SNAME "-" VERSION "-config.tar.gz");
-    mysystem("/bin/tar -C /harddisk -xpzf /tmp/" SNAME "-" VERSION ".tar.gz");
+  /* populate files on the partitions */
+  statuswindow(60, 4, get_title(), gettext("TR_INSTALLING_FILES"));
+  mysystem("/bin/tar -C /harddisk -xpzf /tmp/" SNAME "-" VERSION "-varlog.tar.gz");
+  mysystem("/bin/tar -C /harddisk -xpzf /tmp/" SNAME "-" VERSION "-config.tar.gz");
+  mysystem("/bin/tar -C /harddisk -xpzf /tmp/" SNAME "-" VERSION ".tar.gz");
 
-    /* complete fstab */
-    if ((handle = fopen("/harddisk/etc/fstab", "a")))
+  /* complete fstab */
+  if ( (handle = fopen("/harddisk/etc/fstab", "a")) )
+  {
+    for (i = 0; i < numpartitions; i++)
     {
-      for (i = 0; i < numpartitions; i++)
+      if ( !strcmp(partition_label[i], "skip") )
       {
-        if (!strcmp(partition_label[i], "swap"))
-          fprintf(handle, "/dev/%s\t\t%s\t\tswap\tdefaults\t0 0\n",
-                  partitions[i], partition_label[i]);
-        else
-          fprintf(handle, "/dev/%s\t\t%s\t\text3\tnoatime\t1 1\n",
-                  partitions[i], partition_label[i]);
       }
-      fclose(handle);
+      else if (!strcmp(partition_label[i], "swap"))
+      {
+        fprintf(handle, "/dev/%s\t\t%s\t\tswap\tdefaults\t0 0\n", partitions[i], partition_label[i]);
+      }
+      else
+      {
+        fprintf(handle, "/dev/%s\t\t%s\t\text3\tnoatime\t1 1\n", partitions[i], partition_label[i]);
+      }
     }
-    newtPopWindow();
+    fclose(handle);
+  }
+  newtPopWindow();
 
-    for (i = 0; i < numpartitions; i++)
-        free(partitions[numpartitions]);
-    free(partitions);
-    return 0; // success
+  for (i = 0; i < numpartitions; i++)
+  return 0; // success
 }
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Ipcop-svn] SF.net SVN: ipcop: [620] ipcop/trunk/make.sh

From: <ch...@us...> - 2007-11-01 05:53:49

Revision: 620
          http://ipcop.svn.sourceforge.net/ipcop/?rev=620&view=rev
Author:   chepati
Date:     2007-10-31 22:53:54 -0700 (Wed, 31 Oct 2007)

Log Message:
-----------
Yes, I like escape characters :-)

Modified Paths:
--------------
    ipcop/trunk/make.sh

Modified: ipcop/trunk/make.sh
===================================================================
--- ipcop/trunk/make.sh	2007-11-01 05:36:23 UTC (rev 619)
+++ ipcop/trunk/make.sh	2007-11-01 05:53:54 UTC (rev 620)
@@ -785,7 +785,7 @@
 	chroot $LFS $TOOLS_DIR/bin/env -i \
 		HOME=/root \
 		TERM=$TERM \
-		PS1='[chroot] \u:\w\$ ' \
+		PS1="${BOLD}[chroot]${NORMAL} \u:\w\$ " \
 		PATH=$PATH \
 		CONFIG_ROOT=${CONFIG_ROOT} \
 		VERSION=${VERSION} \


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Ipcop-svn] SF.net SVN: ipcop: [619] ipcop/trunk/config/kernel/kernel.config.sparc

From: <ch...@us...> - 2007-11-01 05:36:20

Revision: 619
          http://ipcop.svn.sourceforge.net/ipcop/?rev=619&view=rev
Author:   chepati
Date:     2007-10-31 22:36:23 -0700 (Wed, 31 Oct 2007)

Log Message:
-----------
Updated sparc kernel config

Modified Paths:
--------------
    ipcop/trunk/config/kernel/kernel.config.sparc

Modified: ipcop/trunk/config/kernel/kernel.config.sparc
===================================================================
--- ipcop/trunk/config/kernel/kernel.config.sparc	2007-11-01 05:31:05 UTC (rev 618)
+++ ipcop/trunk/config/kernel/kernel.config.sparc	2007-11-01 05:36:23 UTC (rev 619)
@@ -1,15 +1,17 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21.1
-# Mon Jun 18 21:57:39 2007
+# Linux kernel version: 2.6.22
+# Sat Oct 27 05:02:05 2007
 #
 CONFIG_SPARC=y
 CONFIG_SPARC64=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_64BIT=y
 CONFIG_MMU=y
+CONFIG_QUICKLIST=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_TIME_INTERPOLATION=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
@@ -48,6 +50,7 @@
 # CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=15
 # CONFIG_CPUSETS is not set
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_RELAY is not set
@@ -60,23 +63,25 @@
 CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
-CONFIG_RD_BZIP2=y
-CONFIG_RD_LZMA=y
-CONFIG_RD_GZIP=y
 CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
 
 #
 # Loadable module support
@@ -113,6 +118,9 @@
 #
 # General machine setup
 #
+# CONFIG_TICK_ONESHOT is not set
+# CONFIG_NO_HZ is not set
+# CONFIG_HIGH_RES_TIMERS is not set
 CONFIG_SMP=y
 CONFIG_NR_CPUS=4
 # CONFIG_CPU_FREQ is not set
@@ -123,24 +131,24 @@
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_SPARSEMEM_DEFAULT=y
-CONFIG_LARGE_ALLOCS=y
 CONFIG_SELECT_MEMORY_MODEL=y
 # CONFIG_FLATMEM_MANUAL is not set
 # CONFIG_DISCONTIGMEM_MANUAL is not set
 CONFIG_SPARSEMEM_MANUAL=y
 CONFIG_SPARSEMEM=y
 CONFIG_HAVE_MEMORY_PRESENT=y
-# CONFIG_SPARSEMEM_STATIC is not set
-CONFIG_SPARSEMEM_EXTREME=y
+CONFIG_SPARSEMEM_STATIC=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_RESOURCES_64BIT=y
 CONFIG_ZONE_DMA_FLAG=0
+CONFIG_NR_QUICK=1
 CONFIG_SBUS=y
 CONFIG_SBUSCHAR=y
 CONFIG_SUN_AUXIO=y
 CONFIG_SUN_IO=y
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
+CONFIG_ARCH_SUPPORTS_MSI=y
 # CONFIG_PCI_MSI is not set
 CONFIG_SUN_OPENPROMFS=y
 CONFIG_SPARC32_COMPAT=y
@@ -155,6 +163,7 @@
 # CONFIG_BINFMT_MISC is not set
 # CONFIG_SOLARIS_EMUL is not set
 CONFIG_SCHED_SMT=y
+# CONFIG_SCHED_MC is not set
 CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PREEMPT is not set
@@ -169,7 +178,6 @@
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
@@ -219,6 +227,8 @@
 CONFIG_TCP_CONG_SCALABLE=m
 # CONFIG_TCP_CONG_LP is not set
 # CONFIG_TCP_CONG_VENO is not set
+# CONFIG_TCP_CONG_YEAH is not set
+# CONFIG_TCP_CONG_ILLINOIS is not set
 # CONFIG_DEFAULT_BIC is not set
 # CONFIG_DEFAULT_CUBIC is not set
 # CONFIG_DEFAULT_HTCP is not set
@@ -227,10 +237,6 @@
 CONFIG_DEFAULT_RENO=y
 CONFIG_DEFAULT_TCP_CONG="reno"
 # CONFIG_TCP_MD5SIG is not set
-
-#
-# IP: Virtual Server Configuration
-#
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
@@ -247,8 +253,6 @@
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NETFILTER_NETLINK_LOG=m
 CONFIG_NF_CONNTRACK_ENABLED=m
-CONFIG_NF_CONNTRACK_SUPPORT=y
-# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
 CONFIG_NF_CONNTRACK=m
 # CONFIG_NF_CT_ACCT is not set
 CONFIG_NF_CONNTRACK_MARK=y
@@ -353,20 +357,8 @@
 CONFIG_BRIDGE_EBT_SNAT=m
 CONFIG_BRIDGE_EBT_LOG=m
 CONFIG_BRIDGE_EBT_ULOG=m
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 CONFIG_ATM=m
 CONFIG_ATM_CLIP=m
@@ -391,9 +383,6 @@
 #
 CONFIG_NET_SCHED=y
 CONFIG_NET_SCH_FIFO=y
-CONFIG_NET_SCH_CLK_JIFFIES=y
-# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
-# CONFIG_NET_SCH_CLK_CPU is not set
 
 #
 # Queueing/Scheduling
@@ -445,14 +434,24 @@
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+CONFIG_FIB_RULES=y
+
+#
+# Wireless
+#
+CONFIG_CFG80211=m
+CONFIG_WIRELESS_EXT=y
+CONFIG_MAC80211=m
+# CONFIG_MAC80211_DEBUG is not set
 CONFIG_IEEE80211=m
 # CONFIG_IEEE80211_DEBUG is not set
 CONFIG_IEEE80211_CRYPT_WEP=m
 CONFIG_IEEE80211_CRYPT_CCMP=m
 CONFIG_IEEE80211_CRYPT_TKIP=m
 # CONFIG_IEEE80211_SOFTMAC is not set
-CONFIG_WIRELESS_EXT=y
-CONFIG_FIB_RULES=y
+# CONFIG_RFKILL is not set
+# CONFIG_KLIPS is not set
 
 #
 # Device Drivers
@@ -470,10 +469,6 @@
 # Connector - unified userspace <-> kernelspace linker
 #
 CONFIG_CONNECTOR=m
-
-#
-# Memory Technology Devices (MTD)
-#
 # CONFIG_MTD is not set
 
 #
@@ -510,13 +505,10 @@
 #
 # Misc devices
 #
+# CONFIG_PHANTOM is not set
 # CONFIG_SGI_IOC4 is not set
 CONFIG_TIFM_CORE=m
 CONFIG_TIFM_7XX1=m
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
 CONFIG_IDE=m
 CONFIG_BLK_DEV_IDE=m
 
@@ -531,6 +523,7 @@
 CONFIG_BLK_DEV_IDEFLOPPY=m
 # CONFIG_BLK_DEV_IDESCSI is not set
 # CONFIG_IDE_TASK_IOCTL is not set
+CONFIG_IDE_PROC_FS=y
 
 #
 # IDE chipset support/bugfixes
@@ -538,6 +531,7 @@
 CONFIG_IDE_GENERIC=m
 CONFIG_BLK_DEV_IDEPCI=y
 CONFIG_IDEPCI_SHARE_IRQ=y
+# CONFIG_IDEPCI_PCIBUS_ORDER is not set
 # CONFIG_BLK_DEV_OFFBOARD is not set
 CONFIG_BLK_DEV_GENERIC=m
 CONFIG_BLK_DEV_OPTI621=m
@@ -603,6 +597,7 @@
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
 # CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
 
 #
 # SCSI Transports
@@ -634,7 +629,6 @@
 CONFIG_AIC79XX_CMDS_PER_DEVICE=32
 CONFIG_AIC79XX_RESET_DELAY_MS=15000
 # CONFIG_AIC79XX_BUILD_FIRMWARE is not set
-CONFIG_AIC79XX_ENABLE_RD_STRM=y
 # CONFIG_AIC79XX_DEBUG_ENABLE is not set
 CONFIG_AIC79XX_DEBUG_MASK=0
 # CONFIG_AIC79XX_REG_PRETTY_PRINT is not set
@@ -671,10 +665,6 @@
 # CONFIG_SCSI_DEBUG is not set
 CONFIG_SCSI_SUNESP=m
 # CONFIG_SCSI_SRP is not set
-
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 CONFIG_ATA=m
 # CONFIG_ATA_NONSTANDARD is not set
 CONFIG_SATA_AHCI=m
@@ -697,6 +687,7 @@
 CONFIG_PATA_AMD=m
 CONFIG_PATA_ARTOP=m
 CONFIG_PATA_ATIIXP=m
+CONFIG_PATA_CMD640_PCI=m
 CONFIG_PATA_CMD64X=m
 CONFIG_PATA_CS5520=m
 CONFIG_PATA_CS5530=m
@@ -747,17 +738,18 @@
 #
 # IEEE 1394 (FireWire) support
 #
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
 CONFIG_IEEE1394=m
 
 #
 # Subsystem Options
 #
 # CONFIG_IEEE1394_VERBOSEDEBUG is not set
-CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y
-CONFIG_IEEE1394_CONFIG_ROM_IP1394=y
 
 #
-# Device Drivers
+# Controllers
 #
 
 #
@@ -766,10 +758,11 @@
 CONFIG_IEEE1394_OHCI1394=m
 
 #
-# Protocol Drivers
+# Protocols
 #
 # CONFIG_IEEE1394_VIDEO1394 is not set
 CONFIG_IEEE1394_SBP2=m
+CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y
 CONFIG_IEEE1394_ETH1394=m
 # CONFIG_IEEE1394_DV1394 is not set
 # CONFIG_IEEE1394_RAWIO is not set
@@ -787,15 +780,7 @@
 CONFIG_BONDING=m
 CONFIG_EQUALIZER=m
 CONFIG_TUN=m
-
-#
-# ARCnet devices
-#
 # CONFIG_ARCNET is not set
-
-#
-# PHY device support
-#
 CONFIG_PHYLIB=m
 
 #
@@ -872,10 +857,7 @@
 CONFIG_VIA_RHINE_MMIO=y
 CONFIG_VIA_RHINE_NAPI=y
 CONFIG_SC92031=m
-
-#
-# Ethernet (1000 Mbit)
-#
+CONFIG_NETDEV_1000=y
 CONFIG_ACENIC=m
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
 CONFIG_DL2K=m
@@ -898,10 +880,7 @@
 CONFIG_BNX2=m
 CONFIG_QLA3XXX=m
 CONFIG_ATL1=m
-
-#
-# Ethernet (10000 Mbit)
-#
+CONFIG_NETDEV_10000=y
 CONFIG_CHELSIO_T1=m
 # CONFIG_CHELSIO_T1_1G is not set
 CONFIG_CHELSIO_T1_NAPI=y
@@ -912,10 +891,7 @@
 CONFIG_S2IO_NAPI=y
 CONFIG_MYRI10GE=m
 # CONFIG_NETXEN_NIC is not set
-
-#
-# Token Ring devices
-#
+# CONFIG_MLX4_CORE is not set
 CONFIG_TR=y
 CONFIG_IBMOL=m
 CONFIG_3C359=m
@@ -924,45 +900,61 @@
 CONFIG_ABYSS=m
 
 #
-# Wireless LAN (non-hamradio)
+# Wireless LAN
 #
-CONFIG_NET_RADIO=y
-# CONFIG_NET_WIRELESS_RTNETLINK is not set
-
-#
-# Obsolete Wireless cards support (pre-802.11)
-#
+CONFIG_WLAN_PRE80211=y
 # CONFIG_STRIP is not set
-
-#
-# Wireless 802.11b ISA/PCI cards support
-#
+CONFIG_WLAN_80211=y
 CONFIG_IPW2100=m
-CONFIG_IPW2100_MONITOR=y
+# CONFIG_IPW2100_MONITOR is not set
 # CONFIG_IPW2100_DEBUG is not set
 CONFIG_IPW2200=m
 # CONFIG_IPW2200_MONITOR is not set
-# CONFIG_IPW2200_QOS is not set
+CONFIG_IPW2200_QOS=y
 # CONFIG_IPW2200_DEBUG is not set
-# CONFIG_HERMES is not set
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+# CONFIG_LIBERTAS_DEBUG is not set
+CONFIG_HERMES=m
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_NORTEL_HERMES=m
+CONFIG_PCI_HERMES=m
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
-
-#
-# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support
-#
 CONFIG_PRISM54=m
 CONFIG_USB_ZD1201=m
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
-# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
+CONFIG_HOSTAP_FIRMWARE_NVRAM=y
 CONFIG_HOSTAP_PLX=m
 CONFIG_HOSTAP_PCI=m
-CONFIG_NET_WIRELESS=y
 
 #
-# Wan interfaces
+# USB Network Adapters
 #
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_USBNET_MII=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
+CONFIG_USB_NET_ZAURUS=m
 CONFIG_WAN=y
 # CONFIG_LANMEDIA is not set
 CONFIG_HDLC=m
@@ -995,10 +987,7 @@
 CONFIG_DSCC4_PCI_RST=y
 CONFIG_DLCI=m
 CONFIG_DLCI_MAX=8
-
-#
-# ATM drivers
-#
+CONFIG_ATM_DRIVERS=y
 # CONFIG_ATM_DUMMY is not set
 CONFIG_ATM_TCP=m
 CONFIG_ATM_LANAI=m
@@ -1180,6 +1169,7 @@
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 
 #
 # Userland interfaces
@@ -1205,9 +1195,15 @@
 # CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_SPARCSPKR is not set
+# CONFIG_INPUT_ATI_REMOTE is not set
+# CONFIG_INPUT_ATI_REMOTE2 is not set
+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
+# CONFIG_INPUT_POWERMATE is not set
+# CONFIG_INPUT_YEALINK is not set
 # CONFIG_INPUT_UINPUT is not set
 
 #
@@ -1279,14 +1275,9 @@
 CONFIG_IPMI_SI=m
 CONFIG_IPMI_WATCHDOG=m
 CONFIG_IPMI_POWEROFF=m
-
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
 CONFIG_RTC=y
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
 # CONFIG_DRM is not set
@@ -1296,10 +1287,7 @@
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
-
-#
-# I2C support
-#
+CONFIG_DEVPORT=y
 # CONFIG_I2C is not set
 
 #
@@ -1312,16 +1300,15 @@
 # Dallas's 1-wire bus
 #
 # CONFIG_W1 is not set
-
-#
-# Hardware Monitoring support
-#
 CONFIG_HWMON=m
 CONFIG_HWMON_VID=m
 CONFIG_SENSORS_ABITUGURU=m
 CONFIG_SENSORS_F71805F=m
 CONFIG_SENSORS_PC87427=m
+CONFIG_SENSORS_SMSC47M1=m
+CONFIG_SENSORS_SMSC47B397=m
 CONFIG_SENSORS_VT1211=m
+CONFIG_SENSORS_W83627HF=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
 
 #
@@ -1333,25 +1320,32 @@
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_DAB is not set
 
 #
-# Digital Video Broadcasting Devices
-#
-# CONFIG_DVB is not set
-# CONFIG_USB_DABUSB is not set
-
-#
 # Graphics support
 #
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_LCD_CLASS_DEVICE is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
 CONFIG_FB=y
 CONFIG_FIRMWARE_EDID=y
 # CONFIG_FB_DDC is not set
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_SYS_FOPS is not set
+CONFIG_FB_DEFERRED_IO=y
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_BACKLIGHT is not set
@@ -1369,6 +1363,13 @@
 CONFIG_FB_BW2=y
 CONFIG_FB_CG3=y
 CONFIG_FB_CG6=y
+CONFIG_FB_FFB=y
+CONFIG_FB_TCX=y
+CONFIG_FB_CG14=y
+# CONFIG_FB_P9100 is not set
+CONFIG_FB_LEO=y
+CONFIG_FB_XVR500=y
+CONFIG_FB_XVR2500=y
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_NVIDIA is not set
 # CONFIG_FB_RIVA is not set
@@ -1388,13 +1389,10 @@
 # CONFIG_FB_KYRO is not set
 # CONFIG_FB_3DFX is not set
 # CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_VT8623 is not set
 # CONFIG_FB_TRIDENT is not set
-CONFIG_FB_FFB=y
-CONFIG_FB_TCX=y
-CONFIG_FB_CG14=y
-# CONFIG_FB_P9100 is not set
-CONFIG_FB_LEO=y
-CONFIG_FB_PCI=y
+# CONFIG_FB_ARK is not set
+# CONFIG_FB_PM3 is not set
 # CONFIG_FB_VIRTUAL is not set
 
 #
@@ -1407,10 +1405,6 @@
 # CONFIG_FONTS is not set
 CONFIG_FONT_SUN8x16=y
 # CONFIG_FONT_SUN12x22 is not set
-
-#
-# Logo configuration
-#
 CONFIG_LOGO=y
 # CONFIG_LOGO_LINUX_MONO is not set
 # CONFIG_LOGO_LINUX_VGA16 is not set
@@ -1429,6 +1423,20 @@
 # CONFIG_HID_DEBUG is not set
 
 #
+# USB Input Devices
+#
+CONFIG_USB_HID=m
+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
+# CONFIG_HID_FF is not set
+CONFIG_USB_HIDDEV=y
+
+#
+# USB HID Boot Protocol drivers
+#
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
+
+#
 # USB support
 #
 CONFIG_USB_ARCH_HAS_HCD=y
@@ -1441,6 +1449,7 @@
 # Miscellaneous USB options
 #
 CONFIG_USB_DEVICEFS=y
+# CONFIG_USB_DEVICE_CLASS is not set
 CONFIG_USB_DYNAMIC_MINORS=y
 # CONFIG_USB_OTG is not set
 
@@ -1488,63 +1497,10 @@
 # CONFIG_USB_LIBUSUAL is not set
 
 #
-# USB Input Devices
-#
-CONFIG_USB_HID=m
-# CONFIG_USB_HIDINPUT_POWERBOOK is not set
-# CONFIG_HID_FF is not set
-CONFIG_USB_HIDDEV=y
-
-#
-# USB HID Boot Protocol drivers
-#
-# CONFIG_USB_KBD is not set
-# CONFIG_USB_MOUSE is not set
-# CONFIG_USB_AIPTEK is not set
-# CONFIG_USB_WACOM is not set
-# CONFIG_USB_ACECAD is not set
-# CONFIG_USB_KBTAB is not set
-# CONFIG_USB_POWERMATE is not set
-# CONFIG_USB_TOUCHSCREEN is not set
-# CONFIG_USB_YEALINK is not set
-# CONFIG_USB_XPAD is not set
-# CONFIG_USB_ATI_REMOTE is not set
-# CONFIG_USB_ATI_REMOTE2 is not set
-# CONFIG_USB_KEYSPAN_REMOTE is not set
-# CONFIG_USB_APPLETOUCH is not set
-# CONFIG_USB_GTCO is not set
-
-#
 # USB Imaging devices
 #
 # CONFIG_USB_MDC800 is not set
 # CONFIG_USB_MICROTEK is not set
-
-#
-# USB Network Adapters
-#
-CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_USBNET_MII=m
-CONFIG_USB_USBNET=m
-CONFIG_USB_NET_AX8817X=m
-CONFIG_USB_NET_CDCETHER=m
-CONFIG_USB_NET_DM9601=m
-CONFIG_USB_NET_GL620A=m
-CONFIG_USB_NET_NET1080=m
-CONFIG_USB_NET_PLUSB=m
-CONFIG_USB_NET_MCS7830=m
-CONFIG_USB_NET_RNDIS_HOST=m
-CONFIG_USB_NET_CDC_SUBSET=m
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-CONFIG_USB_BELKIN=y
-CONFIG_USB_ARMLINUX=y
-CONFIG_USB_EPSON2888=y
-CONFIG_USB_KC2190=y
-CONFIG_USB_NET_ZAURUS=m
 # CONFIG_USB_MON is not set
 
 #
@@ -1593,13 +1549,18 @@
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
+CONFIG_MMC=m
+# CONFIG_MMC_DEBUG is not set
+# CONFIG_MMC_UNSAFE_RESUME is not set
 
 #
-# MMC/SD Card support
+# MMC/SD Card Drivers
 #
-CONFIG_MMC=m
-# CONFIG_MMC_DEBUG is not set
 CONFIG_MMC_BLOCK=m
+
+#
+# MMC/SD Host Controller Drivers
+#
 CONFIG_MMC_SDHCI=m
 CONFIG_MMC_TIFM_SD=m
 
@@ -1644,14 +1605,6 @@
 #
 
 #
-# Auxiliary Display support
-#
-
-#
-# Virtualization
-#
-
-#
 # Misc Linux/SPARC drivers
 #
 CONFIG_SUN_OPENPROMIO=y
@@ -1738,10 +1691,6 @@
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
 # CONFIG_CRAMFS is not set
-CONFIG_SQUASHFS=y
-CONFIG_SQUASHFS_EMBEDDED=y
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-CONFIG_SQUASHFS_VMALLOC=y
 # CONFIG_VXFS_FS is not set
 # CONFIG_HPFS_FS is not set
 # CONFIG_QNX4FS_FS is not set
@@ -1780,6 +1729,7 @@
 CONFIG_SUN_PARTITION=y
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
+# CONFIG_SYSV68_PARTITION is not set
 
 #
 # Native Language Support
@@ -1847,7 +1797,6 @@
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=15
 CONFIG_DEBUG_BUGVERBOSE=y
 
 #
@@ -1861,6 +1810,7 @@
 #
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ABLKCIPHER=m
 CONFIG_CRYPTO_BLKCIPHER=y
 CONFIG_CRYPTO_HASH=y
 CONFIG_CRYPTO_MANAGER=y
@@ -1879,6 +1829,7 @@
 CONFIG_CRYPTO_CBC=y
 CONFIG_CRYPTO_PCBC=m
 # CONFIG_CRYPTO_LRW is not set
+CONFIG_CRYPTO_CRYPTD=m
 CONFIG_CRYPTO_DES=y
 # CONFIG_CRYPTO_FCRYPT is not set
 CONFIG_CRYPTO_BLOWFISH=m
@@ -1908,6 +1859,7 @@
 CONFIG_BITREVERSE=y
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
+CONFIG_CRC_ITU_T=m
 CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=y
@@ -1919,3 +1871,4 @@
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Ipcop-svn] SF.net SVN: ipcop: [618] ipcop/trunk/config/sparc/inittab

From: <ch...@us...> - 2007-11-01 05:31:04

Revision: 618
          http://ipcop.svn.sourceforge.net/ipcop/?rev=618&view=rev
Author:   chepati
Date:     2007-10-31 22:31:05 -0700 (Wed, 31 Oct 2007)

Log Message:
-----------
Removed unused variable CONFIG_ROOT from sparc inittab

Modified Paths:
--------------
    ipcop/trunk/config/sparc/inittab

Modified: ipcop/trunk/config/sparc/inittab
===================================================================
--- ipcop/trunk/config/sparc/inittab	2007-11-01 04:45:29 UTC (rev 617)
+++ ipcop/trunk/config/sparc/inittab	2007-11-01 05:31:05 UTC (rev 618)
@@ -3,10 +3,10 @@
 #
 id:3:initdefault:
 
-l0:0:wait:CONFIG_ROOT/etc/rc.d/rc.halt halt
-l6:6:wait:CONFIG_ROOT/etc/rc.d/rc.halt reboot
+l0:0:wait:/etc/rc.d/rc.halt halt
+l6:6:wait:/etc/rc.d/rc.halt reboot
 
-si::sysinit:CONFIG_ROOT/etc/rc.d/rc.sysinit
+si::sysinit:/etc/rc.d/rc.sysinit
 
 # Trap CTRL-ALT-DELETE
 ca::ctrlaltdel:/sbin/shutdown -r now


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Ipcop-svn] SF.net SVN: ipcop: [617] ipcop/trunk/config/etc/fstab

From: <ch...@us...> - 2007-11-01 04:45:24

Revision: 617
          http://ipcop.svn.sourceforge.net/ipcop/?rev=617&view=rev
Author:   chepati
Date:     2007-10-31 21:45:29 -0700 (Wed, 31 Oct 2007)

Log Message:
-----------
Just gave the proper fstypes

Modified Paths:
--------------
    ipcop/trunk/config/etc/fstab

Modified: ipcop/trunk/config/etc/fstab
===================================================================
--- ipcop/trunk/config/etc/fstab	2007-11-01 04:42:27 UTC (rev 616)
+++ ipcop/trunk/config/etc/fstab	2007-11-01 04:45:29 UTC (rev 617)
@@ -1,8 +1,8 @@
 #
 # $Id$
 #
-none		/tmp		tmpfs	defaults			0 0
-none		/proc		proc	defaults			0 0
-none		/sys		sysfs	defaults			0 0
-none		/dev		tmpfs	defaults			0 0
-none		/dev/pts	devpts	gid=5,mode=620			0 0
+tmpfs		/tmp		tmpfs	defaults			0 0
+proc		/proc		proc	defaults			0 0
+sysfs		/sys		sysfs	defaults			0 0
+tmpfs		/dev		tmpfs	defaults			0 0
+devpts		/dev/pts	devpts	gid=5,mode=620			0 0


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Ipcop-svn] SF.net SVN: ipcop: [616] ipcop/trunk/config/etc/fstab.squashfs

From: <ch...@us...> - 2007-11-01 04:42:22

Revision: 616
          http://ipcop.svn.sourceforge.net/ipcop/?rev=616&view=rev
Author:   chepati
Date:     2007-10-31 21:42:27 -0700 (Wed, 31 Oct 2007)

Log Message:
-----------
Removed obsolete file

Removed Paths:
-------------
    ipcop/trunk/config/etc/fstab.squashfs

Deleted: ipcop/trunk/config/etc/fstab.squashfs
===================================================================
--- ipcop/trunk/config/etc/fstab.squashfs	2007-11-01 04:36:41 UTC (rev 615)
+++ ipcop/trunk/config/etc/fstab.squashfs	2007-11-01 04:42:27 UTC (rev 616)
@@ -1,11 +0,0 @@
-#
-# $Id$
-#
-none		/		squashfs defaults			1 1
-none		/var		tmpfs	defaults			0 0
-none		/tmp		tmpfs	defaults			0 0
-none		/home/httpd/html/graphs	tmpfs	defaults		0 0
-none		/proc		proc	defaults			0 0
-none		/sys		sysfs	defaults			0 0
-none		/dev		tmpfs	defaults			0 0
-none		/dev/pts	devpts	gid=5,mode=620			0 0


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Ipcop-svn] SF.net SVN: ipcop: [615] ipcop/trunk/lfs/parted

From: <ch...@us...> - 2007-11-01 04:36:37

Revision: 615
          http://ipcop.svn.sourceforge.net/ipcop/?rev=615&view=rev
Author:   chepati
Date:     2007-10-31 21:36:41 -0700 (Wed, 31 Oct 2007)

Log Message:
-----------
Without fs support parted can't create mac labels (and I suspect sun labels won't work either).

Modified Paths:
--------------
    ipcop/trunk/lfs/parted

Modified: ipcop/trunk/lfs/parted
===================================================================
--- ipcop/trunk/lfs/parted	2007-11-01 04:32:53 UTC (rev 614)
+++ ipcop/trunk/lfs/parted	2007-11-01 04:36:41 UTC (rev 615)
@@ -84,7 +84,6 @@
 	cd $(DIR_APP) && ./configure	--prefix=/usr \
 					--without-readline \
 					--disable-nls \
-					--disable-fs \
 					--disable-Werror \
 					--disable-dependency-tracking \
 					--disable-debug \


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Ipcop-svn] SF.net SVN: ipcop: [614] ipcop/trunk/src/nash/mkinitrd

From: <ch...@us...> - 2007-11-01 04:32:48

Revision: 614
          http://ipcop.svn.sourceforge.net/ipcop/?rev=614&view=rev
Author:   chepati
Date:     2007-10-31 21:32:53 -0700 (Wed, 31 Oct 2007)

Log Message:
-----------
Removed two obsolete and non-existent binaries from ipcoprd.img

Modified Paths:
--------------
    ipcop/trunk/src/nash/mkinitrd

Modified: ipcop/trunk/src/nash/mkinitrd
===================================================================
--- ipcop/trunk/src/nash/mkinitrd	2007-11-01 02:27:58 UTC (rev 613)
+++ ipcop/trunk/src/nash/mkinitrd	2007-11-01 04:32:53 UTC (rev 614)
@@ -596,8 +596,6 @@
 
 inst /sbin/nash "$MNTIMAGE/bin/nash"
 inst /sbin/insmod.static "$MNTIMAGE/bin/insmod"
-inst /bin/tar.static "$MNTIMAGE/bin/tar"
-inst /usr/bin/lzmadec "$MNTIMAGE/bin/lzmadec"
 inst /sbin/fsck.minix.static "$MNTIMAGE/bin/fsck.minix"
 ln -s /sbin/nash $MNTIMAGE/sbin/modprobe
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Ipcop-svn] SF.net SVN: ipcop: [613] ipcop/trunk/config/rc.d/rc.sysinit

From: <ch...@us...> - 2007-11-01 02:27:59

Revision: 613
          http://ipcop.svn.sourceforge.net/ipcop/?rev=613&view=rev
Author:   chepati
Date:     2007-10-31 19:27:58 -0700 (Wed, 31 Oct 2007)

Log Message:
-----------
modprobe is in /sbin not /bin

Modified Paths:
--------------
    ipcop/trunk/config/rc.d/rc.sysinit

Modified: ipcop/trunk/config/rc.d/rc.sysinit
===================================================================
--- ipcop/trunk/config/rc.d/rc.sysinit	2007-10-31 13:42:06 UTC (rev 612)
+++ ipcop/trunk/config/rc.d/rc.sysinit	2007-11-01 02:27:58 UTC (rev 613)
@@ -52,13 +52,13 @@
 # Initializing Power Management ACPI first, then APM.
 # APM won't load if ACPI is initialized anyway.
 echo "Initializing Power Management"
-/bin/modprobe ac > /dev/null 2>&1
-/bin/modprobe battery > /dev/null 2>&1
-/bin/modprobe button > /dev/null 2>&1
-/bin/modprobe fan > /dev/null 2>&1
-/bin/modprobe processor > /dev/null 2>&1
-/bin/modprobe thermal > /dev/null 2>&1
-/bin/modprobe apm > /dev/null 2>&1
+/sbin/modprobe ac > /dev/null 2>&1
+/sbin/modprobe battery > /dev/null 2>&1
+/sbin/modprobe button > /dev/null 2>&1
+/sbin/modprobe fan > /dev/null 2>&1
+/sbin/modprobe processor > /dev/null 2>&1
+/sbin/modprobe thermal > /dev/null 2>&1
+/sbin/modprobe apm > /dev/null 2>&1
 
 # Coldplug all devices
 for RC in /etc/hotplug/*.rc;
@@ -69,10 +69,10 @@
 done
 
 echo "Initializing USB storage devices"
-/bin/modprobe usb-storage
+/sbin/modprobe usb-storage
 
 echo "Initializing USB keyboard"
-/bin/modprobe usbhid
+/sbin/modprobe usbhid
 
 STRING="Checking root filesystem"
 /sbin/fsck -R -T -a -C /


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Ipcop-svn] SF.net SVN: ipcop: [612] ipcop/trunk/make.sh

From: <ow...@us...> - 2007-10-31 13:42:02

Revision: 612
          http://ipcop.svn.sourceforge.net/ipcop/?rev=612&view=rev
Author:   owes
Date:     2007-10-31 06:42:06 -0700 (Wed, 31 Oct 2007)

Log Message:
-----------
Found one more spot with CONFIG_ROOT/etc

Modified Paths:
--------------
    ipcop/trunk/make.sh

Modified: ipcop/trunk/make.sh
===================================================================
--- ipcop/trunk/make.sh	2007-10-31 13:36:38 UTC (rev 611)
+++ ipcop/trunk/make.sh	2007-10-31 13:42:06 UTC (rev 612)
@@ -599,11 +599,7 @@
 	mkdir -p $LFS/proc
 	mkdir -p $LFS/usr/src/{cache,config,doc,html,langs,lfs,log_${MACHINE},src,ccache,distcc}
 	mkdir -p $LFS/{$INSTALLER_DIR,usr/local/{ccache,distcc}}
-
-	# Do these now so we can rebind /etc
-	mkdir -p $LFS/$CONFIG_ROOT/etc
 	mkdir -p $LFS/etc
-	mount --bind $LFS/$CONFIG_ROOT/etc $LFS/etc
 
 	# Make all sources and proc available under lfs build
 	mount --bind /dev							$LFS/dev


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Ipcop-svn] SF.net SVN: ipcop: [611] ipcop/trunk/config/rootfiles/common/ipcop

From: <ow...@us...> - 2007-10-31 13:36:34

Revision: 611
          http://ipcop.svn.sourceforge.net/ipcop/?rev=611&view=rev
Author:   owes
Date:     2007-10-31 06:36:38 -0700 (Wed, 31 Oct 2007)

Log Message:
-----------
Will need to include language files for setup to.

Modified Paths:
--------------
    ipcop/trunk/config/rootfiles/common/ipcop

Modified: ipcop/trunk/config/rootfiles/common/ipcop
===================================================================
--- ipcop/trunk/config/rootfiles/common/ipcop	2007-10-31 12:29:06 UTC (rev 610)
+++ ipcop/trunk/config/rootfiles/common/ipcop	2007-10-31 13:36:38 UTC (rev 611)
@@ -1,36 +1,70 @@
+usr/share/locale/af_ZA/LC_MESSAGES/install.mo
 usr/share/locale/af_ZA/LC_MESSAGES/ipcop.mo
+usr/share/locale/bg_BG/LC_MESSAGES/install.mo
 usr/share/locale/bg_BG/LC_MESSAGES/ipcop.mo
+usr/share/locale/ca_ES/LC_MESSAGES/install.mo
 usr/share/locale/ca_ES/LC_MESSAGES/ipcop.mo
+usr/share/locale/cs_CZ/LC_MESSAGES/install.mo
 usr/share/locale/cs_CZ/LC_MESSAGES/ipcop.mo
+usr/share/locale/da_DK/LC_MESSAGES/install.mo
 usr/share/locale/da_DK/LC_MESSAGES/ipcop.mo
+usr/share/locale/de_DE/LC_MESSAGES/install.mo
 usr/share/locale/de_DE/LC_MESSAGES/ipcop.mo
+usr/share/locale/el_GR/LC_MESSAGES/install.mo
 usr/share/locale/el_GR/LC_MESSAGES/ipcop.mo
+usr/share/locale/en_GB/LC_MESSAGES/install.mo
 usr/share/locale/en_GB/LC_MESSAGES/ipcop.mo
+usr/share/locale/es_ES/LC_MESSAGES/install.mo
 usr/share/locale/es_ES/LC_MESSAGES/ipcop.mo
+usr/share/locale/es_UY/LC_MESSAGES/install.mo
 usr/share/locale/es_UY/LC_MESSAGES/ipcop.mo
+usr/share/locale/fa_IR/LC_MESSAGES/install.mo
 usr/share/locale/fa_IR/LC_MESSAGES/ipcop.mo
+usr/share/locale/fi_FI/LC_MESSAGES/install.mo
 usr/share/locale/fi_FI/LC_MESSAGES/ipcop.mo
+usr/share/locale/fr_FR/LC_MESSAGES/install.mo
 usr/share/locale/fr_FR/LC_MESSAGES/ipcop.mo
+usr/share/locale/gu_IN/LC_MESSAGES/install.mo
 usr/share/locale/gu_IN/LC_MESSAGES/ipcop.mo
+usr/share/locale/hu_HU/LC_MESSAGES/install.mo
 usr/share/locale/hu_HU/LC_MESSAGES/ipcop.mo
+usr/share/locale/it_IT/LC_MESSAGES/install.mo
 usr/share/locale/it_IT/LC_MESSAGES/ipcop.mo
+usr/share/locale/ja_JA/LC_MESSAGES/install.mo
 usr/share/locale/ja_JA/LC_MESSAGES/ipcop.mo
+usr/share/locale/lt_LT/LC_MESSAGES/install.mo
 usr/share/locale/lt_LT/LC_MESSAGES/ipcop.mo
+usr/share/locale/nl_NL/LC_MESSAGES/install.mo
 usr/share/locale/nl_NL/LC_MESSAGES/ipcop.mo
+usr/share/locale/no_NO/LC_MESSAGES/install.mo
 usr/share/locale/no_NO/LC_MESSAGES/ipcop.mo
+usr/share/locale/pl_PL/LC_MESSAGES/install.mo
 usr/share/locale/pl_PL/LC_MESSAGES/ipcop.mo
+usr/share/locale/pt_BR/LC_MESSAGES/install.mo
 usr/share/locale/pt_BR/LC_MESSAGES/ipcop.mo
+usr/share/locale/pt_PT/LC_MESSAGES/install.mo
 usr/share/locale/pt_PT/LC_MESSAGES/ipcop.mo
+usr/share/locale/ro_RO/LC_MESSAGES/install.mo
 usr/share/locale/ro_RO/LC_MESSAGES/ipcop.mo
+usr/share/locale/ru_RU/LC_MESSAGES/install.mo
 usr/share/locale/ru_RU/LC_MESSAGES/ipcop.mo
+usr/share/locale/sk_SK/LC_MESSAGES/install.mo
 usr/share/locale/sk_SK/LC_MESSAGES/ipcop.mo
+usr/share/locale/sl_SI/LC_MESSAGES/install.mo
 usr/share/locale/sl_SI/LC_MESSAGES/ipcop.mo
+usr/share/locale/sv_SE/LC_MESSAGES/install.mo
 usr/share/locale/sv_SE/LC_MESSAGES/ipcop.mo
+usr/share/locale/th_TH/LC_MESSAGES/install.mo
 usr/share/locale/th_TH/LC_MESSAGES/ipcop.mo
+usr/share/locale/tr_TR/LC_MESSAGES/install.mo
 usr/share/locale/tr_TR/LC_MESSAGES/ipcop.mo
+usr/share/locale/ur_PK/LC_MESSAGES/install.mo
 usr/share/locale/ur_PK/LC_MESSAGES/ipcop.mo
+usr/share/locale/vi_VN/LC_MESSAGES/install.mo
 usr/share/locale/vi_VN/LC_MESSAGES/ipcop.mo
+usr/share/locale/zh_CN/LC_MESSAGES/install.mo
 usr/share/locale/zh_CN/LC_MESSAGES/ipcop.mo
+usr/share/locale/zh_TW/LC_MESSAGES/install.mo
 usr/share/locale/zh_TW/LC_MESSAGES/ipcop.mo
 #var/ipcop/addon-lang
 var/log/dyndns


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Ipcop-svn] SF.net SVN: ipcop: [610] ipcop/trunk/src/installer

From: <ow...@us...> - 2007-10-31 12:29:02

Revision: 610
          http://ipcop.svn.sourceforge.net/ipcop/?rev=610&view=rev
Author:   owes
Date:     2007-10-31 05:29:06 -0700 (Wed, 31 Oct 2007)

Log Message:
-----------
Move passwords into a seperate submenu, makes the setup mainmenu tighter.

Modified Paths:
--------------
    ipcop/trunk/src/installer/common.h
    ipcop/trunk/src/installer/passwords.c
    ipcop/trunk/src/installer/setup.c

Modified: ipcop/trunk/src/installer/common.h
===================================================================
--- ipcop/trunk/src/installer/common.h	2007-10-31 12:15:25 UTC (rev 609)
+++ ipcop/trunk/src/installer/common.h	2007-10-31 12:29:06 UTC (rev 610)
@@ -133,6 +133,7 @@
 int handledomainname(void);
 int handleisdn(void);
 int handlenetworking(void); 
+int handlepasswords(void); 
 
 /*
   Dialogs for changing passwords. Possible user: "root", "admin", "backup"

Modified: ipcop/trunk/src/installer/passwords.c
===================================================================
--- ipcop/trunk/src/installer/passwords.c	2007-10-31 12:15:25 UTC (rev 609)
+++ ipcop/trunk/src/installer/passwords.c	2007-10-31 12:29:06 UTC (rev 610)
@@ -134,3 +134,46 @@
   
   return 1;
 }
+
+
+/*
+    Open a window with selection of which password to modify    
+*/
+int handlepasswords(void)
+{
+  int rc;
+  int choice;
+  char *menuchoices[4];
+
+  menuchoices[0] = gettext("TR_ROOT_PASSWORD");
+  menuchoices[1] = gettext("TR_ADMIN_PASSWORD");
+  menuchoices[2] = gettext("TR_BACKUP_PASSWORD");
+  
+  menuchoices[3] = NULL;
+
+  for (;;)
+  {
+
+    rc = newtWinMenu(gettext("TR_PASSWORDS"),
+      gettext("TR_SELECT_THE_ITEM"), 50, 5, 5, 11,
+      menuchoices, &choice, gettext("TR_OK"), gettext("TR_QUIT"), NULL);
+
+    if (rc == 2)
+      break;
+
+    switch ( choice )
+    {
+    case 0:
+      password("root");
+      break;
+    case 1:
+      password("admin");
+      break;
+    case 2:
+      password("backup");
+      break;
+    default:
+      break;
+    }
+  }
+}

Modified: ipcop/trunk/src/installer/setup.c
===================================================================
--- ipcop/trunk/src/installer/setup.c	2007-10-31 12:15:25 UTC (rev 609)
+++ ipcop/trunk/src/installer/setup.c	2007-10-31 12:29:06 UTC (rev 610)
@@ -34,6 +34,8 @@
   char *menuchoices[10];
 
 
+//scan_cards();
+//return 0;
   /* check cmd line */
   for(i = 1; i < argc; i++)
   {
@@ -54,16 +56,19 @@
     fstderr = freopen("/dev/tty6", "w+", stderr);
   }
 
+  /* Have to get proper locale here */
+  setlocale(LC_ALL, "");
+  textdomain("install");
+  bindtextdomain("install", "/usr/share/locale");
+
   menuchoices[0] = gettext("TR_KEYBOARD_MAPPING");
   menuchoices[1] = gettext("TR_TIMEZONE");
   menuchoices[2] = gettext("TR_HOSTNAME");
   menuchoices[3] = gettext("TR_DOMAINNAME");
   menuchoices[4] = gettext("TR_ISDN_CONFIGURATION");
   menuchoices[5] = gettext("TR_NETWORKING");
-  menuchoices[6] = gettext("TR_ROOT_PASSWORD");
-  menuchoices[7] = gettext("TR_ADMIN_PASSWORD");
-  menuchoices[8] = gettext("TR_BACKUP_PASSWORD");
-  menuchoices[9] = NULL;
+  menuchoices[6] = gettext("TR_PASSWORDS");
+  menuchoices[7] = NULL;
 
   newtInit();
   newtCls();
@@ -119,14 +124,8 @@
 //        handlenetworking();
         break;
       case 6:
-        password("root");
+        handlepasswords();
         break;
-      case 7:
-        password("admin");
-        break;
-      case 8:
-        password("backup");
-        break;
     
       default:
         break;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

4 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 298 299 300 301 302 .. 325 > >> (Page 300 of 325)

ipcop-svn Mailing List for IPCop Firewall (Page 300)

Linux firewall distribution geared towards home and SOHO users.

ipcop-svn — IPCop Subversion mailing list