webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-10 19:15:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

Browse Source
This commit is contained in:
Michael Tremer
2015-03-31 00:59:59 +02:00
parent df5fbff531 b34ba990aa
commit 6ecbdec1b7
7 changed files with 78 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/rootfiles/common/apache2
View File

@@ -1336,7 +1336,7 @@ usr/lib/apr-util-1/apr_dbd_sqlite3.so
#usr/lib/libapr-1.la
usr/lib/libapr-1.so
usr/lib/libapr-1.so.0
usr/lib/libapr-1.so.0.5.0
usr/lib/libapr-1.so.0.5.1
#usr/lib/libaprutil-1.a
#usr/lib/libaprutil-1.la
usr/lib/libaprutil-1.so

42
config/rootfiles/common/cyrus-sasl
View File

@@ -1,4 +1,3 @@
etc/rc.d/init.d/cyrus-sasl
#usr/include/sasl
#usr/include/sasl/hmac-md5.h
#usr/include/sasl/md5.h
@@ -9,39 +8,44 @@ etc/rc.d/init.d/cyrus-sasl
#usr/include/sasl/saslutil.h
#usr/lib/libsasl2.la
usr/lib/libsasl2.so
usr/lib/libsasl2.so.2
usr/lib/libsasl2.so.2.0.21
usr/lib/libsasl2.so.3
usr/lib/libsasl2.so.3.0.0
#usr/lib/pkgconfig/libsasl2.pc
#usr/lib/sasl2
#usr/lib/sasl2/libanonymous.la
usr/lib/sasl2/libanonymous.so
usr/lib/sasl2/libanonymous.so.2
usr/lib/sasl2/libanonymous.so.2.0.21
usr/lib/sasl2/libanonymous.so.3
usr/lib/sasl2/libanonymous.so.3.0.0
#usr/lib/sasl2/libcrammd5.la
usr/lib/sasl2/libcrammd5.so
usr/lib/sasl2/libcrammd5.so.2
usr/lib/sasl2/libcrammd5.so.2.0.21
usr/lib/sasl2/libcrammd5.so.3
usr/lib/sasl2/libcrammd5.so.3.0.0
#usr/lib/sasl2/libdigestmd5.la
usr/lib/sasl2/libdigestmd5.so
usr/lib/sasl2/libdigestmd5.so.2
usr/lib/sasl2/libdigestmd5.so.2.0.21
usr/lib/sasl2/libdigestmd5.so.3
usr/lib/sasl2/libdigestmd5.so.3.0.0
#usr/lib/sasl2/libotp.la
usr/lib/sasl2/libotp.so
usr/lib/sasl2/libotp.so.2
usr/lib/sasl2/libotp.so.2.0.21
usr/lib/sasl2/libotp.so.3
usr/lib/sasl2/libotp.so.3.0.0
#usr/lib/sasl2/libplain.la
usr/lib/sasl2/libplain.so
usr/lib/sasl2/libplain.so.2
usr/lib/sasl2/libplain.so.2.0.21
usr/lib/sasl2/libplain.so.3
usr/lib/sasl2/libplain.so.3.0.0
#usr/lib/sasl2/libsasldb.la
usr/lib/sasl2/libsasldb.so
usr/lib/sasl2/libsasldb.so.2
usr/lib/sasl2/libsasldb.so.2.0.21
usr/lib/sasl2/libsasldb.so.3
usr/lib/sasl2/libsasldb.so.3.0.0
#usr/lib/sasl2/libscram.la
usr/lib/sasl2/libscram.so
usr/lib/sasl2/libscram.so.3
usr/lib/sasl2/libscram.so.3.0.0
usr/lib/sasl2/smtpd.conf
#usr/man/cat8
#usr/man/cat8/saslauthd.8
usr/sbin/pluginviewer
usr/sbin/saslauthd
usr/sbin/sasldblistusers2
usr/sbin/saslpasswd2
usr/sbin/testsaslauthd
#usr/share/man/man3/sasl.3
#usr/share/man/man3/sasl_authorize_t.3
#usr/share/man/man3/sasl_auxprop.3
@@ -64,6 +68,7 @@ usr/sbin/saslpasswd2
#usr/share/man/man3/sasl_errdetail.3
#usr/share/man/man3/sasl_errors.3
#usr/share/man/man3/sasl_errstring.3
#usr/share/man/man3/sasl_getconfpath_t.3
#usr/share/man/man3/sasl_getopt_t.3
#usr/share/man/man3/sasl_getpath_t.3
#usr/share/man/man3/sasl_getprop.3
@@ -84,6 +89,9 @@ usr/sbin/saslpasswd2
#usr/share/man/man3/sasl_setprop.3
#usr/share/man/man3/sasl_user_exists.3
#usr/share/man/man3/sasl_verifyfile_t.3
#usr/share/man/man8/pluginviewer.8
#usr/share/man/man8/saslauthd.8
#usr/share/man/man8/sasldblistusers2.8
#usr/share/man/man8/saslpasswd2.8
var/lib/sasl
etc/rc.d/init.d/cyrus-sasl

2
config/rootfiles/common/logrotate
View File

@@ -1,6 +1,6 @@
#etc/logrotate.d
etc/logrotate.d/.empty
#usr/man/man5/logrotate.5
#usr/man/man5/logrotate.conf.5
#usr/man/man8/logrotate.8
usr/sbin/logrotate
var/lib/logrotate.status

1
config/syslinux/syslinux.cfg
View File

@@ -50,6 +50,7 @@ Run the installer in text mode.
ENDTEXT
KERNEL vmlinuz
INITRD instroot
APPEND novga
LABEL unattended
MENU LABEL Unattended installation

1
lfs/backports
View File

@@ -90,6 +90,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-drivers-3.8.3-ath_ignore_eeprom_regdomain.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.22-iwlwifi-noibss_only_on_radar_chan.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.37-rt2800usb_add_dlink_dwa137_usbid.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/backports-3.18.1-1_rt2800usb_suppress_queue_warnings.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/backports-3.18.1-1_add_libertas_uap.patch
# smsc mac address patch for pandaboard and raspberry pi

19
src/installer/main.c
View File

@@ -271,6 +271,7 @@ static struct lang {
static struct config {
int unattended;
int serial_console;
int novga;
int require_networking;
int perform_download;
int disable_swap;
@@ -280,6 +281,7 @@ static struct config {
} config = {
.unattended = 0,
.serial_console = 0,
.novga = 0,
.require_networking = 0,
.perform_download = 0,
.disable_swap = 0,
@@ -309,6 +311,10 @@ static void parse_command_line(struct config* c) {
if ((strcmp(key, "console") == 0) && (strncmp(val, "ttyS", 4) == 0))
c->serial_console = 1;
// novga
else if (strcmp(key, "novga") == 0)
c->novga = 1;
// enable networking?
else if (strcmp(token, "installer.net") == 0)
c->require_networking = 1;
@@ -825,6 +831,19 @@ int main(int argc, char *argv[]) {
replace("/harddisk/etc/inittab", "#7:2345:respawn:", "7:2345:respawn:");
}
/* novga */
if (config.novga) {
/* grub */
FILE* f = fopen(DESTINATION_MOUNT_PATH "/etc/default/grub", "a");
if (!f) {
errorbox(_("Unable to open /etc/default/grub for writing."));
goto EXIT;
}
fprintf(f, "GRUB_GFXMODE=\"none\"\n");
fclose(f);
}
rc = hw_install_bootloader(destination, logfile);
if (rc) {
errorbox(_("Unable to install the bootloader."));

30
src/patches/backports-3.18.1-1_rt2800usb_suppress_queue_warnings.patch Normal file
View File

@@ -0,0 +1,30 @@
diff -Naur backports-3.18.1-1.org/drivers/net/wireless/rt2x00/rt2800usb.c backports-3.18.1-1/drivers/net/wireless/rt2x00/rt2800usb.c
--- backports-3.18.1-1.org/drivers/net/wireless/rt2x00/rt2800usb.c 2014-12-21 22:37:14.000000000 +0100
+++ backports-3.18.1-1/drivers/net/wireless/rt2x00/rt2800usb.c 2015-03-29 21:42:13.865183543 +0200
@@ -444,7 +444,7 @@
rt2x00usb_register_read(rt2x00dev, TXRXQ_PCNT, &reg);
if (rt2x00_get_field32(reg, TXRXQ_PCNT_TX0Q)) {
- rt2x00_warn(rt2x00dev, "TX HW queue 0 timed out, invoke forced kick\n");
+ rt2x00_dbg(rt2x00dev, "TX HW queue 0 timed out, invoke forced kick\n");
rt2x00usb_register_write(rt2x00dev, PBF_CFG, 0xf40012);
@@ -459,7 +459,7 @@
rt2x00usb_register_read(rt2x00dev, TXRXQ_PCNT, &reg);
if (rt2x00_get_field32(reg, TXRXQ_PCNT_TX1Q)) {
- rt2x00_warn(rt2x00dev, "TX HW queue 1 timed out, invoke forced kick\n");
+ rt2x00_dbg(rt2x00dev, "TX HW queue 1 timed out, invoke forced kick\n");
rt2x00usb_register_write(rt2x00dev, PBF_CFG, 0xf4000a);
@@ -609,7 +609,7 @@
if (unlikely(test_bit(ENTRY_OWNER_DEVICE_DATA, &entry->flags) ||
!test_bit(ENTRY_DATA_STATUS_PENDING, &entry->flags))) {
- rt2x00_warn(rt2x00dev, "Data pending for entry %u in queue %u\n",
+ rt2x00_dbg(rt2x00dev, "Data pending for entry %u in queue %u\n",
entry->entry_idx, qid);
break;
}