From e5985217bd7415b7cc231e176efc67dc05dcabc1 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 7 Nov 2008 05:21:05 +0000 Subject: [PATCH 1/7] Initialize branch F-10 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..dc32377 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-10 From 36edc5bb2fb8f41c0d8e632e1ab786478e6a9890 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 11 Nov 2008 16:52:59 +0000 Subject: [PATCH 2/7] 8.86-1 --- .cvsignore | 2 +- initscripts.spec | 8 +++++++- sources | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index f9d804a..33b5f87 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-8.85.tar.bz2 +initscripts-8.86.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 260bd8a..c3889a4 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.85 +Version: 8.86 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -250,6 +250,12 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Tue Nov 11 2008 Bill Nottingham - 8.86-1 +- stop plymouth before stopping the runlevel (#467207) +- fix get_config_by_subchannel (#459044, ) +- use blkid -l to pick a single most appropriate device (#470027) +- don't mkswap on halt, as it breaks swap-by-label/UUID (#469823) + * Fri Oct 31 2008 Bill Nottingham - 8.85-1 - add some error handling/hiding to netfs NM dispatcher script (#469197) - halt: fix code that causes a syntax error on multiple sound cards (#469156) diff --git a/sources b/sources index 20b8633..64e4221 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1b7863eca343cc9eb54ef86182b36422 initscripts-8.85.tar.bz2 +0d1fa303855d2bed43d0ccc9784fd35e initscripts-8.86.tar.bz2 From 81cf343efc6fcc42397a53e498e4a68daa858427 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 2 Apr 2009 17:54:02 +0000 Subject: [PATCH 3/7] 8.86.1-1 --- .cvsignore | 2 +- initscripts.spec | 25 +++++++++++++++++++++++-- sources | 2 +- 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 33b5f87..0e03035 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-8.86.tar.bz2 +initscripts-8.86.1.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index c3889a4..01e4b4b 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.86 +Version: 8.86.1 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -142,7 +142,7 @@ rm -rf $RPM_BUILD_ROOT /etc/sysconfig/network-scripts/network-functions /etc/sysconfig/network-scripts/network-functions-ipv6 /etc/sysconfig/network-scripts/init.ipv6-global -/etc/sysconfig/network-scripts/ifcfg-lo +%config(noreplace) /etc/sysconfig/network-scripts/ifcfg-lo /etc/sysconfig/network-scripts/ifup-ipx /etc/sysconfig/network-scripts/ifup-post /etc/sysconfig/network-scripts/ifdown-ppp @@ -250,6 +250,27 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Thu Apr 2 2009 Bill Nottingham - 8.86.1-1 +- rc.sysinit: add a disk synchronization point with scsi_wait_scan post-udev (#481470) +- setsysfont: honor LC_CTYPE (#487133, ) +- prefdm: do fallbacks based on provides of 'service(graphical-login)' (#485751) +- rc.sysinit: catch the right error code from checking for passphrases (#483269, ) +- prefdm: handle empty /etc/sysconfig/desktop correctly (#480113) +- ifup-eth: fix dhcpv6 when there is no IPv4 configuration (#486507) +- bring up ipsec interfaces last (#481733) +- ifdown-eth: fix bridge + vlan (#481557, ) +- init.d/halt: determine reboot/halt via existing INIT_HALT environment variable. (#475227) +- rc.sysinit: fix typo. (#487926) +- fix switching from targeted to MLS policy (#479054, ) +- network-functions-ipv6: set MTU correctly for 6to4. (#477976, ) +- add more entries to rwtab (#476799, ) +- rc.sysinit: remove /.suspended as well on boot (#270861) +- add %config back for ifcfg-lo (#472761) +- remove support for no longer existing 'brctl setgcint' command. (#360471) +- rcS/rcS-sulogin: don't match commented lines when finding runlevel (#472717) +- sysconfig.txt: add some docs on BONDING_OPTS +- lang.sh: ignore return code from consoletype (#471123) + * Tue Nov 11 2008 Bill Nottingham - 8.86-1 - stop plymouth before stopping the runlevel (#467207) - fix get_config_by_subchannel (#459044, ) diff --git a/sources b/sources index 64e4221..d4aa18e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0d1fa303855d2bed43d0ccc9784fd35e initscripts-8.86.tar.bz2 +768b1b306565be9a04bed1fdb6748752 initscripts-8.86.1.tar.bz2 From de6cffda450d9fae6a9b4b248ea2ff033256b78a Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 2 Apr 2009 19:45:19 +0000 Subject: [PATCH 4/7] 8.86.2-1 --- .cvsignore | 2 +- initscripts.spec | 4 ++-- sources | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0e03035..52e8815 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-8.86.1.tar.bz2 +initscripts-8.86.2.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 01e4b4b..09a390e 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.86.1 +Version: 8.86.2 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -250,7 +250,7 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog -* Thu Apr 2 2009 Bill Nottingham - 8.86.1-1 +* Thu Apr 2 2009 Bill Nottingham - 8.86.2-1 - rc.sysinit: add a disk synchronization point with scsi_wait_scan post-udev (#481470) - setsysfont: honor LC_CTYPE (#487133, ) - prefdm: do fallbacks based on provides of 'service(graphical-login)' (#485751) diff --git a/sources b/sources index d4aa18e..bfaa559 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -768b1b306565be9a04bed1fdb6748752 initscripts-8.86.1.tar.bz2 +2e5cfb10c089109e21b6cea9030abc37 initscripts-8.86.2.tar.bz2 From 5d3fc46c08d8173431c9cc1486d264c2c2f3b932 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 7 Apr 2009 16:00:17 +0000 Subject: [PATCH 5/7] 8.86.3-1 --- .cvsignore | 2 +- initscripts.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 52e8815..b3089af 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -initscripts-8.86.2.tar.bz2 +initscripts-8.86.3.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 09a390e..dedebd6 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.86.2 +Version: 8.86.3 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -250,6 +250,10 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Tue Apr 7 2009 Bill Nottingham - 8.86.3-1 +- prefdm: add simple fallbacks, sort rpmdb query for consistency (#494461) +- backport accidentally missed fix for #480799 + * Thu Apr 2 2009 Bill Nottingham - 8.86.2-1 - rc.sysinit: add a disk synchronization point with scsi_wait_scan post-udev (#481470) - setsysfont: honor LC_CTYPE (#487133, ) diff --git a/sources b/sources index bfaa559..15bfcb2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2e5cfb10c089109e21b6cea9030abc37 initscripts-8.86.2.tar.bz2 +da1e426570cbb80c95dfe8ba182137d9 initscripts-8.86.3.tar.bz2 From 80283a3104d0ec87f650d687afe7b8367ed8ec6b Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 28 Oct 2009 02:54:28 +0000 Subject: [PATCH 6/7] 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 5256b0aba351b2a2838473553ac2dfc3d9f488ab Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 18:17:32 +0000 Subject: [PATCH 7/7] 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 dc32377..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-10