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

Merge remote-tracking branch 'origin/thirteen' into thirteen

Browse Source
This commit is contained in:
Michael Tremer
2012-10-09 22:20:12 +02:00
parent 3b6f5fb710 225140ae8f
commit 47934bca9f
24 changed files with 2252 additions and 2171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/paks/linux-xen/install.sh
View File

@@ -24,7 +24,7 @@
. /opt/pakfire/lib/functions.sh
extract_files
#
KVER=2.6.32.59
KVER=2.6.32.60
ROOT=`mount | grep " / " | cut -d" " -f1`
ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2`
if [ ! -z $ROOTUUID ]; then
@@ -51,7 +51,7 @@ cp /boot/grub/grub.conf /boot/grub/grub-backup-$KVER-xen.conf
# Add new Entry to grub.conf
#
echo "" >> /boot/grub/grub.conf
echo "title IPFire (XEN-Kernel $KVER)" >> /boot/grub/grub.conf
echo "title IPFire (legacy XEN-Kernel $KVER)" >> /boot/grub/grub.conf
echo " kernel /vmlinuz-$KVER-ipfire-xen root=$ROOT panic=10 console=xvc0 $MOUNT" >> /boot/grub/grub.conf
echo " initrd /ipfirerd-$KVER-xen.img" >> /boot/grub/grub.conf
echo "# savedefault $ENTRY" >> /boot/grub/grub.conf

31
src/patches/mISDN_hfc-s_add_id.patch
View File

@@ -1,7 +1,16 @@
diff -Naur mISDN.org/drivers/isdn/hardware/mISDN/hfcpci.c mISDN/drivers/isdn/hardware/mISDN/hfcpci.c
--- mISDN.org/drivers/isdn/hardware/mISDN/hfcpci.c 2010-05-25 10:41:29.000000000 +0200
+++ mISDN/drivers/isdn/hardware/mISDN/hfcpci.c 2010-10-31 11:19:05.000000000 +0100
@@ -88,6 +88,7 @@
--- mISDN.org/drivers/isdn/hardware/mISDN/hfcpci.c 2012-10-08 14:48:40.000000000 +0200
+++ mISDN/drivers/isdn/hardware/mISDN/hfcpci.c 2012-10-08 17:09:29.527792226 +0200
@@ -53,6 +53,8 @@
#include "hfc_pci.h"
+#define PCI_VENDOR_ID_0x1AE7 0x1AE7
+
static const char *hfcpci_revision = "2.0";
static int HFC_cnt;
@@ -90,6 +92,7 @@
HFC_DIGI_DF_M_A,
HFC_ABOCOM_2BD1,
HFC_SITECOM_DC105V2,
@@ -9,20 +18,20 @@ diff -Naur mISDN.org/drivers/isdn/hardware/mISDN/hfcpci.c mISDN/drivers/isdn/har
};
struct hfcPCI_hw {
@@ -2182,6 +2183,7 @@
@@ -2161,6 +2164,7 @@
{HFC_DIGI_DF_M_A, 0,
"Digi International DataFire Micro V (North America)"},
"Digi International DataFire Micro V (North America)"},
{HFC_SITECOM_DC105V2, 0, "Sitecom Connectivity DC-105 ISDN TA"},
+ {HFC_NONAME_1AE7_0520, 0, "NoName HFC-S (1AE7:0520) ISDN TA"},
{},
};
@@ -2233,6 +2235,8 @@
PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[21]},
{PCI_VENDOR_ID_SITECOM, PCI_DEVICE_ID_SITECOM_DC105V2,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[22]},
+ {0x1ae7, 0x0520,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[23]},
@@ -2212,6 +2216,8 @@
(unsigned long) &hfc_map[21] },
{ PCI_VDEVICE(SITECOM, PCI_DEVICE_ID_SITECOM_DC105V2),
(unsigned long) &hfc_map[22] },
+ { PCI_VDEVICE(0x1AE7, 0x0520),
+ (unsigned long) &hfc_map[23] },
{},
};