summaryrefslogtreecommitdiffstats
path: root/abs
diff options
context:
space:
mode:
Diffstat (limited to 'abs')
-rw-r--r--abs/core/LinHES-config/PKGBUILD4
-rwxr-xr-xabs/core/LinHES-config/mv_install.py4
-rw-r--r--abs/core/initscripts/PKGBUILD42
-rw-r--r--abs/core/initscripts/initscripts.install4
-rw-r--r--abs/core/initscripts/rc.multi.patch12
-rw-r--r--abs/core/initscripts/rc.shutdown.patch29
-rw-r--r--abs/core/initscripts/rc.sysinit.patch11
-rw-r--r--abs/core/initscripts/wireless.conf.d12
-rwxr-xr-xabs/core/system-templates/PKGBUILD2
l---------abs/core/system-templates/system-templates-2.0-4.src.tar.gz1
-rwxr-xr-xabs/core/system-templates/templates/fstab.conf.template9
11 files changed, 88 insertions, 42 deletions
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index 2136a64..2289196 100644
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=2.2
-pkgrel=20
+pkgrel=21
conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
pkgdesc="Install and configure your system"
depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
@@ -101,7 +101,7 @@ build() {
install -m 0755 issue $startdir/pkg/etc/issue
}
-md5sums=('4bece36b26e390e609fd7a4f5c710986'
+md5sums=('c1f6bd445284408767ab8ab4c4164aed'
'1a4694fcd694b362c339bda781ed0f3e'
'e36da536dd651ef182e7642337889e77'
'985891a43f7c4c983eb2a362162f1a0f'
diff --git a/abs/core/LinHES-config/mv_install.py b/abs/core/LinHES-config/mv_install.py
index 5892444..9dcc7b7 100755
--- a/abs/core/LinHES-config/mv_install.py
+++ b/abs/core/LinHES-config/mv_install.py
@@ -526,9 +526,9 @@ def create_fstab(extralines):
f = open(fstabfile, 'w')
line = '''# <file system> <dir> <type> <options> <dump> <pass> \n'''
fstab_list.append(line)
- line = '''none /dev/pts devpts defaults 0 0 \n'''
+ line = '''devpts /dev/pts devpts defaults 0 0 \n'''
fstab_list.append(line)
- line = '''none /dev/shm tmpfs defaults 0 0\n'''
+ line = '''shm /dev/shm tmpfs nodev,nosuid 0 0 \n'''
fstab_list.append(line)
line = '''/dev/sr0 /media/cdrom auto ro,user,noauto,unhide 0 0\n'''
fstab_list.append(line)
diff --git a/abs/core/initscripts/PKGBUILD b/abs/core/initscripts/PKGBUILD
index df2897e..1b93983 100644
--- a/abs/core/initscripts/PKGBUILD
+++ b/abs/core/initscripts/PKGBUILD
@@ -1,33 +1,41 @@
-# $Id: PKGBUILD 85250 2010-07-11 09:54:57Z thomas $
+# $Id: PKGBUILD 127034 2011-06-09 22:34:09Z tomegun $
+# Maintainer: Tom Gundersen <teg@jklm.no>
# Maintainer: Thomas Bächler <thomas@archlinux.org>
# Maintainer: Aaron Griffin <aaron@archlinux.org>
pkgname=initscripts
-pkgver=2010.07
-pkgrel=1
+pkgver=2011.06.4
+pkgrel=2
pkgdesc="System initialization/bootup scripts"
arch=('i686' 'x86_64')
url="http://www.archlinux.org"
-license=('GPL')
+license=('GPL2')
groups=('base')
-backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown)
-depends=('glibc' 'bash' 'awk' 'grep' 'coreutils' 'sed' 'udev>=139-1'
- 'net-tools' 'ncurses' 'kbd' 'findutils' 'sysvinit')
+backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown etc/conf.d/wireless)
+depends=('glibc' 'bash' 'grep' 'coreutils' 'udev>=171' 'iproute2'
+ 'ncurses' 'kbd' 'findutils' 'sysvinit')
optdepends=('bridge-utils: Network bridging support'
'dhcpcd: DHCP network configuration'
+ 'net-tools: legacy network support'
'wireless_tools: Wireless networking')
install=initscripts.install
-source=(ftp://ftp.archlinux.org/other/initscripts/${pkgname}-${pkgver}-${pkgrel}.tar.xz rc.sysinit.patch rc.shutdown.patch)
+source=("ftp://ftp.archlinux.org/other/initscripts/${pkgname}-${pkgver}.tar.xz"
+ 'wireless.conf.d' 'rc.sysinit.patch' 'rc.shutdown.patch' 'rc.multi.patch')
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}-${pkgrel}/
+
+
+
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
patch -p0 < ${srcdir}/rc.sysinit.patch || exit 1
patch -p0 < ${srcdir}/rc.shutdown.patch || exit 1
- DESTDIR=${pkgdir} ./install.sh
+ patch -p0 < ${srcdir}/rc.multi.patch || exit 1
+ make DESTDIR=${pkgdir} install
+ install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless
}
-sha256sums=('16b89a9108deacb7d2afd965e59e31aa4b313fc4d1a660fb3cc1fa5c28cfc053'
- '3a8a82edd680263c4ffa7289fdb6dac69d4611905d093ee3457c00e008e95a1a'
- 'caeb8d9e56783d01001875ffa12d207bc78e06d0fbe3883ce1b68efdfa6ce195')
-sha256sums=('16b89a9108deacb7d2afd965e59e31aa4b313fc4d1a660fb3cc1fa5c28cfc053'
- '3a8a82edd680263c4ffa7289fdb6dac69d4611905d093ee3457c00e008e95a1a'
- 'fd5248ccfc927ca0d8722cec61c041083b4bf79126176d18d51d5e21378ec5fa')
+md5sums=('34cbe55f3f42069c59237db935d0511b'
+ '027576534885b8d5dded9be546057b12'
+ 'eaa31b96513d834b50d116cb51f9ebbe'
+ '73abaf06450104bddf16d409015f81ab'
+ 'a166ea014a1c75860b14fc98825686cc')
diff --git a/abs/core/initscripts/initscripts.install b/abs/core/initscripts/initscripts.install
index 360101c..56f6924 100644
--- a/abs/core/initscripts/initscripts.install
+++ b/abs/core/initscripts/initscripts.install
@@ -4,4 +4,8 @@ post_upgrade() {
echo "==> Original file saved as /etc/inittab.pacsave"
sed -i'.pacsave' 's#vc/\([0-9]\)#tty\1#' /etc/inittab
fi
+ if [ "$(vercmp $2 2011.06.1)" -lt 0 ]; then
+ echo "Blacklisting of modules is no longer supported in rc.conf,"
+ echo "please add blacklist entries to /etc/modprobe.d/ instead."
+ fi
}
diff --git a/abs/core/initscripts/rc.multi.patch b/abs/core/initscripts/rc.multi.patch
new file mode 100644
index 0000000..b426408
--- /dev/null
+++ b/abs/core/initscripts/rc.multi.patch
@@ -0,0 +1,12 @@
+*** rc.multi.orig Sun Jul 31 02:34:55 2011
+--- rc.multi Sun Jul 31 02:35:28 2011
+*************** run_hook multi_end
+*** 30,31 ****
+! kill `/bin/cat /run/bootlogd.pid`
+! /bin/rm /run/bootlogd.pid
+--- 30,34 ----
+! if [ -e /run/bootlogd.pid ]
+! then
+! kill `/bin/cat /run/bootlogd.pid`
+! /bin/rm /run/bootlogd.pid
+! fi
diff --git a/abs/core/initscripts/rc.shutdown.patch b/abs/core/initscripts/rc.shutdown.patch
index 329164d..973ff41 100644
--- a/abs/core/initscripts/rc.shutdown.patch
+++ b/abs/core/initscripts/rc.shutdown.patch
@@ -1,15 +1,20 @@
---- rc.shutdown.orig 2010-08-08 23:50:24.000000000 +0000
-+++ rc.shutdown 2010-08-08 23:51:37.000000000 +0000
-@@ -32,6 +32,12 @@
- fi
- done
+--- rc.shutdown.orig 2011-06-09 22:23:09.000000000 +0000
++++ rc.shutdown 2011-07-31 02:47:22.686835949 +0000
+@@ -51,6 +51,17 @@
fi
+
+ stat_busy "Unmounting Filesystems"
+#unmount network filesystems for runit
-+#if [ -e /var/services/netfs ]
-+#then
-+ /etc/rc.d/netfs stop
-+#fi
++INIT=`ps -p1 -o comm=`
++if [ x$INIT = xrunit ]
++then
++ if [ -e /var/services/netfs ]
++ then
++ /etc/rc.d/netfs stop
++ fi
++fi
+
- # Shutdown daemons in reverse order
- let i=${#DAEMONS[@]}-1
- while [ $i -ge 0 ]; do
++
+ if /bin/grep -q devtmpfs /proc/filesystems &>/dev/null; then
+ /bin/umount -a -r -t nosysfs,noproc,nodevtmpfs,nodevpts -O no_netdev
+ else
diff --git a/abs/core/initscripts/rc.sysinit.patch b/abs/core/initscripts/rc.sysinit.patch
index b0253d0..903cf80 100644
--- a/abs/core/initscripts/rc.sysinit.patch
+++ b/abs/core/initscripts/rc.sysinit.patch
@@ -1,16 +1,15 @@
---- rc.sysinit.orig 2010-08-08 23:42:36.000000000 +0000
-+++ rc.sysinit 2010-08-08 23:44:28.000000000 +0000
-@@ -7,10 +7,9 @@
+--- rc.sysinit.orig 2011-07-31 02:39:05.726815241 +0000
++++ rc.sysinit 2011-07-31 02:42:45.103491048 +0000
+@@ -7,8 +7,10 @@
. /etc/rc.d/functions
echo " "
-printhl "Arch Linux\n"
-printhl "${C_H2}http://www.archlinux.org"
--printhl "Copyright 2002-2007 Judd Vinet"
--printhl "Copyright 2007-2010 Aaron Griffin"
+printhl "LinHES\n"
+printhl "The Linux Home Entertainment System\n"
+printhl "${C_H2}http://www.linhes.org"
- printhl "Distributed under the GNU General Public License (GPL)"
++
printsep
+ run_hook sysinit_start
diff --git a/abs/core/initscripts/wireless.conf.d b/abs/core/initscripts/wireless.conf.d
new file mode 100644
index 0000000..47540ef
--- /dev/null
+++ b/abs/core/initscripts/wireless.conf.d
@@ -0,0 +1,12 @@
+#
+# Settings for wireless cards
+#
+# For each wireless interface declared in INTERFACES (in rc.conf), declare
+# a wlan_${IF} variable that contains the arguments to be passed to
+# iwconfig(8). Then list the original interface name in the
+# WLAN_INTERFACES array.
+#
+
+#wlan_eth0="eth0 mode managed essid default"
+#WLAN_INTERFACES=(eth0)
+
diff --git a/abs/core/system-templates/PKGBUILD b/abs/core/system-templates/PKGBUILD
index 1b3e3e3..bd53e14 100755
--- a/abs/core/system-templates/PKGBUILD
+++ b/abs/core/system-templates/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=system-templates
pkgver=2.0
-pkgrel=3
+pkgrel=4
conflicts=( )
pkgdesc="Templates used for system configuration"
depends=()
diff --git a/abs/core/system-templates/system-templates-2.0-4.src.tar.gz b/abs/core/system-templates/system-templates-2.0-4.src.tar.gz
new file mode 120000
index 0000000..111669c
--- /dev/null
+++ b/abs/core/system-templates/system-templates-2.0-4.src.tar.gz
@@ -0,0 +1 @@
+/data/pkg_repo/packages/system-templates-2.0-4.src.tar.gz \ No newline at end of file
diff --git a/abs/core/system-templates/templates/fstab.conf.template b/abs/core/system-templates/templates/fstab.conf.template
index f8544cf..2bf5547 100755
--- a/abs/core/system-templates/templates/fstab.conf.template
+++ b/abs/core/system-templates/templates/fstab.conf.template
@@ -2,8 +2,13 @@
# /etc/fstab: static file system information
#
# <file system> <dir> <type> <options> <dump> <pass>
-none /dev/pts devpts defaults 0 0
-none /dev/shm tmpfs defaults 0 0
+#none /dev/pts devpts defaults 0 0
+#none /dev/shm tmpfs defaults 0 0
+
+# <file system> <dir> <type> <options> <dump> <pass>
+devpts /dev/pts devpts defaults 0 0
+shm /dev/shm tmpfs nodev,nosuid 0 0
+
/dev/cdrom /mnt/cd iso9660 ro,user,noauto,unhide 0 0
/dev/dvd /mnt/dvd udf ro,user,noauto,unhide 0 0
generated by cgit v0.12 at 2024-11-09 21:21:16 (GMT)