summaryrefslogtreecommitdiffstats
path: root/abs
diff options
context:
space:
mode:
authorBob Igo <bob@stormlogic.com>2009-07-13 18:31:35 (GMT)
committerBob Igo <bob@stormlogic.com>2009-07-13 18:31:35 (GMT)
commit79ae8691ae89c16e7a62eed1c63798feb214a21a (patch)
tree51316d3dd390b2950d78d90da6e44773838eb18e /abs
parent8318951c942e2619e4c84315f3e49364b444df79 (diff)
parent5baa3ef4ea235cf4440e3e3f62abd8a935d0ce0d (diff)
downloadlinhes_pkgbuild-79ae8691ae89c16e7a62eed1c63798feb214a21a.zip
linhes_pkgbuild-79ae8691ae89c16e7a62eed1c63798feb214a21a.tar.gz
linhes_pkgbuild-79ae8691ae89c16e7a62eed1c63798feb214a21a.tar.bz2
Merge branch 'master' of ssh://igo@knoppmyth.net/mount/repository/LinHES-PKGBUILD
Diffstat (limited to 'abs')
-rwxr-xr-xabs/core-testing/LinHES-config/PKGBUILD4
-rwxr-xr-xabs/core-testing/LinHES-config/install_functions.sh65
-rw-r--r--abs/core-testing/nvidia/PKGBUILD4
3 files changed, 60 insertions, 13 deletions
diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD
index 5ad1a9c..9486462 100755
--- a/abs/core-testing/LinHES-config/PKGBUILD
+++ b/abs/core-testing/LinHES-config/PKGBUILD
@@ -1,9 +1,9 @@
pkgname=LinHES-config
pkgver=2.0
-pkgrel=53
+pkgrel=57
conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev )
pkgdesc="Install and configure your system"
-depends=(bc libstatgrab mysql-python expect curl dnsutils parted sg3_utils nmbscan system-templates rsync python-parted ddcxinfo python-pexpect python-netifaces LinHES-timezone)
+depends=(bc libstatgrab mysql-python expect curl dnsutils parted sg3_utils nmbscan system-templates rsync python-parted ddcxinfo python-pexpect python-netifaces LinHES-timezone python-iplib)
arch=('i686')
source=(mv_install.py mv_config.py mythinstall.bin myth_user_call file_time_offset.py install-ui.xml install_proxy.sh install_functions.sh systemconfig.sh install_db_chroot.sh restore_default_settings.sh xconfig.sh timezip.py soundconfig.sh LinHES-release issue MythVantage.sh create_master.sh build_diskless.sh networkconfig.sh autocard.py restore_km_db_chroot.sh README mv_advanced.py mv_common.py mv_ir.py mv_misc.py mv_network.py mv_screensaver.py mv_smolt.py mv_software.py mv_webuser.py mv_hostype.py systemconfig.py myth_user_call.py)
diff --git a/abs/core-testing/LinHES-config/install_functions.sh b/abs/core-testing/LinHES-config/install_functions.sh
index 9b39437..ea9e61c 100755
--- a/abs/core-testing/LinHES-config/install_functions.sh
+++ b/abs/core-testing/LinHES-config/install_functions.sh
@@ -161,10 +161,10 @@ fi
function rest_of_network () {
#netmask
- echo $CMDLINE | grep -q netmask
+ echo $CMDLINE | grep -q cnetmask
if [ $? -eq 0 ]
then
- TEMPVAR=${CMDLINE#*netmask=}
+ TEMPVAR=${CMDLINE#*cnetmask=}
NETMASK=${TEMPVAR%% *}
/sbin/ifconfig eth0 $IP netmask $NETMASK
nm=`/usr/bin/nmconv.py -obits $NETMASK`
@@ -175,10 +175,10 @@ function rest_of_network () {
printhl " Netmask not found"
fi
#gateway
- echo $CMDLINE | grep -q gateway
+ echo $CMDLINE | grep -q cgateway
if [ $? -eq 0 ]
then
- TEMPVAR=${CMDLINE#*gateway=}
+ TEMPVAR=${CMDLINE#*cgateway=}
GATEWAY=${TEMPVAR%% *}
/sbin/route add default gw $GATEWAY
update_db_settings HostGW${MYTHDEFAULT} "$GATEWAY"
@@ -187,10 +187,10 @@ function rest_of_network () {
fi
#dns
- echo $CMDLINE | grep -q dns
+ echo $CMDLINE | grep -q cdns
if [ $? -eq 0 ]
then
- TEMPVAR=${CMDLINE#*dns=}
+ TEMPVAR=${CMDLINE#*cdns=}
DNS=${TEMPVAR%% *}
echo "nameserver $DNS" >> /etc/resolv.conf
update_db_settings HostDNS${MYTHDEFAULT} "$DNS"
@@ -200,10 +200,10 @@ function rest_of_network () {
}
function init_network {
- echo $CMDLINE |grep -q netdev
+ echo $CMDLINE |grep -q cnetdev
if [ $? -eq 0 ]
then
- TEMPVAR=${CMDLINE#*netdev=}
+ TEMPVAR=${CMDLINE#*cnetdev=}
MYTHDEFAULT=${TEMPVAR%% *}
else
MYTHDEFAULT="eth0"
@@ -219,7 +219,7 @@ function init_network {
update_db_settings HostActiveonboot${MYTHDEFAULT} 1
update_db_settings HostNetDevice ${MYTHDEFAULT}
- TEMPVAR=${CMDLINE#*ip=}
+ TEMPVAR=${CMDLINE#*cip=}
IP=${TEMPVAR%% *}
if [ "$IP" == "dhcp" ]
then
@@ -232,6 +232,53 @@ function init_network {
rest_of_network
fi
fi
+
+
+
+
+}
+
+function dev_up_check(){
+ /sbin/ifconfig $1 1>/dev/null 2>/dev/null
+ status=$?
+ if [ $status -eq 1 ]
+ then
+ return 0
+ else
+ devip=`/sbin/ifconfig | grep -C1 $1| grep inet|grep -v inet6 | cut -d: -f2 | awk '{ print $1}'`
+ if [ "x$devip" = "x" ]
+ then
+ return 1
+ else
+ return 0
+ fi
+ fi
+}
+
+function request_dhcp(){
+ for ndev in eth0 eth1 wlan0 wlan1 ath0
+ do
+ dev_up_check $ndev
+ status=$?
+ if [ $status -eq 1 ]
+ then
+ #interface is down, lets see if dhcp responds
+ dhcpcd -Td -t2 $ndev > /tmp/dhcpinfo.$ndev
+ TEMPVAR=`grep IPADDR /tmp/dhcpinfo.$ndev |cut -d\' -f2`
+ if [ ! x$TEMPVAR = x ]
+ then
+ update_db_settings HostIP$ndev "$TEMPVAR"
+ TEMPVAR=`grep NETMASK /tmp/dhcpinfo.$ndev |cut -d\' -f2`
+ nm=`/usr/bin/nmconv.py -obits $TEMPVAR`
+ TEMPVAR="/$nm $TEMPVAR"
+ update_db_settings HostNETMASK$ndev "$TEMPVAR"
+ TEMPVAR=`grep GATEWAYS /tmp/dhcpinfo.$ndev |cut -d\' -f2`
+ update_db_settings HostGW$ndev "$TEMPVAR"
+ TEMPVAR=`grep DNSSERVERS /tmp/dhcpinfo.$ndev |cut -d\' -f2`
+ update_db_settings HostDNS$ndev "$TEMPVAR"
+ fi
+ fi
+ done
}
function init_remote {
diff --git a/abs/core-testing/nvidia/PKGBUILD b/abs/core-testing/nvidia/PKGBUILD
index 2c25610..eccf01f 100644
--- a/abs/core-testing/nvidia/PKGBUILD
+++ b/abs/core-testing/nvidia/PKGBUILD
@@ -4,13 +4,13 @@
pkgname=nvidia
pkgver=185.18.14
_kernver='2.6.28-LinHES'
-pkgrel=1
+pkgrel=2
pkgdesc="NVIDIA drivers for kernel26."
arch=('i686' 'x86_64')
[ "$CARCH" = "i686" ] && ARCH=x86
[ "$CARCH" = "x86_64" ] && ARCH=x86_64
url="http://www.nvidia.com/"
-depends=('kernel26>=2.6.28' 'kernel26<2.6.29' 'nvidia-utils')
+depends=('kernel26>=2.6.28' 'kernel26<2.6.29' 'nvidia-utils=185.18.14')
conflicts=('nvidia-96xx' 'nvidia-71xx' 'nvidia-legacy' 'nvidia-beta')
license=('custom')
install=nvidia.install