[arch-commits] Commit in initscripts/repos (4 files)

[Dave Reisner]

    Date: Sunday, September 9, 2012 @ 14:23:32
  Author: dreisner
Revision: 166531

archrelease: copy trunk to testing-any

Added:
  initscripts/repos/testing-any/
  initscripts/repos/testing-any/PKGBUILD
    (from rev 166530, initscripts/trunk/PKGBUILD)
  initscripts/repos/testing-any/initscripts.install
    (from rev 166530, initscripts/trunk/initscripts.install)
  initscripts/repos/testing-any/split-hwclock-calls.diff
    (from rev 166530, initscripts/trunk/split-hwclock-calls.diff)

--------------------------+
 PKGBUILD                 |   43 +++++++++++++++++++++++++++++++++++++++++++
 initscripts.install      |   26 ++++++++++++++++++++++++++
 split-hwclock-calls.diff |   21 +++++++++++++++++++++
 3 files changed, 90 insertions(+)

Copied: initscripts/repos/testing-any/PKGBUILD (from rev 166530, initscripts/trunk/PKGBUILD)
===================================================================
--- testing-any/PKGBUILD	                        (rev 0)
+++ testing-any/PKGBUILD	2012-09-09 18:23:32 UTC (rev 166531)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Tom Gundersen <teg at jklm.no>
+# Contributor: Thomas Bächler <thomas at archlinux.org>
+# Contributor: Aaron Griffin <aaron at archlinux.org>
+
+pkgname=initscripts
+pkgver=2012.08.3
+pkgrel=3
+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')
+optdepends=('dhcpcd: DHCP network configuration'
+            'bridge-utils: Legacy network bridging support'
+            'net-tools: Legacy network support'
+            'wireless_tools: Legacy wireless networking')
+makedepends=(asciidoc)
+install=initscripts.install
+source=("ftp://ftp.archlinux.org/other/initscripts/${pkgname}-${pkgver}.tar.xz"
+        'split-hwclock-calls.diff')
+md5sums=('b5e8de40bf798637cb1634a1555d0f1f'
+         'd381ed1fbdc3780496317844241b0568')
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  # http://mailman.archlinux.org/pipermail/arch-projects/2012-September/003252.html
+  # patch based on master does not apply, so this is the exact patch posted to
+  # the bug report it fixes (FS#31416).
+  patch -Np1 <"$srcdir/split-hwclock-calls.diff"
+
+  make DESTDIR=${pkgdir} install
+
+  # moved to filesystem
+  rm -rf ${pkgdir}/etc/profile.d
+  rm ${pkgdir}/usr/share/man/man7/archlinux.7
+}

Copied: initscripts/repos/testing-any/initscripts.install (from rev 166530, initscripts/trunk/initscripts.install)
===================================================================
--- testing-any/initscripts.install	                        (rev 0)
+++ testing-any/initscripts.install	2012-09-09 18:23:32 UTC (rev 166531)
@@ -0,0 +1,26 @@
+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."
+  fi
+  if [ "$(vercmp $2 2011.07.2)" -lt 0 ]; then
+    echo "VERBOSE= in rc.conf no longer has any effect."
+    echo "Please append 'quiet' to your kernel command line."
+  fi
+  if [ "$(vercmp $2 2011.10.1)" -lt 0 ]; then
+    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 MODULES and"
+    echo "> DAEMONS 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
+}

Copied: initscripts/repos/testing-any/split-hwclock-calls.diff (from rev 166530, initscripts/trunk/split-hwclock-calls.diff)
===================================================================
--- testing-any/split-hwclock-calls.diff	                        (rev 0)
+++ testing-any/split-hwclock-calls.diff	2012-09-09 18:23:32 UTC (rev 166531)
@@ -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