[arch-commits] Commit in initscripts/repos (7 files)
Thomas Bächler
thomas at archlinux.org
Sat Oct 13 09:29:13 UTC 2012
Date: Saturday, October 13, 2012 @ 05:29:13
Author: thomas
Revision: 168541
db-move: moved initscripts from [testing] to [core] (any)
Added:
initscripts/repos/core-any/PKGBUILD
(from rev 168538, initscripts/repos/testing-any/PKGBUILD)
initscripts/repos/core-any/initscripts.install
(from rev 168538, initscripts/repos/testing-any/initscripts.install)
initscripts/repos/core-any/split-hwclock-calls.diff
(from rev 168538, initscripts/repos/testing-any/split-hwclock-calls.diff)
Deleted:
initscripts/repos/core-any/PKGBUILD
initscripts/repos/core-any/initscripts.install
initscripts/repos/core-any/split-hwclock-calls.diff
initscripts/repos/testing-any/
--------------------------+
PKGBUILD | 65 ++++++++++++++++++++++-----------------------
initscripts.install | 52 ++++++++++++++++++------------------
split-hwclock-calls.diff | 42 ++++++++++++++---------------
3 files changed, 79 insertions(+), 80 deletions(-)
Deleted: core-any/PKGBUILD
===================================================================
--- core-any/PKGBUILD 2012-10-13 09:29:08 UTC (rev 168540)
+++ core-any/PKGBUILD 2012-10-13 09:29:13 UTC (rev 168541)
@@ -1,33 +0,0 @@
-# $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.09.2
-pkgrel=2
-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-tools')
-optdepends=('dhcpcd: DHCP network configuration'
- 'bridge-utils: Legacy network bridging support'
- 'net-tools: Legacy network support'
- '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=('c0a550c17624a6e72dc0edb3da8d664c')
Copied: initscripts/repos/core-any/PKGBUILD (from rev 168538, initscripts/repos/testing-any/PKGBUILD)
===================================================================
--- core-any/PKGBUILD (rev 0)
+++ core-any/PKGBUILD 2012-10-13 09:29:13 UTC (rev 168541)
@@ -0,0 +1,32 @@
+# $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.10.1
+pkgrel=1
+pkgdesc="System initialization/bootup scripts"
+arch=('any')
+url="http://www.archlinux.org"
+license=('GPL2')
+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-tools')
+optdepends=('dhcpcd: DHCP network configuration'
+ 'bridge-utils: Legacy network bridging support'
+ 'net-tools: Legacy network support'
+ '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=('a4a747e73819b81f2218cf5b9bd53703')
Deleted: core-any/initscripts.install
===================================================================
--- core-any/initscripts.install 2012-10-13 09:29:08 UTC (rev 168540)
+++ core-any/initscripts.install 2012-10-13 09:29:13 UTC (rev 168541)
@@ -1,26 +0,0 @@
-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/core-any/initscripts.install (from rev 168538, initscripts/repos/testing-any/initscripts.install)
===================================================================
--- core-any/initscripts.install (rev 0)
+++ core-any/initscripts.install 2012-10-13 09:29:13 UTC (rev 168541)
@@ -0,0 +1,26 @@
+post_upgrade() {
+ 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 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
+}
Deleted: core-any/split-hwclock-calls.diff
===================================================================
--- core-any/split-hwclock-calls.diff 2012-10-13 09:29:08 UTC (rev 168540)
+++ core-any/split-hwclock-calls.diff 2012-10-13 09:29:13 UTC (rev 168541)
@@ -1,21 +0,0 @@
-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
Copied: initscripts/repos/core-any/split-hwclock-calls.diff (from rev 168538, initscripts/repos/testing-any/split-hwclock-calls.diff)
===================================================================
--- core-any/split-hwclock-calls.diff (rev 0)
+++ core-any/split-hwclock-calls.diff 2012-10-13 09:29:13 UTC (rev 168541)
@@ -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
More information about the arch-commits
mailing list