diff options
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | examples/networking/ifcfg-bridge | 2 | ||||
| -rw-r--r-- | initscripts.spec | 39 | ||||
| -rw-r--r-- | inittab | 17 | ||||
| -rw-r--r-- | ipv6-6to4.howto | 2 | ||||
| -rw-r--r-- | sysctl.conf.README | 4 |
6 files changed, 15 insertions, 55 deletions
@@ -20,7 +20,6 @@ install: mkdir -p $(ROOT)/var/lib/stateless/state install -m644 adjtime $(ROOT)/etc - install -m644 inittab $(ROOT)/etc install -m644 rwtab statetab networks $(ROOT)/etc install -m755 service $(ROOT)/usr/sbin install -m644 lang.csh $(ROOT)/etc/profile.d/10lang.csh @@ -37,8 +36,6 @@ install: install -m644 sysctl.conf.sparc $(ROOT)/usr/lib/sysctl.d/00-system.conf ; fi if uname -m | grep -q s390 ; then \ install -m644 sysctl.conf.s390 $(ROOT)/usr/lib/sysctl.d/00-system.conf ; fi - install -m 644 sysctl.conf.README $(ROOT)/etc/sysctl.conf - ln -s ../sysctl.conf $(ROOT)/etc/sysctl.d/99-sysctl.conf mkdir -p $(ROOT)/etc/X11 install -m755 prefdm $(ROOT)/etc/X11/prefdm @@ -81,9 +78,6 @@ install: mkdir -p $(ROOT)/var/run/netreport $(ROOT)/var/log chown $(SUPERUSER):$(SUPERGROUP) $(ROOT)/var/run/netreport chmod u=rwx,g=rwx,o=rx $(ROOT)/var/run/netreport - touch $(ROOT)/var/run/utmp - touch $(ROOT)/var/log/wtmp - touch $(ROOT)/var/log/btmp for i in 0 1 2 3 4 5 6 ; do \ dir=$(ROOT)/etc/rc.d/rc$$i.d; \ diff --git a/examples/networking/ifcfg-bridge b/examples/networking/ifcfg-bridge index 6086b310..346f6338 100644 --- a/examples/networking/ifcfg-bridge +++ b/examples/networking/ifcfg-bridge @@ -8,5 +8,5 @@ TYPE=Bridge IPADDR=192.168.1.1 NETMASK=255.255.255.0 ONBOOT=yes -BOOTPROTO=static +BOOTPROTO=none DELAY=0 diff --git a/initscripts.spec b/initscripts.spec index 3ca25bf1..e75d5bcb 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,6 +1,6 @@ -Summary: The inittab file and the /etc/init.d scripts +Summary: Scripts to bring up network interfaces and legacy utilities Name: initscripts -Version: 9.56 +Version: 9.58 License: GPLv2 Group: System Environment/Base Release: 1%{?dist} @@ -35,19 +35,17 @@ BuildRequires: glib2-devel popt-devel gettext pkgconfig Provides: /sbin/service %description -The initscripts package contains the basic system scripts used to boot -your Red Hat or Fedora system, change runlevels, and shut the system down -cleanly. Initscripts also contains the scripts that activate and -deactivate most network interfaces. +This package contains the script that activates and deactivates most +network interfaces, some utilities, and other legacy files. %package -n debugmode -Summary: Scripts for running in debugging mode +Summary: Scripts for running in debug mode Requires: initscripts Group: System Environment/Base %description -n debugmode The debugmode package contains some basic scripts that are used to run -the system in a debugging mode. +the system in a debug mode. Currently, this consists of various memory checking code. @@ -71,22 +69,11 @@ rm -f \ $RPM_BUILD_ROOT/etc/sysconfig/init.s390 %endif -touch $RPM_BUILD_ROOT/etc/crypttab -chmod 600 $RPM_BUILD_ROOT/etc/crypttab - rm -f $RPM_BUILD_ROOT/etc/rc.d/rc.local $RPM_BUILD_ROOT/etc/rc.local touch $RPM_BUILD_ROOT/etc/rc.d/rc.local chmod 755 $RPM_BUILD_ROOT/etc/rc.d/rc.local -%pre -/usr/sbin/groupadd -g 22 -r -f utmp - %post -touch /var/log/wtmp /var/run/utmp /var/log/btmp -chown root:utmp /var/log/wtmp /var/run/utmp /var/log/btmp -chmod 664 /var/log/wtmp /var/run/utmp -chmod 600 /var/log/btmp - /usr/sbin/chkconfig --add network /usr/sbin/chkconfig --add netconsole if [ $1 -eq 1 ]; then @@ -161,16 +148,13 @@ rm -rf $RPM_BUILD_ROOT %dir /etc/statetab.d /usr/lib/systemd/fedora-* /usr/lib/systemd/system/* -/etc/inittab %dir /etc/rc.d %dir /etc/rc.d/rc[0-9].d /etc/rc[0-9].d %dir /etc/rc.d/init.d /etc/rc.d/init.d/* %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/rc.d/rc.local -%config(noreplace) /etc/sysctl.conf /usr/lib/sysctl.d/00-system.conf -/etc/sysctl.d/99-sysctl.conf %exclude /etc/profile.d/debug* /etc/profile.d/* /usr/sbin/sys-unconfig @@ -194,10 +178,6 @@ rm -rf $RPM_BUILD_ROOT %{!?_licensedir:%global license %%doc} %license COPYING /var/lib/stateless -%ghost %attr(0600,root,utmp) /var/log/btmp -%ghost %attr(0664,root,utmp) /var/log/wtmp -%ghost %attr(0664,root,utmp) /var/run/utmp -%ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/crypttab %dir /usr/lib/tmpfiles.d /usr/lib/tmpfiles.d/initscripts.conf %dir /usr/libexec/initscripts @@ -209,6 +189,13 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Thu Nov 06 2014 Lukáš Nykrýn <lnykryn@redhat.com> - 9.58-1 +- ifup,vlan: fix typo +- doc: be consistent and use BOOTPROTO=none + +* Tue Oct 07 2014 Zbigniew Jędrzejewski-Szmek - 9.57 +- Remove /etc/inittab, /etc/crypttab, utmp, wtmp, btmp + * Tue Oct 07 2014 Lukáš Nykrýn <lnykryn@redhat.com> - 9.56-1 - network_function: return immediately when device is pres ent diff --git a/inittab b/inittab deleted file mode 100644 index 57458d08..00000000 --- a/inittab +++ /dev/null @@ -1,17 +0,0 @@ -# inittab is no longer used when using systemd. -# -# ADDING CONFIGURATION HERE WILL HAVE NO EFFECT ON YOUR SYSTEM. -# -# Ctrl-Alt-Delete is handled by /usr/lib/systemd/system/ctrl-alt-del.target -# -# systemd uses 'targets' instead of runlevels. By default, there are two main targets: -# -# multi-user.target: analogous to runlevel 3 -# graphical.target: analogous to runlevel 5 -# -# To view current default target, run: -# systemctl get-default -# -# To set a default target, run: -# systemctl set-default TARGET.target -# diff --git a/ipv6-6to4.howto b/ipv6-6to4.howto index f388ba2e..131f4ce4 100644 --- a/ipv6-6to4.howto +++ b/ipv6-6to4.howto @@ -66,7 +66,7 @@ Now, set up the configuration as follows: /etc/sysconfig/network-scripts/ifcfg-eth0: --- DEVICE=eth0 -BOOTPROTO=static +BOOTPROTO=none ONBOOT=yes IPADDR=xx.yy.zz.ww [Globally unique IPv4 address] NETMASK=aa.bb.cc.dd [IPv4 settings up to this point] diff --git a/sysctl.conf.README b/sysctl.conf.README deleted file mode 100644 index 24cfe007..00000000 --- a/sysctl.conf.README +++ /dev/null @@ -1,4 +0,0 @@ -# System default settings live in /usr/lib/sysctl.d/00-system.conf. -# To override those settings, enter new settings here, or in an /etc/sysctl.d/<name>.conf file -# -# For more information, see sysctl.conf(5) and sysctl.d(5). |