This commit is contained in:
Bill Nottingham 2011-01-21 11:46:43 -05:00
parent d9d8eefc2e
commit 8f1827e3d3
6 changed files with 18 additions and 171 deletions

1
.gitignore vendored
View File

@ -6,3 +6,4 @@ initscripts-9.16.tar.bz2
/initscripts-9.21.tar.bz2 /initscripts-9.21.tar.bz2
/initscripts-9.22.tar.bz2 /initscripts-9.22.tar.bz2
/initscripts-9.23.tar.bz2 /initscripts-9.23.tar.bz2
/initscripts-9.24.tar.bz2

View File

@ -1,25 +0,0 @@
From 30df66aeada5bf7987c31443f02d624bf0ef9215 Mon Sep 17 00:00:00 2001
From: Matt Domsch <Matt_Domsch@dell.com>
Date: Fri, 17 Dec 2010 09:54:29 -0600
Subject: [PATCH] add # as a valid character in network device names
---
rc.d/init.d/network | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/rc.d/init.d/network b/rc.d/init.d/network
index 482bb7b..b31060b 100755
--- a/rc.d/init.d/network
+++ b/rc.d/init.d/network
@@ -46,7 +46,7 @@ cd /etc/sysconfig/network-scripts
interfaces=$(ls ifcfg* | \
LANG=C sed -e "$__sed_discard_ignored_files" \
-e '/\(ifcfg-lo$\|:\|ifcfg-.*-range\)/d' \
- -e '/ifcfg-[A-Za-z0-9\._-]\+$/ { s/^ifcfg-//g;s/[0-9]/ &/}' | \
+ -e '/ifcfg-[A-Za-z0-9#\._-]\+$/ { s/^ifcfg-//g;s/[0-9]/ &/}' | \
LANG=C sort -k 1,1 -k 2n | \
LANG=C sed 's/ //')
rc=0
--
1.7.3.3

View File

@ -1,120 +0,0 @@
commit 48da8e510bca624516172aa144b48a850f0e4ac9
Author: Bill Nottingham <notting@redhat.com>
Date: Tue Nov 16 22:18:58 2010 -0500
Don't use our crypto init ; systemd handles this.
diff --git a/systemd/fedora-init-crypto b/systemd/fedora-init-crypto
deleted file mode 100755
index 79d18be..0000000
--- a/systemd/fedora-init-crypto
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. /etc/init.d/functions
-
-init_crypto $1 || :
diff --git a/systemd/fedora-storage-init b/systemd/fedora-storage-init
index 0e3a417..b01a465 100755
--- a/systemd/fedora-storage-init
+++ b/systemd/fedora-storage-init
@@ -36,5 +36,3 @@ fi
if [ -x /sbin/lvm ]; then
action $"Setting up Logical Volume Management:" /sbin/lvm vgchange -a y --sysinit
fi
-
-[ -f /etc/crypttab ] && init_crypto 0
diff --git a/systemd/system/fedora-autoswap.service b/systemd/system/fedora-autoswap.service
index 8cd881d..d7f667d 100644
--- a/systemd/system/fedora-autoswap.service
+++ b/systemd/system/fedora-autoswap.service
@@ -3,8 +3,8 @@ Description=Enable all detected swap partitions
DefaultDependencies=no
Conflicts=shutdown.target
Before=shutdown.target emergency.service emergency.target
-After=local-fs.target fedora-init-crypto-3.service
-Requires=local-fs.target fedora-init-crypto-3.service
+After=local-fs.target
+Requires=local-fs.target
[Service]
ExecStart=/lib/systemd/fedora-autoswap
diff --git a/systemd/system/fedora-init-crypto-1.service b/systemd/system/fedora-init-crypto-1.service
deleted file mode 100644
index 6d6b732..0000000
--- a/systemd/system/fedora-init-crypto-1.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Initialize encrypted storage
-DefaultDependencies=no
-Conflicts=shutdown.target
-Before=shutdown.target emergency.service emergency.target
-After=fedora-wait-storage.service
-Requires=fedora-wait-storage.service
-ConditionPathExists=/etc/crypttab
-
-[Service]
-ExecStart=/lib/systemd/fedora-init-crypto 0
-Type=oneshot
-TimeoutSec=0
-RemainAfterExit=yes
-StandardInput=tty
diff --git a/systemd/system/fedora-init-crypto-2.service b/systemd/system/fedora-init-crypto-2.service
deleted file mode 100644
index c01bbd1..0000000
--- a/systemd/system/fedora-init-crypto-2.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Initialize encrypted filesystems on top of other storage
-DefaultDependencies=no
-Conflicts=shutdown.target
-Before=shutdown.target emergency.service emergency.target
-After=fedora-storage-init.service
-Requires=fedora-storage-init.service
-ConditionPathExists=/etc/crypttab
-
-[Service]
-ExecStart=/lib/systemd/fedora-init-crypto 0
-Type=oneshot
-TimeoutSec=0
-RemainAfterExit=yes
-StandardInput=tty
diff --git a/systemd/system/fedora-init-crypto-3.service b/systemd/system/fedora-init-crypto-3.service
deleted file mode 100644
index 84b11fd..0000000
--- a/systemd/system/fedora-init-crypto-3.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Initialize encrypted filesystems on top of other storage
-DefaultDependencies=no
-Conflicts=shutdown.target
-Before=shutdown.target emergency.service emergency.target
-After=systemd-random-seed-load.service
-Requires=systemd-random-seed-load.service
-ConditionPathExists=/etc/crypttab
-
-[Service]
-ExecStart=/lib/systemd/fedora-init-crypto 1
-Type=oneshot
-TimeoutSec=0
-RemainAfterExit=yes
-StandardInput=tty
diff --git a/systemd/system/fedora-storage-init.service b/systemd/system/fedora-storage-init.service
index 2806c2d..bd8e02f 100644
--- a/systemd/system/fedora-storage-init.service
+++ b/systemd/system/fedora-storage-init.service
@@ -3,8 +3,8 @@ Description=Initialize storage subsystems (RAID, LVM, etc.)
DefaultDependencies=no
Conflicts=shutdown.target
Before=shutdown.target local-fs.target emergency.service emergency.target
-After=fedora-wait-storage.service fedora-init-crypto-1.service
-Requires=fedora-wait-storage.service fedora-init-crypto-1.service
+After=fedora-wait-storage.service
+Requires=fedora-wait-storage.service
[Service]
ExecStart=/lib/systemd/fedora-storage-init

13
diff
View File

@ -1,13 +0,0 @@
diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth
index dd9fb5e..326eba1 100755
--- a/sysconfig/network-scripts/ifup-eth
+++ b/sysconfig/network-scripts/ifup-eth
@@ -275,7 +275,7 @@ else
# Set a default route.
if [ "${DEFROUTE}" != "no" ] && [ -z "${GATEWAYDEV}" -o "${GATEWAYDEV}" = "${REALDEVICE}" ]; then
# set up default gateway. replace if one already exists
- if [ -n "${GATEWAY}" ] && [ "$(ipcalc --network ${GATEWAY} ${NETMASK} 2>/dev/null)" = "NETWORK=${NETWORK}" ]; then
+ if [ -n "${GATEWAY}" ] && [ "$(ipcalc --network ${GATEWAY} ${netmask[0]} 2>/dev/null)" = "NETWORK=${NETWORK}" ]; then
ip route replace default ${METRIC:+metric $METRIC} \
via ${GATEWAY} ${WINDOW:+window $WINDOW} ${SRC} \
${GATEWAYDEV:+dev $GATEWAYDEV}

View File

@ -4,11 +4,11 @@
Summary: The inittab file and the /etc/init.d scripts Summary: The inittab file and the /etc/init.d scripts
Name: initscripts Name: initscripts
Version: 9.23 Version: 9.24
# ppp-watch is GPLv2+, everything else is GPLv2 # ppp-watch is GPLv2+, everything else is GPLv2
License: GPLv2 and GPLv2+ License: GPLv2 and GPLv2+
Group: System Environment/Base Group: System Environment/Base
Release: 3%{?dist} Release: 1%{?dist}
URL: http://fedorahosted.org/releases/i/n/initscripts/ URL: http://fedorahosted.org/releases/i/n/initscripts/
Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2 Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@ -60,9 +60,6 @@ Requires(post): /sbin/chkconfig, coreutils
Requires(preun): /sbin/chkconfig Requires(preun): /sbin/chkconfig
BuildRequires: glib2-devel popt-devel gettext pkgconfig BuildRequires: glib2-devel popt-devel gettext pkgconfig
Patch0: diff
Patch1: 0001-add-as-a-valid-character-in-network-device-names.patch
%description %description
The initscripts package contains the basic system scripts used to boot The initscripts package contains the basic system scripts used to boot
your Red Hat or Fedora system, change runlevels, and shut the system down your Red Hat or Fedora system, change runlevels, and shut the system down
@ -91,8 +88,6 @@ Currently, this consists of various memory checking code.
%prep %prep
%setup -q %setup -q
%patch0 -p1
%patch1 -p1
%build %build
make make
@ -129,6 +124,8 @@ rm -f \
$RPM_BUILD_ROOT/etc/sysconfig/init.s390 $RPM_BUILD_ROOT/etc/sysconfig/init.s390
%endif %endif
touch $RPM_BUILD_ROOT/etc/crypttab
%pre %pre
/usr/sbin/groupadd -g 22 -r -f utmp /usr/sbin/groupadd -g 22 -r -f utmp
@ -290,6 +287,7 @@ rm -rf $RPM_BUILD_ROOT
%ghost %attr(0600,root,utmp) /var/log/btmp %ghost %attr(0600,root,utmp) /var/log/btmp
%ghost %attr(0664,root,utmp) /var/log/wtmp %ghost %attr(0664,root,utmp) /var/log/wtmp
%ghost %attr(0664,root,utmp) /var/run/utmp %ghost %attr(0664,root,utmp) /var/run/utmp
%ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/crypttab
%dir /etc/tmpfiles.d %dir /etc/tmpfiles.d
/etc/tmpfiles.d/initscripts.conf /etc/tmpfiles.d/initscripts.conf
@ -314,11 +312,17 @@ rm -rf $RPM_BUILD_ROOT
/etc/profile.d/debug* /etc/profile.d/debug*
%changelog %changelog
* Fri Dec 17 2010 Bill Nottingham <notting@redhat.com> - 9.23-3 * Fri Jan 21 2010 Bill Nottingham <notting@redhat.com> - 9.24-1
- accept '#' in ethernet device names (#663904, <matt_domsch@dell.com>) - ifup-eth/ifdown-eth: handle 'MASTER' being quoted. (#651450, <gfidente@redhat.com>)
- tmpfiles.d: remove entries that exist in systemd
* Mon Dec 06 2010 Bill Nottingham <notting@redhat.com> - 9.23-2 - frob device when calling sysctl, in case of vlans. (#665601, #667211, <ossman@cendio.se>)
- fix routing regression (#660363) - netfs: rework to handle bind-mounted cifs/ncpfs (#663140, <dmudrich@nospam.mudrichsystems.com>)
- own /etc/crypttab (#664309)
- init.d/network: add # as a valid character in network device names (<Matt_Domsch@dell.com>)
- ifup-eth: fix routing regression (#660363)
- sysctl.conf.s390 - system z optimized sysctl settings per default (#633323, <plautrba@redhat.com>)
- serial.conf, tty.conf: stop tty and serial also on runlevel 's' (#629257, <plautrba@redhat.com>)
- translation updates: bn_IN, es, gu, hi, nds, or, pa, uk, zh_CN
* Thu Dec 02 2010 Bill Nottingham <notting@redhat.com> - 9.23-1 * Thu Dec 02 2010 Bill Nottingham <notting@redhat.com> - 9.23-1
- don't throw errors on unreadable /dev/stderr (#650103, <plautrba@redhat.com>) - don't throw errors on unreadable /dev/stderr (#650103, <plautrba@redhat.com>)

View File

@ -1 +1 @@
bb012b5945caaa5fcf3268188af94337 initscripts-9.23.tar.bz2 435f176a962d45c320bd510d7ed9436a initscripts-9.24.tar.bz2