diff options
| author | Cecil <knoppmyth@gmail.com> | 2011-08-13 08:06:01 (GMT) |
|---|---|---|
| committer | Cecil <knoppmyth@gmail.com> | 2011-08-13 08:06:01 (GMT) |
| commit | b719a52c3a8dc1f29179dffd78f8109cb100a6f2 (patch) | |
| tree | 0603994112e3730d7357a16288ea71dddc72308a /abs | |
| parent | e11fce5276ea7ca11a8cfb36beab0d10bd5d2047 (diff) | |
| parent | e97b3a4e9655e5d585b7e1f9635b00a041051b02 (diff) | |
| download | linhes_pkgbuild-b719a52c3a8dc1f29179dffd78f8109cb100a6f2.zip linhes_pkgbuild-b719a52c3a8dc1f29179dffd78f8109cb100a6f2.tar.gz linhes_pkgbuild-b719a52c3a8dc1f29179dffd78f8109cb100a6f2.tar.bz2 | |
Merge branch 'testing' of ssh://cesman@linhes.org/mount/repository/linhes_pkgbuild into testing
Diffstat (limited to 'abs')
| -rw-r--r-- | abs/core/initscripts/PKGBUILD | 10 | ||||
| -rw-r--r-- | abs/core/initscripts/__changelog | 2 | ||||
| -rw-r--r-- | abs/core/initscripts/rc.sysinit.patch | 16 |
3 files changed, 16 insertions, 12 deletions
diff --git a/abs/core/initscripts/PKGBUILD b/abs/core/initscripts/PKGBUILD index 98f7856..8b22768 100644 --- a/abs/core/initscripts/PKGBUILD +++ b/abs/core/initscripts/PKGBUILD @@ -5,7 +5,7 @@ pkgname=initscripts pkgver=2011.06.4 -pkgrel=4 +pkgrel=5 pkgdesc="System initialization/bootup scripts" arch=('i686' 'x86_64') url="http://www.archlinux.org" @@ -22,13 +22,9 @@ install=initscripts.install source=("ftp://ftp.archlinux.org/other/initscripts/${pkgname}-${pkgver}.tar.xz" 'wireless.conf.d' 'rc.sysinit.patch' 'rc.shutdown.patch' 'rc.multi.patch' 'inittab.patch') - - - - package() { cd ${srcdir}/${pkgname}-${pkgver} - patch -p0 < ${srcdir}/rc.sysinit.patch || exit 1 + patch -p1 < ${srcdir}/rc.sysinit.patch || exit 1 patch -p0 < ${srcdir}/rc.shutdown.patch || exit 1 patch -p0 < ${srcdir}/rc.multi.patch || exit 1 patch -p0 < ${srcdir}/inittab.patch || exit 1 @@ -37,7 +33,7 @@ package() { } md5sums=('34cbe55f3f42069c59237db935d0511b' '027576534885b8d5dded9be546057b12' - 'eaa31b96513d834b50d116cb51f9ebbe' + 'c9a39df704ad5332ef794ea3630252e5' '73abaf06450104bddf16d409015f81ab' 'a166ea014a1c75860b14fc98825686cc' '521bbd001633d14b08e5471bea584ee4') diff --git a/abs/core/initscripts/__changelog b/abs/core/initscripts/__changelog index 52f3642..4021950 100644 --- a/abs/core/initscripts/__changelog +++ b/abs/core/initscripts/__changelog @@ -1,5 +1,5 @@ Patch init scripts (remove tty1, linhes header) - patch -p0 < ${srcdir}/rc.sysinit.patch || exit 1 + patch -p1 < ${srcdir}/rc.sysinit.patch || exit 1 patch -p0 < ${srcdir}/rc.shutdown.patch || exit 1 patch -p0 < ${srcdir}/rc.multi.patch || exit 1 patch -p0 < ${srcdir}/inittab.patch || exit 1 diff --git a/abs/core/initscripts/rc.sysinit.patch b/abs/core/initscripts/rc.sysinit.patch index 903cf80..c158fcc 100644 --- a/abs/core/initscripts/rc.sysinit.patch +++ b/abs/core/initscripts/rc.sysinit.patch @@ -1,6 +1,6 @@ ---- 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 @@ +--- initscripts-2011.06.4/rc.sysinit.orig 2011-08-11 19:56:03.000000000 +0000 ++++ initscripts-2011.06.4/rc.sysinit 2011-08-11 20:00:05.000000000 +0000 +@@ -7,8 +7,9 @@ . /etc/rc.d/functions echo " " @@ -9,7 +9,15 @@ +printhl "LinHES\n" +printhl "The Linux Home Entertainment System\n" +printhl "${C_H2}http://www.linhes.org" -+ printsep run_hook sysinit_start +@@ -16,6 +17,8 @@ + # export standard PATH (will be overridden later when /etc/profile is sourced, but is useful for UDev) + export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" + ++[[ -d /run ]] || /bin/mkdir -p /run ++ + # mount /proc, /sys, /run, /dev, /run/lock, /dev/pts, /dev/shm (the api filesystems) + /bin/mountpoint -q /proc || /bin/mount -n -t proc proc /proc -o nosuid,noexec,nodev + /bin/mountpoint -q /sys || /bin/mount -n -t sysfs sysfs /sys -o nosuid,noexec,nodev |