From 6da6bcd992d0cc00e1c1f33940780388558ee44a Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sun, 14 Oct 2012 16:26:20 +0000
Subject: [PATCH] core -> extra/initscripts to 2012.10.1-1

---
 {core => extra}/initscripts/PKGBUILD            |  7 +++----
 {core => extra}/initscripts/alarm.patch         |  0
 {core => extra}/initscripts/initscripts.install | 14 +++++++-------
 {core => extra}/initscripts/rc.conf             |  0
 4 files changed, 10 insertions(+), 11 deletions(-)
 rename {core => extra}/initscripts/PKGBUILD (94%)
 rename {core => extra}/initscripts/alarm.patch (100%)
 rename {core => extra}/initscripts/initscripts.install (69%)
 rename {core => extra}/initscripts/rc.conf (100%)

diff --git a/core/initscripts/PKGBUILD b/extra/initscripts/PKGBUILD
similarity index 94%
rename from core/initscripts/PKGBUILD
rename to extra/initscripts/PKGBUILD
index 16f692bd3..e10dbbdf9 100644
--- a/core/initscripts/PKGBUILD
+++ b/extra/initscripts/PKGBUILD
@@ -4,13 +4,12 @@
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=initscripts
-pkgver=2012.09.2
-pkgrel=2
+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')
@@ -26,7 +25,7 @@ install=initscripts.install
 source=("ftp://ftp.archlinux.org/other/initscripts/${pkgname}-${pkgver}.tar.xz"
         'alarm.patch'
         'rc.conf')
-md5sums=('c0a550c17624a6e72dc0edb3da8d664c'
+md5sums=('a4a747e73819b81f2218cf5b9bd53703'
          'e7ec1f2d469258b91bbda84284d37c4c'
          'c618e099f522f861e08a475f8960a6c2')
 
diff --git a/core/initscripts/alarm.patch b/extra/initscripts/alarm.patch
similarity index 100%
rename from core/initscripts/alarm.patch
rename to extra/initscripts/alarm.patch
diff --git a/core/initscripts/initscripts.install b/extra/initscripts/initscripts.install
similarity index 69%
rename from core/initscripts/initscripts.install
rename to extra/initscripts/initscripts.install
index 557faafe4..03519cb1f 100644
--- a/core/initscripts/initscripts.install
+++ b/extra/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."
@@ -18,9 +13,14 @@ post_upgrade() {
   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 "> 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/core/initscripts/rc.conf b/extra/initscripts/rc.conf
similarity index 100%
rename from core/initscripts/rc.conf
rename to extra/initscripts/rc.conf