diff options
| -rw-r--r-- | abs/core/initscripts/PKGBUILD | 16 | ||||
| -rw-r--r-- | abs/core/initscripts/initscripts-2012.07.5.tar.xz | bin | 19084 -> 0 bytes | |||
| -rw-r--r-- | abs/core/initscripts/initscripts.install | 17 | ||||
| -rw-r--r-- | abs/core/initscripts/split-hwclock-calls.diff | 21 |
4 files changed, 43 insertions, 11 deletions
diff --git a/abs/core/initscripts/PKGBUILD b/abs/core/initscripts/PKGBUILD index f453426..3c336b3 100644 --- a/abs/core/initscripts/PKGBUILD +++ b/abs/core/initscripts/PKGBUILD @@ -1,28 +1,32 @@ -# $Id: PKGBUILD 164226 2012-07-27 22:02:29Z tomegun $ +# $Id: PKGBUILD 168542 2012-10-13 09:29:55Z thomas $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Thomas Bächler <thomas@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=initscripts -pkgver=2012.07.5 +pkgver=2012.10.1 pkgrel=1 pkgdesc="System initialization/bootup scripts" arch=('any') url="http://www.archlinux.org" license=('GPL2') -groups=('base') +provides=('initscripts-systemd') +conflicts=('initscripts-systemd') +replaces=('initscripts-systemd') backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown) -depends=('glibc' 'bash' 'coreutils' 'systemd-tools' 'iproute2' 'ncurses' 'findutils' 'sysvinit') +depends=('glibc' 'bash' 'coreutils' 'systemd-tools' 'iproute2' 'ncurses' 'findutils' 'sysvinit-tools') optdepends=('dhcpcd: DHCP network configuration' 'bridge-utils: Legacy network bridging support' 'net-tools: Legacy network support' - 'wireless_tools: Legacy wireless networking') + 'wireless_tools: Legacy wireless networking' + 'sysvinit: Legacy init support') makedepends=(asciidoc) install=initscripts.install source=("ftp://ftp.archlinux.org/other/initscripts/${pkgname}-${pkgver}.tar.xz") package() { cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install } -md5sums=('2e3589c8e0baac7a4ea9e353edbcf26c') +md5sums=('a4a747e73819b81f2218cf5b9bd53703') diff --git a/abs/core/initscripts/initscripts-2012.07.5.tar.xz b/abs/core/initscripts/initscripts-2012.07.5.tar.xz Binary files differdeleted file mode 100644 index 36a2dae..0000000 --- a/abs/core/initscripts/initscripts-2012.07.5.tar.xz +++ /dev/null diff --git a/abs/core/initscripts/initscripts.install b/abs/core/initscripts/initscripts.install index 963713b..03519cb 100644 --- a/abs/core/initscripts/initscripts.install +++ b/abs/core/initscripts/initscripts.install @@ -1,9 +1,4 @@ post_upgrade() { - if [ "$(vercmp $2 2009.07)" -lt 0 ]; then - echo "==> Adjusting /etc/inittab for transition to /dev/tty standard." - 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." @@ -16,4 +11,16 @@ post_upgrade() { echo "If using non-bash-compatible shell, please set LANG in /etc/locale.conf," echo "as LOCALE in /etc/rc.conf no longer works." fi + if [ "$(vercmp $2 2012.08.1)" -lt 0 ]; then + echo "----" + echo "> initscripts now ships a compatibility layer to make systemd use DAEMONS" + echo "> from rc.conf; and run rc.local and rc.local.shutdown on boot and" + echo "> shutdown, respectively. Refer to arch-modules-load(8) and arch-daemons(8)." + echo "----" + fi + if [ "$(vercmp $2 2012.10.1)" -lt 0 ]; then + echo "----" + echo "> systemd no longer reads MODULES from rc.conf." + echo "----" + fi } diff --git a/abs/core/initscripts/split-hwclock-calls.diff b/abs/core/initscripts/split-hwclock-calls.diff new file mode 100644 index 0000000..c0a6a4f --- /dev/null +++ b/abs/core/initscripts/split-hwclock-calls.diff @@ -0,0 +1,21 @@ +diff --git a/rc.sysinit b/rc.sysinit +index eb49e2b..8f9727b 100755 +--- a/rc.sysinit ++++ b/rc.sysinit +@@ -34,7 +34,6 @@ bootlogd -p /run/bootlogd.pid + + run_hook sysinit_start + +-HWCLOCK_PARAMS="--systz" + case $HARDWARECLOCK in + "") ;; + UTC) HWCLOCK_PARAMS+=" --utc --noadjfile";; +@@ -54,7 +53,7 @@ if [[ $HWCLOCK_PARAMS ]]; then + + [[ $TIMEZONE ]] && export TZ=$TIMEZONE + +- hwclock $HWCLOCK_PARAMS && stat_done || stat_fail ++ { hwclock $HWCLOCK_PARAMS && hwclock --systz; } && stat_done || stat_fail + + unset TZ + fi |