Merge remote branch 'origin/master' into dracut

Conflicts:
	lfs/dracut

diff --git a/config/rootfiles/common/cpio b/config/rootfiles/common/cpio
index 3f201c03e8d2017482035dc61cc4346657c0af99..53bb1e0aa2bba46f04596d5da2c711d6e809bda6 100644 (file)
--- a/config/rootfiles/common/cpio
+++ b/config/rootfiles/common/cpio
@@ -1,14 +1,19 @@
 bin/cpio
 bin/mt
-#usr/info/cpio.info
-#usr/man/man1/cpio.1
-#usr/man/man1/mt.1
+#usr/share/info/cpio.info
 #usr/share/locale/da/LC_MESSAGES/cpio.mo
 #usr/share/locale/de/LC_MESSAGES/cpio.mo
 #usr/share/locale/es/LC_MESSAGES/cpio.mo
+#usr/share/locale/fi/LC_MESSAGES/cpio.mo
 #usr/share/locale/fr/LC_MESSAGES/cpio.mo
+#usr/share/locale/ga
+#usr/share/locale/ga/LC_MESSAGES
+#usr/share/locale/ga/LC_MESSAGES/cpio.mo
 #usr/share/locale/gl/LC_MESSAGES/cpio.mo
 #usr/share/locale/hu/LC_MESSAGES/cpio.mo
+#usr/share/locale/id
+#usr/share/locale/id/LC_MESSAGES
+#usr/share/locale/id/LC_MESSAGES/cpio.mo
 #usr/share/locale/ko/LC_MESSAGES/cpio.mo
 #usr/share/locale/nl/LC_MESSAGES/cpio.mo
 #usr/share/locale/pl/LC_MESSAGES/cpio.mo
@@ -17,4 +22,11 @@ bin/mt
 #usr/share/locale/ru/LC_MESSAGES/cpio.mo
 #usr/share/locale/sv/LC_MESSAGES/cpio.mo
 #usr/share/locale/tr/LC_MESSAGES/cpio.mo
+#usr/share/locale/uk/LC_MESSAGES/cpio.mo
+#usr/share/locale/vi
+#usr/share/locale/vi/LC_MESSAGES
+#usr/share/locale/vi/LC_MESSAGES/cpio.mo
 #usr/share/locale/zh_CN/LC_MESSAGES/cpio.mo
+#usr/share/locale/zh_TW/LC_MESSAGES/cpio.mo
+#usr/share/man/man1/cpio.1
+#usr/share/man/man1/mt.1

diff --git a/config/rootfiles/core/40/filelists/compat-wireless b/config/rootfiles/core/40/filelists/compat-wireless
new file mode 100644 (file)
index 0000000..ab7affd
--- /dev/null
+++ b/config/rootfiles/core/40/filelists/compat-wireless
@@ -0,0 +1,206 @@
+lib/modules/2.6.32.15-ipfire/kernel/compat/compat.ko
+lib/modules/2.6.32.15-ipfire/kernel/compat/compat_firmware_class.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/ath3k.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/bcm203x.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/bfusb.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/bluecard_cs.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/bpa10x.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/bt3c_cs.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/btmrvl.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/btmrvl_sdio.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/btsdio.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/btuart_cs.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/btusb.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/dtl1_cs.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/hci_uart.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/hci_vhci.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/misc/eeprom/eeprom_93cx6.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/atl1c/atl1c.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/atl1e/atl1e.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/atlx/atl1.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/atlx/atl2.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/b44.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/asix.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/catc.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/cdc-phonet.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/cdc_eem.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/cdc_ether.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/cdc_subset.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/dm9601.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/gl620a.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/hso.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/int51x1.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/kaweth.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/mcs7830.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/net1080.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/pegasus.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/plusb.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/rndis_host.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/rtl8150.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/smsc95xx.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/usbnet.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/zaurus.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/adm8211.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/at76c50x-usb.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/ath/ar9170/ar9170usb.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/ath/ath.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/ath/ath5k/ath5k.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/ath/ath9k/ath9k.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/ath/ath9k/ath9k_common.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/ath/ath9k/ath9k_hw.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/b43/b43.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/b43legacy/b43legacy.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/ipw2x00/ipw2100.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/ipw2x00/ipw2200.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/ipw2x00/libipw.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/iwlwifi/iwl3945.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/iwlwifi/iwlagn.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/iwlwifi/iwlcore.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/iwmc3200wifi/iwmc3200wifi.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/libertas/libertas.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/libertas/libertas_cs.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/libertas/libertas_sdio.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/libertas/usb8xxx.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/libertas_tf/libertas_tf.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/mac80211_hwsim.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/mwl8k.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/p54/p54common.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/p54/p54pci.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/p54/p54usb.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rndis_wlan.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rt2x00/rt2400pci.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rt2x00/rt2500pci.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rt2x00/rt2500usb.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rt2x00/rt2800lib.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rt2x00/rt2800pci.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rt2x00/rt2800usb.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rt2x00/rt2x00lib.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rt2x00/rt2x00pci.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rt2x00/rt2x00usb.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rt2x00/rt61pci.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rt2x00/rt73usb.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rtl818x/rtl8180.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rtl818x/rtl8187.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/wl12xx/wl1251.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/wl12xx/wl1251_sdio.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/wl12xx/wl1271.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/zd1211rw/zd1211rw.ko
+lib/modules/2.6.32.15-ipfire/kernel/drivers/ssb/ssb.ko
+lib/modules/2.6.32.15-ipfire/kernel/net/bluetooth/bluetooth.ko
+lib/modules/2.6.32.15-ipfire/kernel/net/bluetooth/bnep/bnep.ko
+lib/modules/2.6.32.15-ipfire/kernel/net/bluetooth/cmtp/cmtp.ko
+lib/modules/2.6.32.15-ipfire/kernel/net/bluetooth/hidp/hidp.ko
+lib/modules/2.6.32.15-ipfire/kernel/net/bluetooth/l2cap.ko
+lib/modules/2.6.32.15-ipfire/kernel/net/bluetooth/rfcomm/rfcomm.ko
+lib/modules/2.6.32.15-ipfire/kernel/net/bluetooth/sco.ko
+lib/modules/2.6.32.15-ipfire/kernel/net/mac80211/mac80211.ko
+lib/modules/2.6.32.15-ipfire/kernel/net/wireless/cfg80211.ko
+lib/modules/2.6.32.15-ipfire/kernel/net/wireless/lib80211.ko
+lib/modules/2.6.32.15-ipfire/kernel/net/wireless/lib80211_crypt_ccmp.ko
+lib/modules/2.6.32.15-ipfire/kernel/net/wireless/lib80211_crypt_tkip.ko
+lib/modules/2.6.32.15-ipfire/kernel/net/wireless/lib80211_crypt_wep.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/compat/compat.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/compat/compat_firmware_class.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/ath3k.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/bcm203x.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/bfusb.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/bluecard_cs.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/bpa10x.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/bt3c_cs.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/btmrvl.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/btmrvl_sdio.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/btsdio.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/btuart_cs.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/btusb.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/dtl1_cs.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/hci_uart.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/hci_vhci.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/misc/eeprom/eeprom_93cx6.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/atl1c/atl1c.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/atl1e/atl1e.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/atlx/atl1.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/atlx/atl2.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/b44.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/asix.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/catc.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/cdc-phonet.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/cdc_eem.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/cdc_ether.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/cdc_subset.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/dm9601.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/gl620a.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/hso.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/int51x1.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/kaweth.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/mcs7830.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/net1080.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/pegasus.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/plusb.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/rndis_host.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/rtl8150.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/smsc95xx.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/usbnet.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/zaurus.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/adm8211.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/at76c50x-usb.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/ath/ar9170/ar9170usb.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/ath/ath.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/ath/ath5k/ath5k.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k/ath9k.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k/ath9k_common.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k/ath9k_hw.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/b43/b43.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/b43legacy/b43legacy.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/ipw2x00/ipw2100.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/ipw2x00/ipw2200.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/ipw2x00/libipw.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/iwlwifi/iwl3945.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/iwlwifi/iwlagn.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/iwlwifi/iwlcore.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/iwmc3200wifi/iwmc3200wifi.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/libertas/libertas.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/libertas/libertas_cs.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/libertas/libertas_sdio.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/libertas/usb8xxx.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/libertas_tf/libertas_tf.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/mac80211_hwsim.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/mwl8k.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/p54/p54common.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/p54/p54pci.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/p54/p54usb.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rndis_wlan.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2400pci.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2500pci.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2500usb.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2800lib.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2800pci.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2800usb.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2x00lib.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2x00pci.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2x00usb.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt61pci.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt73usb.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rtl818x/rtl8180.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rtl818x/rtl8187.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/wl12xx/wl1251.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/wl12xx/wl1251_sdio.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/wl12xx/wl1271.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/zd1211rw/zd1211rw.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/ssb/ssb.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/net/bluetooth/bluetooth.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/net/bluetooth/bnep/bnep.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/net/bluetooth/cmtp/cmtp.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/net/bluetooth/hidp/hidp.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/net/bluetooth/l2cap.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/net/bluetooth/rfcomm/rfcomm.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/net/bluetooth/sco.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/net/mac80211/mac80211.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/net/wireless/cfg80211.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/net/wireless/lib80211.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/net/wireless/lib80211_crypt_ccmp.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/net/wireless/lib80211_crypt_tkip.ko
+lib/modules/2.6.32.15-ipfire-xen/kernel/net/wireless/lib80211_crypt_wep.ko
+etc/udev/rules.d/50-compat_firmware.rules
+lib/udev/compat_firmware.sh

diff --git a/config/rootfiles/core/40/filelists/files b/config/rootfiles/core/40/filelists/files
index 0037af183326a74f3cbb5f65b2cf4c007eea7bed..372279582c66384bc815059235ef0dc30a250627 100644 (file)
--- a/config/rootfiles/core/40/filelists/files
+++ b/config/rootfiles/core/40/filelists/files
@@ -1 +1,8 @@
 etc/system-release
+var/ipfire/langs/en.pl
+var/ipfire/langs/de.pl
+var/ipfire/langs/es.pl
+var/ipfire/langs/fr.pl
+var/ipfire/dhcp/dhcpd.conf.local
+etc/rc.d/init.d/functions
+srv/web/ipfire/cgi-bin/time.cgi

diff --git a/config/rootfiles/core/40/filelists/mkinitcpio b/config/rootfiles/core/40/filelists/mkinitcpio
new file mode 120000 (symlink)
index 0000000..f9b3fde
--- /dev/null
+++ b/config/rootfiles/core/40/filelists/mkinitcpio
@@ -0,0 +1 @@
+../../../common/mkinitcpio
\ No newline at end of file

diff --git a/config/rootfiles/core/40/update.sh b/config/rootfiles/core/40/update.sh
index 91ef18084c0b779c9e5c53cfef1bf4ec761e0f7e..6d76f580d6a51587bef80fd18c6fc3d3a07a18b2 100644 (file)
--- a/config/rootfiles/core/40/update.sh
+++ b/config/rootfiles/core/40/update.sh
@@ -35,8 +35,12 @@ extract_files
 
 #
 #Update Language cache
-#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 
+#
+#Rebuild module dep's
+depmod 2.6.32.15-ipfire
+depmod 2.6.32.15-ipfire-xen
 #
 #Finish
 #Don't report the exitcode last command

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 70e3b96f00a5f028d6c26d7028a74d5fc88c0146..cd0c850fa30250749cf7d8448fe723b8f7c75433 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -68,11 +68,10 @@
 * clamav-0.96.1
 * cmake-2.4.8
 * collectd-4.9.1
-* compat-wireless-2.6.34-kmod-2.6.32.15-ipfire
-* compat-wireless-2.6.34-kmod-2.6.32.15-ipfire-xen
+* compat-wireless-2.6.34.1-kmod-2.6.32.15-ipfire
+* compat-wireless-2.6.34.1-kmod-2.6.32.15-ipfire-xen
 * coreutils-5.96
 * cpio-2.11
-* cpio-2.6
 * cpufrequtils-007
 * cryptodev-20091126-kmod-2.6.32.15-ipfire
 * cryptodev-20091126-kmod-2.6.32.15-ipfire-xen
@@ -91,8 +90,6 @@
 * diffutils-2.8.1
 * dnsmasq-2.45
 * dosfstools-3.0.9
-* dracut-006
-* dracut-006.save
 * e1000-8.0.19-kmod-2.6.32.15-ipfire
 * e1000-8.0.19-kmod-2.6.32.15-ipfire-xen
 * e1000e-1.1.19-kmod-2.6.32.15-ipfire
@@ -153,7 +150,6 @@
 * iftop-0.17
 * igmpproxy-0.1
 * inetutils-1.4.2
-* initrd_off
 * ipaddr-1.2
 * iperf-2.0.4
 * ipfireseeder-1.00
@@ -169,7 +165,6 @@
 * klibc-1.5.14
 * kqemu-1.4.0pre1-kmod-2.6.32.15-ipfire
 * kqemu-1.4.0pre1-kmod-2.6.32.15-ipfire-xen
-* kqemu-1.4.0pre1-kmod-2.6.32.16-ipfire
 * kudzu-1.2.64
 * kvm-kmod-2.6.33.1-kmod-2.6.32.15-ipfire
 * l7-protocols-2009-05-10
@@ -191,7 +186,6 @@
 * libogg-1.1.4
 * liboping-1.3.4
 * libpcap-1.0.0
-* libpng-1.2.12
 * libpng-1.2.44
 * libpri-1.4.10.2
 * libsafe_2.0-16
@@ -226,7 +220,6 @@
 * man-db-2.4.3
 * man-pages-2.34
 * mbr-1.1.8
-* mc-4.7.0
 * mc-4.7.3
 * mdadm-3.1.1
 * mechanize-0.1.8
@@ -258,7 +251,6 @@
 * netcat-0.7.1
 * netpbm-10.26.46
 * newt-0.51.6
-* nfs-utils-1.1.1
 * nfs-utils-1.2.2
 * nmap-5.20
 * noip_updater_v1.6
@@ -267,7 +259,6 @@
 * nut-2.4.3
 * ocaml-3.09.2
 * oinkmaster-2.0
-* open-vm-tools-2009.05.22-167859
 * open-vm-tools-8.4.2-261024
 * openldap-2.3.20
 * openmailadmin-1.0.0
@@ -288,7 +279,6 @@
 * popt-1.10.4
 * portmap_6.0
 * postfix-2.6.5
-* ppp-2.4.4
 * ppp-2.4.5
 * pptp-1.7.2
 * procps-3.2.6
@@ -304,7 +294,6 @@
 * readline-5.1
 * reiser4progs-1.0.6
 * reiserfsprogs-3.6.21
-* rp-pppoe-3.8
 * rrdtool-1.2.30
 * rssdler-0.4.0a
 * rsync-3.0.7
@@ -345,7 +334,6 @@
 * teamspeak-2.0.24.1
 * texinfo-4.8
 * tftp-hpa-0.48
-* tiff-3.8.2
 * tiff-3.9.4
 * traceroute-2.0.12
 * tripwire-2.4.1.2
@@ -360,7 +348,6 @@
 * v4l-dvb-b576509ea6d2-kmod-2.6.32.15-ipfire
 * v4l-dvb-b576509ea6d2-kmod-2.6.32.15-ipfire-xen
 * vdr-1.6.0
-* vdradmin-am-3.6.5
 * vdradmin-am-3.6.7
 * vim-7.0
 * vlan.1.9
@@ -369,7 +356,6 @@
 * vnstati-beta3
 * vsftpd-2.1.2
 * w_scan-20080105
-* watchdog-5.6
 * watchdog-5.9
 * wget-1.10.2
 * whatmask-1.2

diff --git a/html/cgi-bin/time.cgi b/html/cgi-bin/time.cgi
index fb69aa39e44af4f67e4903bdb9ca01af777304b0..c68eb999fdef389170db1d10bde7927a575ec636 100644 (file)
--- a/html/cgi-bin/time.cgi
+++ b/html/cgi-bin/time.cgi
@@ -236,6 +236,10 @@ print "<form method='post' action='$ENV{'SCRIPT_NAME'}'>\n";
 &Header::openbox('100%', 'left', $Lang::tr{'network time'});
 print <<END
 <table width='100%'>
+<tr>
+       <td colspan='2'><strong>$Lang::tr{'ntp common settings'}</strong></td>
+</tr>
+
 <tr>
        <td><input type='checkbox' name='ENABLENTP' $checked{'ENABLENTP'}{'on'} /></td>
        <td width='100%' colspan='4' class='base'>$Lang::tr{'network time from'}</td>
@@ -272,22 +276,19 @@ print <<END
        <td>&nbsp;</td>
        <td class='base' colspan='4'><input type='checkbox' name='ENABLECLNTP' $checked{'ENABLECLNTP'}{'on'} /> $Lang::tr{'clenabled'}</td>
 </tr>
-</table>
-<table width='100%'>
-<tr>
-       <td colspan='4'><hr /><b>$Lang::tr{'update time'}</b></td>
-</tr>
 <tr>
        <td>&nbsp;</td>
-       <td class='base' colspan='3'>$Lang::tr{'set time now help'}</td>
+       <td class='base' colspan='4'><input type='checkbox' name='ENABLESETONBOOT' $checked{'ENABLESETONBOOT'}{'on'} /> $Lang::tr{'Set time on boot'}</td>
 </tr>
+</table>
+<table width='100%'>
 <tr>
-       <td class='base' colspan='4'><input type='checkbox' name='ENABLESETONBOOT' $checked{'ENABLESETONBOOT'}{'on'} /> $Lang::tr{'Set time on boot'}</td>
+       <td colspan='4'><hr /><strong>$Lang::tr{'ntp sync'}</strong></td>
 </tr>
 <tr>
        <td class='base'><input type='radio' name='UPDATE_METHOD' value='periodically' $checked{'UPDATE_METHOD'}{'periodically'} /></td>
-       <td width='15%'>$Lang::tr{'every'}: </td>
-       <td width='35%'><input type='text' name='UPDATE_VALUE' size='3' maxlength='3' value='$timesettings{'UPDATE_VALUE'}' />
+       <td width='10%'>$Lang::tr{'every'}</td>
+       <td width='45%'><input type='text' name='UPDATE_VALUE' size='3' maxlength='3' value='$timesettings{'UPDATE_VALUE'}' />
        <select name='UPDATE_PERIOD'>
                <option value='hourly' $selected{'UPDATE_PERIOD'}{'hourly'}>$Lang::tr{'hours'}</option>
                <option value='daily' $selected{'UPDATE_PERIOD'}{'daily'}>$Lang::tr{'days'}</option>
@@ -300,6 +301,13 @@ print <<END
        <td class='base'><input type='radio' name='UPDATE_METHOD' value='manually' $checked{'UPDATE_METHOD'}{'manually'} /></td>
        <td colspan='2'>$Lang::tr{'manually'}</td>
 </tr>
+<tr>
+       <td colspan='4'><hr /><strong>$Lang::tr{'update time'}</strong></td>
+</tr>
+<tr>
+       <td>&nbsp;</td>
+       <td class='base' colspan='3'>$Lang::tr{'set time now help'}</td>
+</tr>
 END
 ;
 

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 479bd35e767c7027beb3227a1608d3e5c32a6639..0394315e4a4d212f1ee3b1d5290aeff2e3c66eb4 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -761,7 +761,7 @@
 'esp integrity' => 'ESP Integrität:',
 'esp keylife' => 'Lebensdauer des ESP Schlüssels:',
 'esp keylife should be between 1 and 24 hours' => 'ESP Schlüssel-Lebensdauer sollte zwischen 1 und 24 Stunden betragen.',
-'every' => 'Jeden',
+'every' => 'Alle',
 'exampel' => 'Beispiel',
 'exclude logfiles' => 'ohne Logdateien',
 'excluding buffers and cache' => '-/+ Puffer/Zwischenspeicher',
@@ -1227,6 +1227,8 @@
 'not running' => 'nicht gestartet',
 'not set' => 'nicht gesetzt',
 'november' => 'November',
+'ntp common settings' => 'Allgemeine Einstellungen',
+'ntp sync' => 'Synchronisation',
 'ntp configuration' => 'NTP-Konfiguration',
 'ntp must be enabled to have clients' => 'Um Clients annehmen zu können, muß NTP vorher aktiviert sein.',
 'ntp server' => 'NTP-Server',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 5bfd356e7c9cdf25878700602005d882559e3b5b..55d24c4884218e4fbcb2272a8c756a4ecb7e899c 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1256,6 +1256,8 @@
 'not set' => 'not set',
 'notes' => 'Notes',
 'november' => 'November',
+'ntp common settings' => 'Common settings',
+'ntp sync' => 'Synchronization',
 'ntp configuration' => 'NTP configuration',
 'ntp must be enabled to have clients' => 'NTP must be enabled to have clients.',
 'ntp server' => 'NTP Server',

diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl
index 347705379789450a1e52850ee856f81625503475..5edbade56a7ec73587c8baf8b24a2d901c44033a 100644 (file)
--- a/langs/es/cgi-bin/es.pl
+++ b/langs/es/cgi-bin/es.pl
@@ -1254,6 +1254,8 @@
 'not set' => 'no configurado',
 'notes' => 'Notas',
 'november' => 'Noviembre',
+'ntp common settings' => 'Configuraciones comunes',
+'ntp sync' => 'Sincronización',
 'ntp configuration' => 'Configuración NTP',
 'ntp must be enabled to have clients' => 'NTP debe estar configurado para tener clientes',
 'ntp server' => 'Servidor NTP',

diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl
index c18761fa5f9b5c0b5581e0466ecae89c8902c6a9..2924cb7f61f055e1c4afc0a56f5e97e969e536af 100644 (file)
--- a/langs/fr/cgi-bin/fr.pl
+++ b/langs/fr/cgi-bin/fr.pl
@@ -1256,6 +1256,8 @@
 'not set' => 'not set',
 'notes' => 'Notes',
 'november' => 'November',
+'ntp common settings' => 'Common settings',
+'ntp sync' => 'Synchronization',
 'ntp configuration' => 'NTP configuration',
 'ntp must be enabled to have clients' => 'NTP must be enabled to have clients.',
 'ntp server' => 'NTP Server',

diff --git a/lfs/compat-wireless b/lfs/compat-wireless
index 59bff2907f28e6d98496c8c8f3dbcc656a360351..44f0fe9a1ea4c36e21b3cf0ed495fe896e4dccd9 100644 (file)
--- a/lfs/compat-wireless
+++ b/lfs/compat-wireless
@@ -30,7 +30,7 @@ else
        VERSUFIX=ipfire
 endif
 
-VER        = 2.6.34
+VER        = 2.6.34.1
 
 THISAPP    = compat-wireless-$(VER)
 DL_FILE    = compat-wireless-$(VER).tar.bz2
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 951e15df527eb89f3c9deb752c709fb3
+$(DL_FILE)_MD5 = 80ceb675aeba45847258770441352af6
 
 install : $(TARGET)
 

diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index bfd499c60c0004bda7d507d9d2617adf2654c722..2de12bd41497b8bd4b404556cd6ff89b1575ec33 100644 (file)
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -520,7 +520,7 @@ int main(int argc, char *argv[])
        replace( "/harddisk/boot/grub/grub.conf", "root=ROOT", string);
        mysystem("ln -s grub.conf /harddisk/boot/grub/menu.lst");
 
-       system("sed -e 's#harddisk\\/##g' < /proc/mounts > /harddisk/etc/mtab");
+       system("sed -e 's#/harddisk#/#g' -e 's#//#/#g'  < /proc/mounts > /harddisk/etc/mtab");
 
        snprintf(commandstring, STRING_SIZE, 
                 "/sbin/chroot /harddisk /usr/sbin/grub-install --no-floppy %s", hdparams.devnode_disk);