From d1a98dde3b9dec5908bfa7649491b89d10f304a3 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 05:09:40 +0000 Subject: [PATCH 1/8] Initialize branch F-12 for initscripts --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From 326af7095cb3c061fdc4cb2662de125c3abf790f Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 2 Oct 2009 19:10:43 +0000 Subject: [PATCH 2/8] 9.00-1 --- .cvsignore | 2 +- initscripts.spec | 12 +++++++++++- sources | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1ffda16..8a184e3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-8.99.tar.bz2 +initscripts-9.00.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 6aa028b..625cf4d 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 8.99 +Version: 9.00 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -17,6 +17,7 @@ Requires: /sbin/pidof, /sbin/blkid Requires: module-init-tools Requires: util-linux-ng >= 2.16, mount >= 2.11l Requires: bash >= 3.0 +Requires: sysvinit-tools >= 2.87 %if with_upstart Requires: upstart %else @@ -251,6 +252,15 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Fri Oct 2 2009 Bill Nottingham - 9.00-1 +- halt: wrap /sbin/killall5 to catch some return codes (#526539) +- netfs, netconsle, network: fix return codes to match LSB spec (#524489, #524480, #524486) +- handle kernels compiled both with and without CONFIG_RTC_HCTOSYS +- halt: use killall5's return code to avoid unncesssary sleeping (#524359, ) +- halt: don't kill mdmon on shutdown. (#524357, ) +- rc.sysinit: do not try and activate ISW raidsets, unless noiswmd is passed. (#524355, ) +- translation updates: ca, cs, da, mai, po, sv, uk + * Mon Sep 14 2009 Bill Nottingham - 8.99-1 - init.d/functions: add a '-l' option to status to pass lock file name (#521772) - tweak kernel conflict diff --git a/sources b/sources index 70c0b01..547aa51 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ec294a0d68f6a14c1b6f3cf507a48aad initscripts-8.99.tar.bz2 +8c7c09a332e5f25cab16eedd2b3ddabf initscripts-9.00.tar.bz2 From 46d7169f430e5ca1e37eb40bbcbb06155e8dfd2a Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 9 Oct 2009 20:32:02 +0000 Subject: [PATCH 3/8] 9.01 --- .cvsignore | 2 +- initscripts.spec | 7 ++++++- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 8a184e3..cfceb68 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-9.00.tar.bz2 +initscripts-9.01.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 625cf4d..223ae14 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.00 +Version: 9.01 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -252,6 +252,11 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Fri Oct 9 2009 Bill Nottingham - 9.01-1 +- rc.sysinit: fix handling of dmraid output to avoid error messages (#527726, ) +- rwtab: add /var/lib/xend (#526046) +- translation updates: fi, nb, pl + * Fri Oct 2 2009 Bill Nottingham - 9.00-1 - halt: wrap /sbin/killall5 to catch some return codes (#526539) - netfs, netconsle, network: fix return codes to match LSB spec (#524489, #524480, #524486) diff --git a/sources b/sources index 547aa51..ea343ad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8c7c09a332e5f25cab16eedd2b3ddabf initscripts-9.00.tar.bz2 +b6fa31fc4767993d633bea0e65d0da12 initscripts-9.01.tar.bz2 From 9ea9cf1c143b2cda02488495d8c818fc5211c03a Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 27 Oct 2009 20:19:58 +0000 Subject: [PATCH 4/8] 9.02-1 --- .cvsignore | 2 +- initscripts.spec | 14 +++++++++----- sources | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index cfceb68..b57138a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-9.01.tar.bz2 +initscripts-9.02.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 223ae14..60fa8a9 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.01 +Version: 9.02 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -86,7 +86,6 @@ rm -f $RPM_BUILD_ROOT/etc/inittab.* %ifnarch s390 s390x rm -f \ $RPM_BUILD_ROOT/etc/sysconfig/network-scripts/ifup-ctc \ - $RPM_BUILD_ROOT/etc/sysconfig/network-scripts/ifup-iucv \ $RPM_BUILD_ROOT/lib/udev/rules.d/55-ccw.rules \ $RPM_BUILD_ROOT/lib/udev/ccw_init \ $RPM_BUILD_ROOT/etc/event.d/console @@ -176,7 +175,6 @@ rm -rf $RPM_BUILD_ROOT /etc/sysconfig/network-scripts/net.hotplug %ifarch s390 s390x /etc/sysconfig/network-scripts/ifup-ctc -/etc/sysconfig/network-scripts/ifup-iucv %endif %config(noreplace) /etc/networks /etc/rwtab @@ -215,7 +213,6 @@ rm -rf $RPM_BUILD_ROOT /sbin/getkey /sbin/securetty %attr(2755,root,root) /sbin/netreport -/sbin/initlog /lib/udev/rules.d/* /lib/udev/rename_device /lib/udev/console_init @@ -235,7 +232,6 @@ rm -rf $RPM_BUILD_ROOT /etc/ppp/ip-down.ipv6to4 /etc/ppp/ipv6-up /etc/ppp/ipv6-down -%config(noreplace) /etc/initlog.conf %dir /etc/NetworkManager %dir /etc/NetworkManager/dispatcher.d /etc/NetworkManager/dispatcher.d/00-netreport @@ -252,6 +248,14 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Tue Oct 27 2009 Bill Nottingham - 9.02-1 +- remove long-since deprecated initlog +- remove IUCV support (#507217) +- halt: put a wrapper around killall5 to account for retval 2 not being an error (#526539, ) +- ifup-eth: honor DEFROUTE=yes|no for 'all' connection types. (#528822) +- network-functions: load bonding driver if BONDING_OPTS is defined. (#516569) +- rc.sysinit: put /dev/shm in mtab too, as dracut now mounts it. (#528667) + * Fri Oct 9 2009 Bill Nottingham - 9.01-1 - rc.sysinit: fix handling of dmraid output to avoid error messages (#527726, ) - rwtab: add /var/lib/xend (#526046) diff --git a/sources b/sources index ea343ad..ad1213b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b6fa31fc4767993d633bea0e65d0da12 initscripts-9.01.tar.bz2 +bd631c5d6f319e25bf5a7209a29a32ec initscripts-9.02.tar.bz2 From f6986705cd1b49ad6d9d1d76d3cd31f84c946ae9 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 28 Oct 2009 02:54:36 +0000 Subject: [PATCH 5/8] Fix typo from bad import script. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 578df4e..6152ae2 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := initscripts SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From b9065671ccba89e71d3bba0fddabb2f0708d4013 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Sat, 5 Dec 2009 15:10:53 +0000 Subject: [PATCH 6/8] 9.02.1-1 --- .cvsignore | 2 +- initscripts.spec | 8 +++++++- sources | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index b57138a..1086b4a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-9.02.tar.bz2 +initscripts-9.02.1.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 60fa8a9..356e3c7 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.02 +Version: 9.02.1 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -248,6 +248,12 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Fri Dec 04 2009 Bill Nottingham - 9.02.1-1 +- rc.sysinit: handle yet another random return string from dmraid +- remove never-used 'sulogin' upstart event +- fix time-setting udev rules for old-style RTC devices (#537595) +- translation updates: el + * Tue Oct 27 2009 Bill Nottingham - 9.02-1 - remove long-since deprecated initlog - remove IUCV support (#507217) diff --git a/sources b/sources index ad1213b..f9b0bad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bd631c5d6f319e25bf5a7209a29a32ec initscripts-9.02.tar.bz2 +00f9591e57228279130f7764cdbb32ff initscripts-9.02.1.tar.bz2 From de512765b51a9afcc7e960c6b5349fbd1b14e72b Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 28 Apr 2010 18:23:15 +0000 Subject: [PATCH 7/8] 9.02.2-1 --- .cvsignore | 2 +- initscripts.spec | 10 +++++++++- sources | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1086b4a..7cbb405 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-9.02.1.tar.bz2 +initscripts-9.02.2.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 356e3c7..88d7948 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.02.1 +Version: 9.02.2 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -248,6 +248,14 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Wed Apr 28 2010 Bill Nottingham - 9.02.2-1 +- fstab-decode.8: fix formatting (#586476) +- prefdm: add --retain-splash for KDM as well (#585250) +- fix german translation (#575954, ) +- init.d/network: only blacklist the original loopback interface. (#579816, ) +- rc.sysinit: check dmraid's return code, to catch 'no raid sets' error. (#568790) +- network-functions; use HWADDR to determine DEVICE, if necessary (#545597) + * Fri Dec 04 2009 Bill Nottingham - 9.02.1-1 - rc.sysinit: handle yet another random return string from dmraid - remove never-used 'sulogin' upstart event diff --git a/sources b/sources index f9b0bad..38c903b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -00f9591e57228279130f7764cdbb32ff initscripts-9.02.1.tar.bz2 +2de74287a37befae64fd7599bd650175 initscripts-9.02.2.tar.bz2 From 8aa27bd6ee9afb72d5ff7a1569ab65814ff59d86 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 18:17:21 +0000 Subject: [PATCH 8/8] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 6152ae2..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: initscripts -# $Id$ -NAME := initscripts -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12