MySQL als Paket angelegt.

Grub-install finalisiert.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@897 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/rootfiles/common/initscripts b/config/rootfiles/common/initscripts
index a177b3072ab9b665020950e7135be593df9a25fa..c7eb83182d067ba1fef169c9ff3c51dea0586cf8 100644 (file)
--- a/config/rootfiles/common/initscripts
+++ b/config/rootfiles/common/initscripts
@@ -29,7 +29,7 @@ etc/rc.d/init.d/mISDN
 etc/rc.d/init.d/modules
 etc/rc.d/init.d/mountfs
 etc/rc.d/init.d/mountkernfs
-etc/rc.d/init.d/mysql
+#etc/rc.d/init.d/mysql
 etc/rc.d/init.d/network
 #etc/rc.d/init.d/networking
 etc/rc.d/init.d/networking/any

diff --git a/config/rootfiles/common/linux-atm b/config/rootfiles/common/linux-atm
deleted file mode 100644 (file)
index f27ac20..0000000
--- a/config/rootfiles/common/linux-atm
+++ /dev/null
@@ -1,51 +0,0 @@
-#etc/atmsigd.conf
-#etc/hosts.atm
-usr/bin/aread
-usr/bin/atmdiag
-#usr/bin/atmdump
-#usr/bin/awrite
-#usr/bin/saaldump
-#usr/bin/sonetdiag
-#usr/bin/ttcp_atm
-#usr/include/atm.h
-#usr/include/atmarp.h
-#usr/include/atmarpd.h
-#usr/include/atmd.h
-#usr/include/atmsap.h
-#usr/lib/libatm.a
-#usr/lib/libatm.la
-usr/lib/libatm.so
-usr/lib/libatm.so.1
-usr/lib/libatm.so.1.0.0
-#usr/man/man4/atmsigd.conf.4
-#usr/man/man7/qos.7
-#usr/man/man7/sap.7
-#usr/man/man8/atmaddr.8
-#usr/man/man8/atmarp.8
-#usr/man/man8/atmarpd.8
-#usr/man/man8/atmdiag.8
-#usr/man/man8/atmdump.8
-#usr/man/man8/atmloop.8
-#usr/man/man8/atmsigd.8
-#usr/man/man8/atmtcp.8
-#usr/man/man8/bus.8
-#usr/man/man8/esi.8
-#usr/man/man8/lecs.8
-#usr/man/man8/les.8
-#usr/man/man8/mpcd.8
-#usr/man/man8/zeppelin.8
-#usr/sbin/atmaddr
-usr/sbin/atmarp
-usr/sbin/atmarpd
-usr/sbin/atmloop
-usr/sbin/atmsigd
-usr/sbin/atmtcp
-#usr/sbin/bus
-#usr/sbin/enitune
-#usr/sbin/esi
-#usr/sbin/ilmid
-#usr/sbin/lecs
-#usr/sbin/les
-#usr/sbin/mpcd
-#usr/sbin/zeppelin
-#usr/sbin/zntune

diff --git a/config/rootfiles/common/mysql b/config/rootfiles/common/mysql
index cc4d0870c9c6a702f9fd3b5f2fe6c6bb269f4f24..bbbff7da6491676f12d39e9062625779d324bd98 100644 (file)
--- a/config/rootfiles/common/mysql
+++ b/config/rootfiles/common/mysql
@@ -1,6 +1,6 @@
-etc/my.cnf
+#etc/my.cnf
 #srv/mysql
-srv/mysql/mysql
+#srv/mysql/mysql
 #srv/mysql/mysql-bin.000001
 #srv/mysql/mysql-bin.000002
 #srv/mysql/mysql-bin.index
@@ -55,53 +55,53 @@ srv/mysql/mysql
 #srv/mysql/mysql/user.MYD
 #srv/mysql/mysql/user.MYI
 #srv/mysql/mysql/user.frm
-srv/mysql/test
-usr/bin/comp_err
-usr/bin/innochecksum
-usr/bin/msql2mysql
-usr/bin/my_print_defaults
-usr/bin/myisam_ftdump
-usr/bin/myisamchk
-usr/bin/myisamlog
-usr/bin/myisampack
-usr/bin/mysql
-usr/bin/mysql_client_test
-usr/bin/mysql_config
-usr/bin/mysql_convert_table_format
-usr/bin/mysql_create_system_tables
-usr/bin/mysql_explain_log
-usr/bin/mysql_find_rows
-usr/bin/mysql_fix_extensions
-usr/bin/mysql_fix_privilege_tables
-usr/bin/mysql_install_db
-usr/bin/mysql_secure_installation
-usr/bin/mysql_setpermission
-usr/bin/mysql_tableinfo
-usr/bin/mysql_tzinfo_to_sql
-usr/bin/mysql_upgrade
-usr/bin/mysql_upgrade_shell
-usr/bin/mysql_waitpid
-usr/bin/mysql_zap
-usr/bin/mysqlaccess
-usr/bin/mysqladmin
-usr/bin/mysqlbinlog
-usr/bin/mysqlbug
-usr/bin/mysqlcheck
-usr/bin/mysqld_multi
-usr/bin/mysqld_safe
-usr/bin/mysqldump
-usr/bin/mysqldumpslow
-usr/bin/mysqlhotcopy
-usr/bin/mysqlimport
-usr/bin/mysqlshow
-usr/bin/mysqltest
-usr/bin/mysqltestmanager
-usr/bin/mysqltestmanager-pwgen
-usr/bin/mysqltestmanagerc
-usr/bin/perror
-usr/bin/replace
-usr/bin/resolve_stack_dump
-usr/bin/resolveip
+#srv/mysql/test
+#usr/bin/comp_err
+#usr/bin/innochecksum
+#usr/bin/msql2mysql
+#usr/bin/my_print_defaults
+#usr/bin/myisam_ftdump
+#usr/bin/myisamchk
+#usr/bin/myisamlog
+#usr/bin/myisampack
+#usr/bin/mysql
+#usr/bin/mysql_client_test
+#usr/bin/mysql_config
+#usr/bin/mysql_convert_table_format
+#usr/bin/mysql_create_system_tables
+#usr/bin/mysql_explain_log
+#usr/bin/mysql_find_rows
+#usr/bin/mysql_fix_extensions
+#usr/bin/mysql_fix_privilege_tables
+#usr/bin/mysql_install_db
+#usr/bin/mysql_secure_installation
+#usr/bin/mysql_setpermission
+#usr/bin/mysql_tableinfo
+#usr/bin/mysql_tzinfo_to_sql
+#usr/bin/mysql_upgrade
+#usr/bin/mysql_upgrade_shell
+#usr/bin/mysql_waitpid
+#usr/bin/mysql_zap
+#usr/bin/mysqlaccess
+#usr/bin/mysqladmin
+#usr/bin/mysqlbinlog
+#usr/bin/mysqlbug
+#usr/bin/mysqlcheck
+#usr/bin/mysqld_multi
+#usr/bin/mysqld_safe
+#usr/bin/mysqldump
+#usr/bin/mysqldumpslow
+#usr/bin/mysqlhotcopy
+#usr/bin/mysqlimport
+#usr/bin/mysqlshow
+#usr/bin/mysqltest
+#usr/bin/mysqltestmanager
+#usr/bin/mysqltestmanager-pwgen
+#usr/bin/mysqltestmanagerc
+#usr/bin/perror
+#usr/bin/replace
+#usr/bin/resolve_stack_dump
+#usr/bin/resolveip
 #usr/include/mysql
 #usr/include/mysql/errmsg.h
 #usr/include/mysql/keycache.h
@@ -187,11 +187,11 @@ usr/lib/mysql/libmysqlclient_r.so.15.0.0
 #usr/man/man1/perror.1
 #usr/man/man1/replace.1
 #usr/man/man1/safe_mysqld.1
-usr/sbin/mysqld
-usr/sbin/mysqlmanager
+#usr/sbin/mysqld
+#usr/sbin/mysqlmanager
 #usr/share/mysql
 #usr/share/mysql/binary-configure
-usr/share/mysql/charsets
+#usr/share/mysql/charsets
 #usr/share/mysql/charsets/Index.xml
 #usr/share/mysql/charsets/README
 #usr/share/mysql/charsets/armscii8.xml
@@ -277,4 +277,4 @@ usr/share/mysql/german/errmsg.sys
 #usr/share/mysql/swedish/errmsg.sys
 #usr/share/mysql/ukrainian
 #usr/share/mysql/ukrainian/errmsg.sys
-var/run/mysql
+#var/run/mysql

diff --git a/config/rootfiles/packages/openldap b/config/rootfiles/common/openldap
similarity index 88%
rename from config/rootfiles/packages/openldap
rename to config/rootfiles/common/openldap
index 892039bfc7d2f2e7565e784b02757b74b7fb0964..bb43588b18ea6cebac854cf24cef13a185f5ef4f 100644 (file)
--- a/config/rootfiles/packages/openldap
+++ b/config/rootfiles/common/openldap
@@ -1,36 +1,36 @@
 #etc/openldap
 #etc/openldap/DB_CONFIG.example
-etc/openldap/ldap.conf
+#etc/openldap/ldap.conf
 #etc/openldap/ldap.conf.default
 #etc/openldap/schema
 #etc/openldap/schema/README
-etc/openldap/schema/corba.schema
-etc/openldap/schema/core.ldif
-etc/openldap/schema/core.schema
-etc/openldap/schema/cosine.schema
-etc/openldap/schema/dyngroup.schema
-etc/openldap/schema/inetorgperson.schema
-etc/openldap/schema/java.schema
-etc/openldap/schema/misc.schema
-etc/openldap/schema/nis.schema
-etc/openldap/schema/openldap.ldif
-etc/openldap/schema/openldap.schema
-etc/openldap/schema/ppolicy.schema
-etc/openldap/slapd.conf
+#etc/openldap/schema/corba.schema
+#etc/openldap/schema/core.ldif
+#etc/openldap/schema/core.schema
+#etc/openldap/schema/cosine.schema
+#etc/openldap/schema/dyngroup.schema
+#etc/openldap/schema/inetorgperson.schema
+#etc/openldap/schema/java.schema
+#etc/openldap/schema/misc.schema
+#etc/openldap/schema/nis.schema
+#etc/openldap/schema/openldap.ldif
+#etc/openldap/schema/openldap.schema
+#etc/openldap/schema/ppolicy.schema
+#etc/openldap/slapd.conf
 #etc/openldap/slapd.conf.default
 #srv/ldap
-srv/ldap/openldap-data
-srv/ldap/openldap-data/DB_CONFIG.example
-srv/ldap/openldap-slurp
-srv/ldap/run
-usr/bin/ldapadd
-usr/bin/ldapcompare
-usr/bin/ldapdelete
-usr/bin/ldapmodify
-usr/bin/ldapmodrdn
-usr/bin/ldappasswd
-usr/bin/ldapsearch
-usr/bin/ldapwhoami
+#srv/ldap/openldap-data
+#srv/ldap/openldap-data/DB_CONFIG.example
+#srv/ldap/openldap-slurp
+#srv/ldap/run
+#usr/bin/ldapadd
+#usr/bin/ldapcompare
+#usr/bin/ldapdelete
+#usr/bin/ldapmodify
+#usr/bin/ldapmodrdn
+#usr/bin/ldappasswd
+#usr/bin/ldapsearch
+#usr/bin/ldapwhoami
 #usr/include/lber.h
 #usr/include/lber_types.h
 #usr/include/ldap.h
@@ -253,13 +253,13 @@ usr/lib/libldap_r.so
 #usr/man/man8/slappasswd.8
 #usr/man/man8/slaptest.8
 #usr/man/man8/slurpd.8
-usr/sbin/slapacl
-usr/sbin/slapadd
-usr/sbin/slapauth
-usr/sbin/slapcat
-usr/sbin/slapd
-usr/sbin/slapdn
-usr/sbin/slapindex
-usr/sbin/slappasswd
-usr/sbin/slaptest
-usr/sbin/slurpd
+#usr/sbin/slapacl
+#usr/sbin/slapadd
+#usr/sbin/slapauth
+#usr/sbin/slapcat
+#usr/sbin/slapd
+#usr/sbin/slapdn
+#usr/sbin/slapindex
+#usr/sbin/slappasswd
+#usr/sbin/slaptest
+#usr/sbin/slurpd

diff --git a/config/rootfiles/packages/mysql b/config/rootfiles/packages/mysql
new file mode 100644 (file)
index 0000000..804eafc
--- /dev/null
+++ b/config/rootfiles/packages/mysql
@@ -0,0 +1,281 @@
+etc/my.cnf
+etc/rc.d/init.d/mysql
+#srv/mysql
+srv/mysql/mysql
+#srv/mysql/mysql-bin.000001
+#srv/mysql/mysql-bin.000002
+#srv/mysql/mysql-bin.index
+#srv/mysql/mysql/columns_priv.MYD
+#srv/mysql/mysql/columns_priv.MYI
+#srv/mysql/mysql/columns_priv.frm
+#srv/mysql/mysql/db.MYD
+#srv/mysql/mysql/db.MYI
+#srv/mysql/mysql/db.frm
+#srv/mysql/mysql/func.MYD
+#srv/mysql/mysql/func.MYI
+#srv/mysql/mysql/func.frm
+#srv/mysql/mysql/help_category.MYD
+#srv/mysql/mysql/help_category.MYI
+#srv/mysql/mysql/help_category.frm
+#srv/mysql/mysql/help_keyword.MYD
+#srv/mysql/mysql/help_keyword.MYI
+#srv/mysql/mysql/help_keyword.frm
+#srv/mysql/mysql/help_relation.MYD
+#srv/mysql/mysql/help_relation.MYI
+#srv/mysql/mysql/help_relation.frm
+#srv/mysql/mysql/help_topic.MYD
+#srv/mysql/mysql/help_topic.MYI
+#srv/mysql/mysql/help_topic.frm
+#srv/mysql/mysql/host.MYD
+#srv/mysql/mysql/host.MYI
+#srv/mysql/mysql/host.frm
+#srv/mysql/mysql/proc.MYD
+#srv/mysql/mysql/proc.MYI
+#srv/mysql/mysql/proc.frm
+#srv/mysql/mysql/procs_priv.MYD
+#srv/mysql/mysql/procs_priv.MYI
+#srv/mysql/mysql/procs_priv.frm
+#srv/mysql/mysql/tables_priv.MYD
+#srv/mysql/mysql/tables_priv.MYI
+#srv/mysql/mysql/tables_priv.frm
+#srv/mysql/mysql/time_zone.MYD
+#srv/mysql/mysql/time_zone.MYI
+#srv/mysql/mysql/time_zone.frm
+#srv/mysql/mysql/time_zone_leap_second.MYD
+#srv/mysql/mysql/time_zone_leap_second.MYI
+#srv/mysql/mysql/time_zone_leap_second.frm
+#srv/mysql/mysql/time_zone_name.MYD
+#srv/mysql/mysql/time_zone_name.MYI
+#srv/mysql/mysql/time_zone_name.frm
+#srv/mysql/mysql/time_zone_transition.MYD
+#srv/mysql/mysql/time_zone_transition.MYI
+#srv/mysql/mysql/time_zone_transition.frm
+#srv/mysql/mysql/time_zone_transition_type.MYD
+#srv/mysql/mysql/time_zone_transition_type.MYI
+#srv/mysql/mysql/time_zone_transition_type.frm
+#srv/mysql/mysql/user.MYD
+#srv/mysql/mysql/user.MYI
+#srv/mysql/mysql/user.frm
+srv/mysql/test
+usr/bin/comp_err
+usr/bin/innochecksum
+usr/bin/msql2mysql
+usr/bin/my_print_defaults
+usr/bin/myisam_ftdump
+usr/bin/myisamchk
+usr/bin/myisamlog
+usr/bin/myisampack
+usr/bin/mysql
+usr/bin/mysql_client_test
+usr/bin/mysql_config
+usr/bin/mysql_convert_table_format
+usr/bin/mysql_create_system_tables
+usr/bin/mysql_explain_log
+usr/bin/mysql_find_rows
+usr/bin/mysql_fix_extensions
+usr/bin/mysql_fix_privilege_tables
+usr/bin/mysql_install_db
+usr/bin/mysql_secure_installation
+usr/bin/mysql_setpermission
+usr/bin/mysql_tableinfo
+usr/bin/mysql_tzinfo_to_sql
+usr/bin/mysql_upgrade
+usr/bin/mysql_upgrade_shell
+usr/bin/mysql_waitpid
+usr/bin/mysql_zap
+usr/bin/mysqlaccess
+usr/bin/mysqladmin
+usr/bin/mysqlbinlog
+usr/bin/mysqlbug
+usr/bin/mysqlcheck
+usr/bin/mysqld_multi
+usr/bin/mysqld_safe
+usr/bin/mysqldump
+usr/bin/mysqldumpslow
+usr/bin/mysqlhotcopy
+usr/bin/mysqlimport
+usr/bin/mysqlshow
+usr/bin/mysqltest
+usr/bin/mysqltestmanager
+usr/bin/mysqltestmanager-pwgen
+usr/bin/mysqltestmanagerc
+usr/bin/perror
+usr/bin/replace
+usr/bin/resolve_stack_dump
+usr/bin/resolveip
+#usr/include/mysql
+#usr/include/mysql/errmsg.h
+#usr/include/mysql/keycache.h
+#usr/include/mysql/m_ctype.h
+#usr/include/mysql/m_string.h
+#usr/include/mysql/my_alloc.h
+#usr/include/mysql/my_config.h
+#usr/include/mysql/my_dbug.h
+#usr/include/mysql/my_dir.h
+#usr/include/mysql/my_getopt.h
+#usr/include/mysql/my_global.h
+#usr/include/mysql/my_list.h
+#usr/include/mysql/my_net.h
+#usr/include/mysql/my_no_pthread.h
+#usr/include/mysql/my_pthread.h
+#usr/include/mysql/my_semaphore.h
+#usr/include/mysql/my_sys.h
+#usr/include/mysql/my_xml.h
+#usr/include/mysql/mysql.h
+#usr/include/mysql/mysql_com.h
+#usr/include/mysql/mysql_embed.h
+#usr/include/mysql/mysql_time.h
+#usr/include/mysql/mysql_version.h
+#usr/include/mysql/mysqld_ername.h
+#usr/include/mysql/mysqld_error.h
+#usr/include/mysql/raid.h
+#usr/include/mysql/sql_common.h
+#usr/include/mysql/sql_state.h
+#usr/include/mysql/sslopt-case.h
+#usr/include/mysql/sslopt-longopts.h
+#usr/include/mysql/sslopt-vars.h
+#usr/include/mysql/typelib.h
+#usr/info/mysql.info
+#usr/lib/libmysqlclient.so
+#usr/lib/libmysqlclient.so.15
+#usr/lib/libmysqlclient.so.15.0.0
+#usr/lib/libmysqlclient_r.so
+#usr/lib/libmysqlclient_r.so.15
+#usr/lib/libmysqlclient_r.so.15.0.0
+#usr/lib/mysql
+#usr/lib/mysql/libdbug.a
+#usr/lib/mysql/libheap.a
+#usr/lib/mysql/libmyisam.a
+#usr/lib/mysql/libmyisammrg.a
+#usr/lib/mysql/libmysqlclient.a
+#usr/lib/mysql/libmysqlclient.la
+#usr/lib/mysql/libmysqlclient.so
+#usr/lib/mysql/libmysqlclient.so.15
+#usr/lib/mysql/libmysqlclient.so.15.0.0
+#usr/lib/mysql/libmysqlclient_r.a
+#usr/lib/mysql/libmysqlclient_r.la
+#usr/lib/mysql/libmysqlclient_r.so
+#usr/lib/mysql/libmysqlclient_r.so.15
+#usr/lib/mysql/libmysqlclient_r.so.15.0.0
+#usr/lib/mysql/libmystrings.a
+#usr/lib/mysql/libmysys.a
+#usr/lib/mysql/libvio.a
+#usr/man/man1/msql2mysql.1
+#usr/man/man1/myisam_ftdump.1
+#usr/man/man1/myisamchk.1
+#usr/man/man1/myisamlog.1
+#usr/man/man1/myisampack.1
+#usr/man/man1/mysql.1
+#usr/man/man1/mysql.server.1
+#usr/man/man1/mysql_config.1
+#usr/man/man1/mysql_explain_log.1
+#usr/man/man1/mysql_fix_privilege_tables.1
+#usr/man/man1/mysql_upgrade.1
+#usr/man/man1/mysql_zap.1
+#usr/man/man1/mysqlaccess.1
+#usr/man/man1/mysqladmin.1
+#usr/man/man1/mysqlbinlog.1
+#usr/man/man1/mysqlcheck.1
+#usr/man/man1/mysqld.1
+#usr/man/man1/mysqld_multi.1
+#usr/man/man1/mysqld_safe.1
+#usr/man/man1/mysqldump.1
+#usr/man/man1/mysqlhotcopy.1
+#usr/man/man1/mysqlimport.1
+#usr/man/man1/mysqlman.1
+#usr/man/man1/mysqlmanager.1
+#usr/man/man1/mysqlshow.1
+#usr/man/man1/perror.1
+#usr/man/man1/replace.1
+#usr/man/man1/safe_mysqld.1
+usr/sbin/mysqld
+usr/sbin/mysqlmanager
+#usr/share/mysql
+#usr/share/mysql/binary-configure
+usr/share/mysql/charsets
+#usr/share/mysql/charsets/Index.xml
+#usr/share/mysql/charsets/README
+#usr/share/mysql/charsets/armscii8.xml
+#usr/share/mysql/charsets/ascii.xml
+#usr/share/mysql/charsets/cp1250.xml
+#usr/share/mysql/charsets/cp1251.xml
+#usr/share/mysql/charsets/cp1256.xml
+#usr/share/mysql/charsets/cp1257.xml
+#usr/share/mysql/charsets/cp850.xml
+#usr/share/mysql/charsets/cp852.xml
+#usr/share/mysql/charsets/cp866.xml
+#usr/share/mysql/charsets/dec8.xml
+#usr/share/mysql/charsets/geostd8.xml
+#usr/share/mysql/charsets/greek.xml
+#usr/share/mysql/charsets/hebrew.xml
+#usr/share/mysql/charsets/hp8.xml
+#usr/share/mysql/charsets/keybcs2.xml
+#usr/share/mysql/charsets/koi8r.xml
+#usr/share/mysql/charsets/koi8u.xml
+#usr/share/mysql/charsets/latin1.xml
+#usr/share/mysql/charsets/latin2.xml
+#usr/share/mysql/charsets/latin5.xml
+#usr/share/mysql/charsets/latin7.xml
+#usr/share/mysql/charsets/macce.xml
+#usr/share/mysql/charsets/macroman.xml
+#usr/share/mysql/charsets/swe7.xml
+#usr/share/mysql/czech
+#usr/share/mysql/czech/errmsg.sys
+#usr/share/mysql/danish
+#usr/share/mysql/danish/errmsg.sys
+#usr/share/mysql/dutch
+#usr/share/mysql/dutch/errmsg.sys
+#usr/share/mysql/english
+usr/share/mysql/english/errmsg.sys
+usr/share/mysql/errmsg.txt
+#usr/share/mysql/estonian
+#usr/share/mysql/estonian/errmsg.sys
+#usr/share/mysql/fill_help_tables.sql
+#usr/share/mysql/french
+#usr/share/mysql/french/errmsg.sys
+#usr/share/mysql/german
+usr/share/mysql/german/errmsg.sys
+#usr/share/mysql/greek
+#usr/share/mysql/greek/errmsg.sys
+#usr/share/mysql/hungarian
+#usr/share/mysql/hungarian/errmsg.sys
+#usr/share/mysql/italian
+#usr/share/mysql/italian/errmsg.sys
+#usr/share/mysql/japanese
+#usr/share/mysql/japanese/errmsg.sys
+#usr/share/mysql/korean
+#usr/share/mysql/korean/errmsg.sys
+#usr/share/mysql/mi_test_all
+#usr/share/mysql/mi_test_all.res
+#usr/share/mysql/my-huge.cnf
+#usr/share/mysql/my-innodb-heavy-4G.cnf
+#usr/share/mysql/my-large.cnf
+#usr/share/mysql/my-medium.cnf
+#usr/share/mysql/my-small.cnf
+#usr/share/mysql/mysql-log-rotate
+#usr/share/mysql/mysql.server
+#usr/share/mysql/mysql_fix_privilege_tables.sql
+#usr/share/mysql/ndb-config-2-node.ini
+#usr/share/mysql/norwegian
+#usr/share/mysql/norwegian-ny
+#usr/share/mysql/norwegian-ny/errmsg.sys
+#usr/share/mysql/norwegian/errmsg.sys
+#usr/share/mysql/polish
+#usr/share/mysql/polish/errmsg.sys
+#usr/share/mysql/portuguese
+#usr/share/mysql/portuguese/errmsg.sys
+#usr/share/mysql/romanian
+#usr/share/mysql/romanian/errmsg.sys
+#usr/share/mysql/russian
+#usr/share/mysql/russian/errmsg.sys
+#usr/share/mysql/serbian
+#usr/share/mysql/serbian/errmsg.sys
+#usr/share/mysql/slovak
+#usr/share/mysql/slovak/errmsg.sys
+#usr/share/mysql/spanish
+#usr/share/mysql/spanish/errmsg.sys
+#usr/share/mysql/swedish
+#usr/share/mysql/swedish/errmsg.sys
+#usr/share/mysql/ukrainian
+#usr/share/mysql/ukrainian/errmsg.sys
+var/run/mysql

diff --git a/lfs/cyrusimap b/lfs/cyrusimap
index a05911fbf088c06f828c9a75cf7eeb506887f092..bd95745c87a99d1f85dc4a2443dd77be73531f9f 100644 (file)
--- a/lfs/cyrusimap
+++ b/lfs/cyrusimap
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = cyrusimap
 PAK_VER    = 1
 
-DEPS       = "cyrus-sasl"
+DEPS       = "cyrus-sasl mysql"
 
 ###############################################################################
 # Top-level Rules

diff --git a/lfs/linux-atm b/lfs/linux-atm
deleted file mode 100644 (file)
index ca53fe6..0000000
--- a/lfs/linux-atm
+++ /dev/null
@@ -1,78 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 2.4.1
-
-THISAPP    = linux-atm-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 84fef49cc39ff2605204246666f65864
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-###############################################################################
-# Downloading, checking, md5sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-       @$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-       @$(LOAD)
-
-$(subst %,%_MD5,$(objects)) :
-       @$(MD5)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-       @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-atm-2.4.1-gcc-4.patch
-       cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc --disable-nls
-       cd $(DIR_APP) && make
-       cd $(DIR_APP) && make install
-       @rm -rf $(DIR_APP)
-       @$(POSTBUILD)

diff --git a/lfs/postfix b/lfs/postfix
index 1638709d2f1f9ca387eef4b7b68595dcdb77eb1e..7c3fb135076fe7d1275a5bd33b5c4f52a426c9f7 100644 (file)
--- a/lfs/postfix
+++ b/lfs/postfix
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = postfix
 PAK_VER    = 1
 
-DEPS       = "amavisd"
+DEPS       = "amavisd mysql"
 
 ###############################################################################
 # Top-level Rules

diff --git a/lfs/samba b/lfs/samba
index 2a338f254f4acc54bd54fd9db11181527a08360e..29584de460fc045e099bc812b9edc5e495709e02 100644 (file)
--- a/lfs/samba
+++ b/lfs/samba
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = samba
 PAK_VER    = 1
 
-DEPS       = "cups openldap cyrus-sasl"
+DEPS       = "cups cyrus-sasl"
 
 ###############################################################################
 # Top-level Rules

diff --git a/make.sh b/make.sh
index cbae806fca1ec5395d6b6bef53bfb248c7b1d8c0..332444ad8c9209987930bcec6825700a30df763e 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -24,7 +24,7 @@
 
 NAME="IPFire"                                                                          # Software name
 SNAME="ipfire"                                                                 # Short name
-VERSION="2.0beta1"                                                     # Version number
+VERSION="2.0beta2"                                                     # Version number
 SLOGAN="www.ipfire.org"                                        # Software slogan
 CONFIG_ROOT=/var/ipfire                                        # Configuration rootdir
 NICE=10                                                                                                        # Nice level
@@ -322,7 +322,6 @@ buildipfire() {
   ipfiremake dhcpcd
   ipfiremake libusb
   ipfiremake libpcap
-  ipfiremake linux-atm
   ipfiremake ppp
   ipfiremake rp-pppoe
   ipfiremake unzip

diff --git a/src/install+setup/install/grubbatch b/src/install+setup/install/grubbatch
deleted file mode 100644 (file)
index 0235877..0000000
--- a/src/install+setup/install/grubbatch
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-/bin/cp -f /usr/lib/grub/i386-pc/* /boot/grub
-/usr/sbin/grub --no-floppy --batch <<EOT > /tmp/grub-install 2>&1
-device (hd0) DEVICE
-root (hd0,0)
-setup (hd0,0)
-setup (hd0)
-quit
-EOT

diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index e0433c461a932a6efa0b5093ce21a2627ca52745..83b1d4caf0fe55821277969f62aba0d5c1705d7b 100644 (file)
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -509,10 +509,9 @@ int main(int argc, char *argv[])
 
        sprintf(string, "root=%s3", hdparams.devnode_part_run);
        replace( "/harddisk/boot/grub/grub.conf", "root=ROOT", string);
-       replace( "/harddisk/boot/grub/grubbatch", "DEVICE", hdparams.devnode_disk);
+       mysystem("ln -s grub.conf /harddisk/boot/grub/menu.lst");
 
-       /* restore permissions */
-       chmod("/harddisk/boot/grub/grubbatch", S_IXUSR | S_IRUSR | S_IXGRP | S_IRGRP | S_IXOTH | S_IROTH);
+       system("sed -e 's#harddisk\\/##g' < /proc/mounts > /harddisk/etc/mtab");
 
        snprintf(commandstring, STRING_SIZE, 
                 "/sbin/chroot /harddisk /usr/sbin/grub-install --no-floppy %s", hdparams.devnode_disk);
@@ -520,8 +519,6 @@ int main(int argc, char *argv[])
                errorbox(ctr[TR_UNABLE_TO_INSTALL_GRUB]);
                goto EXIT;
        }
-
-       mysystem("ln -s grub.conf /harddisk/boot/grub/menu.lst");
        
        mysystem("umount /cdrom");
        snprintf(commandstring, STRING_SIZE, "eject /dev/%s", sourcedrive);

diff --git a/src/install+setup/install/probehw.sh b/src/install+setup/install/probehw.sh
index af301ab1386981a460e62a8a611212f75afcfdba..0872d25fefe54e6cb7c5828c96b0df09001a1ce0 100644 (file)
--- a/src/install+setup/install/probehw.sh
+++ b/src/install+setup/install/probehw.sh
@@ -26,8 +26,9 @@ for MODULE in $(kudzu -qps  -t 30 | grep driver: | cut -d ' ' -f 2 | sort | uniq
                                [ "${MODULE}" = "" ]; then
         continue
                fi
-               MODULE=$(basename $(find /lib/modules -name $(echo $MODULE | sed -e 's/[_-]/*/g')* ) | cut -d. -f1 | head -1 2>/dev/null)
+               MODULE=$(find /lib/modules -name $(echo $MODULE | sed -e 's/[_-]/*/g')* 2>/dev/null)
     [ "${MODULE}" == "" ] && continue
+    MODULE=$(basename $MODULE | cut -d. -f1 | head -1)
     
                if grep -Eqe "^${MODULE} " /proc/modules; then
                        continue

diff --git a/src/pakfire/pakfire.conf b/src/pakfire/pakfire.conf
index 44e54387a9e79075fdc80a947c77f4f751c870ee..68380eeb76d87e54306dbc15c49f67ce0340740b 100644 (file)
--- a/src/pakfire/pakfire.conf
+++ b/src/pakfire/pakfire.conf
@@ -21,7 +21,7 @@
 
 package Conf;
 
-$version = "2.0beta1";
+$version = "2.0beta2";
 
 $mainserver = "pakfire.ipfire.org";