update spec

3 files changed, 56 insertions, 62 deletions

diff --git a/Makefile b/Makefile
index 42756149..35c5eb15 100644
--- a/Makefile
+++ b/Makefile
@@ -11,8 +11,10 @@ all:
 	(cd src; make)
 	(make -C po)
 install:
+	mkdir -p $(ROOT)/etc
 	mkdir -p $(ROOT)/etc/profile.d $(ROOT)/sbin $(ROOT)/usr/sbin
 	mkdir -p $(ROOT)$(mandir)/man8
+
 	install -m644  inittab $(ROOT)/etc
 	if uname -m | grep -q s390 ; then \
 	  install -m644 inittab.s390 $(ROOT)/etc/inittab ; \
@@ -29,17 +31,15 @@ install:
 	  install -m644 sysctl.conf.sparc $(ROOT)/etc/sysctl.conf ; fi
 	if uname -m | grep -q s390 ; then \
 	  install -m644 sysctl.conf.s390 $(ROOT)/etc/sysctl.conf ; fi
+
 	mkdir -p $(ROOT)/etc/X11
 	install -m755 prefdm $(ROOT)/etc/X11/prefdm
-	mkdir -p $(ROOT)/etc/sysconfig
-	mkdir -p $(ROOT)/etc/sysconfig/console
-	install -m644 sysconfig/init $(ROOT)/etc/sysconfig/init
-	install -m644 sysconfig/rawdevices $(ROOT)/etc/sysconfig/rawdevices
+
 	cp -af rc.d sysconfig ppp $(ROOT)/etc
 	if uname -m | grep -q s390 ; then \
 	  install -m644 sysconfig/init.s390 $(ROOT)/etc/sysconfig/init ; \
 	fi
-	mkdir -p $(ROOT)/sbin
+
 	mv $(ROOT)/etc/sysconfig/network-scripts/ifup $(ROOT)/sbin
 	mv $(ROOT)/etc/sysconfig/network-scripts/ifdown $(ROOT)/sbin
 	(cd $(ROOT)/etc/sysconfig/network-scripts; \
@@ -47,9 +47,47 @@ install:
 	  ln -sf ../../../sbin/ifdown . )
 	(cd src; make install ROOT=$(ROOT) mandir=$(mandir))
 	(cd po ; make install PREFIX=$(ROOT))
+
+# Make sure locale stuff from initscripts goes in /usr/share/locale too
+	mkdir -p $(ROOT)/usr/share/locale
+	cp -a $(ROOT)/etc/locale/* $(ROOT)/usr/share/locale/
+
 	mkdir -p $(ROOT)/var/run/netreport
+	mkdir -p $(ROOT)/var/log
 	chown $(SUPERUSER).$(SUPERGROUP) $(ROOT)/var/run/netreport
-	chmod og=rwx,o=rx $(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
+
+	for i in 0 1 2 3 4 5 6 ; do \
+		dir=$(ROOT)/etc/rc.d/rc$$i.d; \
+	  	mkdir $$dir; \
+		chmod u=rwx,g=rx,o=rx $$dir; \
+	done
+
+# Can't store symlinks in a CVS archive
+	ln -s ../init.d/killall $(ROOT)/etc/rc.d/rc0.d/S00killall
+	ln -s ../init.d/killall $(ROOT)/etc/rc.d/rc6.d/S00killall
+
+	ln -s ../init.d/halt $(ROOT)/etc/rc.d/rc0.d/S01halt
+	ln -s ../init.d/halt $(ROOT)/etc/rc.d/rc6.d/S01reboot
+
+	ln -s ../init.d/single $(ROOT)/etc/rc.d/rc1.d/S00single
+
+	ln -s ../rc.local $(ROOT)/etc/rc.d/rc2.d/S99local
+	ln -s ../rc.local $(ROOT)/etc/rc.d/rc3.d/S99local
+	ln -s ../rc.local $(ROOT)/etc/rc.d/rc5.d/S99local
+
+# These are LSB compatibility symlinks.  At some point in the future
+# the actual files will be here instead of symlinks
+	for i in 0 1 2 3 4 5 6 ; do \
+		ln -s rc.d/rc$$i.d $(ROOT)/etc/rc$$i.d; \
+	done
+	for i in rc rc.sysinit rc.local ; do \
+		ln -s rc.d/$$i $(ROOT)/etc/$$i; \
+	done
+
+
 
 check:
 	for afile in `find . -type f -perm +111|grep -v \.csh | grep -v po/ ` ; do \
diff --git a/initscripts.spec b/initscripts.spec
index 15ad8fec..871ce9c8 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -12,6 +12,7 @@ Requires: setup >= 2.0.3, /sbin/fuser, which
 Requires: modutils >= 2.3.11-5
 Requires: util-linux >= 2.10s-11, mount >= 2.10r-5
 Requires: bash >= 2.0
+Requires: /sbin/ip
 Conflicts: kernel <= 2.2, timeconfig < 3.0, pppd < 2.3.9, wvdial < 1.40-3
 Conflicts: ypbind < 1.6-12
 Obsoletes: rhsound sapinit
@@ -33,63 +34,24 @@ make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/etc
 make ROOT=$RPM_BUILD_ROOT SUPERUSER=`id -un` SUPERGROUP=`id -gn` mandir=%{_mandir} install 
-mkdir -p $RPM_BUILD_ROOT/var/run/netreport
-#chown root.root $RPM_BUILD_ROOT/var/run/netreport
-chmod u=rwx,g=rwx,o=rx $RPM_BUILD_ROOT/var/run/netreport
-
-for i in 0 1 2 3 4 5 6 ; do
-  file=$RPM_BUILD_ROOT/etc/rc.d/rc$i.d
-  mkdir $file
-# chown root.root $file
-  chmod u=rwx,g=rx,o=rx $file
-done
-
-# Can't store symlinks in a CVS archive
-ln -s ../init.d/killall $RPM_BUILD_ROOT/etc/rc.d/rc0.d/S00killall
-ln -s ../init.d/killall $RPM_BUILD_ROOT/etc/rc.d/rc6.d/S00killall
-
-ln -s ../init.d/halt $RPM_BUILD_ROOT/etc/rc.d/rc0.d/S01halt
-ln -s ../init.d/halt $RPM_BUILD_ROOT/etc/rc.d/rc6.d/S01reboot
-
-ln -s ../init.d/single $RPM_BUILD_ROOT/etc/rc.d/rc1.d/S00single
-
-ln -s ../rc.local $RPM_BUILD_ROOT/etc/rc.d/rc2.d/S99local
-ln -s ../rc.local $RPM_BUILD_ROOT/etc/rc.d/rc3.d/S99local
-ln -s ../rc.local $RPM_BUILD_ROOT/etc/rc.d/rc5.d/S99local
-
-# These are LSB compatibility symlinks.  At some point in the future
-# the actual files will be here instead of symlinks
-for i in 0 1 2 3 4 5 6 ; do
-  ln -s rc.d/rc$i.d $RPM_BUILD_ROOT/etc/rc$i.d
-done
-for i in rc rc.sysinit rc.local ; do
-  ln -s rc.d/$i $RPM_BUILD_ROOT/etc/$i
-done
-
-mkdir -p $RPM_BUILD_ROOT/var/{log,run}
-touch $RPM_BUILD_ROOT/var/run/utmp
-touch $RPM_BUILD_ROOT/var/log/wtmp
-
-# Put this stuff in /usr/share/locale too
-mkdir -p $RPM_BUILD_ROOT/usr/share/locale
-cp -a $RPM_BUILD_ROOT/etc/locale/* $RPM_BUILD_ROOT/usr/share/locale/
 
+# build file list of locale stuff in with lang tags
 pushd %{buildroot}/%{_datadir}/locale
 for foo in * ; do
- echo  "%lang($foo) %{_datadir}/locale/$foo/*/*" >> \
-      $RPM_BUILD_DIR/%{name}-%{version}/trans.list
+	echo  "%lang($foo) %{_datadir}/locale/$foo/*/*" >> \
+	$RPM_BUILD_DIR/%{name}-%{version}/trans.list
 done
 popd
 
 pushd  %{buildroot}/etc/locale
 for foo in * ; do
-  echo "%lang($foo) /etc/locale/$foo/*/*" >> \
-      $RPM_BUILD_DIR/%{name}-%{version}/trans.list
+	echo "%lang($foo) /etc/locale/$foo/*/*" >> \
+	$RPM_BUILD_DIR/%{name}-%{version}/trans.list
 done
 popd
 
+
 %pre
 /usr/sbin/groupadd -g 22 -r -f utmp
 
@@ -107,7 +69,7 @@ chkconfig --add rawdevices
 # handle serial installs semi gracefully
 if [ $1 = 0 ]; then
   if [ "$TERM" = "vt100" ]; then
-      tmpfile=/etc/sysconfig/tmp.$$
+      tmpfile=`mktemp /etc/sysconfig/tmp.XXXXXX`
       sed -e '/BOOTUP=color/BOOTUP=serial/' /etc/sysconfig/init > $tmpfile
       mv -f $tmpfile /etc/sysconfig/init
   fi
@@ -194,10 +156,10 @@ rm -rf $RPM_BUILD_ROOT
 %config /sbin/ifup
 %dir /etc/sysconfig/console
 %config(noreplace) /etc/sysconfig/rawdevices
+%config /etc/sysconfig/networking/ifcfg-lo
 %config /etc/sysconfig/network-scripts/network-functions
 %config /etc/sysconfig/network-scripts/network-functions-ipv6
 %config /etc/sysconfig/network-scripts/ifup-post
-%config /etc/sysconfig/network-scripts/ifcfg-lo
 %config /etc/sysconfig/network-scripts/ifdown-ppp
 %config /etc/sysconfig/network-scripts/ifdown-sl
 %config /etc/sysconfig/network-scripts/ifup-ppp
@@ -256,6 +218,9 @@ rm -rf $RPM_BUILD_ROOT
 %ghost %attr(0664,root,utmp) /var/run/utmp
 
 %changelog
+* Fri May 11 2001 Preston Brown <pbrown@redhat.com>
+- new network-scripts infrastructure; ifcfg-lo moved to /etc/sysconfig/networking
+
 * Wed May  2 2001 Bernhard Rosenkraenzer <bero@redhat.com> 5.86-1
 - support kbd in setsysfont
 - bzip2 source
diff --git a/sysconfig/network-scripts/ifcfg-lo b/sysconfig/network-scripts/ifcfg-lo
deleted file mode 100644
index cb4f3f94..00000000
--- a/sysconfig/network-scripts/ifcfg-lo
+++ /dev/null
@@ -1,9 +0,0 @@
-DEVICE=lo
-IPADDR=127.0.0.1
-NETMASK=255.0.0.0
-NETWORK=127.0.0.0
-# If you're having problems with gated making 127.0.0.0/8 a martian,
-# you can change this to something else (255.255.255.255, for example)
-BROADCAST=127.255.255.255
-ONBOOT=yes
-NAME=loopback