aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2006-04-10 18:52:57 +0000
committerBill Nottingham <notting@redhat.com>2006-04-10 18:52:57 +0000
commit8d63b86b08ca3eb8445fa57766e662d6393f3a70 (patch)
tree6599931c09b18097c528ecd331dbead7777082b9
parent4889957e4c7de9be5960c02401b105d42ee4334a (diff)
downloadinitscripts-8d63b86b08ca3eb8445fa57766e662d6393f3a70.tar
initscripts-8d63b86b08ca3eb8445fa57766e662d6393f3a70.tar.gz
initscripts-8d63b86b08ca3eb8445fa57766e662d6393f3a70.tar.bz2
initscripts-8d63b86b08ca3eb8445fa57766e662d6393f3a70.tar.xz
initscripts-8d63b86b08ca3eb8445fa57766e662d6393f3a70.zip
apply changes from FC5 branch - automatically rename devices on startup
-rw-r--r--initscripts.spec10
-rw-r--r--src/Makefile8
-rw-r--r--udev/rules.d/60-net.rules1
3 files changed, 16 insertions, 3 deletions
diff --git a/initscripts.spec b/initscripts.spec
index ff65b361..34ddb034 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -1,6 +1,6 @@
Summary: The inittab file and the /etc/init.d scripts.
Name: initscripts
-Version: 8.31
+Version: 8.31.2
License: GPL
Group: System Environment/Base
Release: 1
@@ -189,6 +189,7 @@ rm -rf $RPM_BUILD_ROOT
/sbin/getkey
%attr(2755,root,root) /sbin/netreport
/sbin/initlog
+/lib/udev/rename_device
/sbin/service
/sbin/ppp-watch
%{_mandir}/man*/*
@@ -208,6 +209,13 @@ rm -rf $RPM_BUILD_ROOT
%ghost %attr(0664,root,utmp) /var/run/utmp
%changelog
+* Fri Mar 17 2006 Bill Nottingham <notting@redhat.com> 8.31.2-1
+- add udev helper to rename network devices on device creation
+
+* Tue Mar 14 2006 Bill Nottingham <notting@redhat.com> 8.31.1-1
+- fix context of /dev/pts (#185436)
+- translation updates
+
* Sun Mar 5 2006 Bill Nottingham <notting@redhat.com> 8.31-1
- fix kexec support (<jmoyer@redhat.com>)
- translation updates
diff --git a/src/Makefile b/src/Makefile
index c691870b..78276fad 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,7 +1,7 @@
CFLAGS+=$(RPM_OPT_FLAGS) -Wall -D_GNU_SOURCE
PROGS=usernetctl doexec netreport testd usleep ipcalc initlog \
- getkey ppp-watch consoletype genhostid
+ getkey ppp-watch consoletype genhostid rename_device
PPPWATCH_OBJS=ppp-watch.o shvar.o
INITLOG_OBJS=initlog.o process.o
USLEEP_OBJS=usleep.o
@@ -14,7 +14,7 @@ clean:
rm -f $(PROGS) *.o
install:
- mkdir -p $(ROOT)/bin $(ROOT)/usr/sbin $(ROOT)$(mandir)/man{1,8} $(ROOT)/etc
+ mkdir -p $(ROOT)/bin $(ROOT)/usr/sbin $(ROOT)$(mandir)/man{1,8} $(ROOT)/etc $(ROOT)/lib/udev
install -m 755 doexec $(ROOT)/bin/doexec
install -m 755 usleep $(ROOT)/bin/usleep
install -m 4755 usernetctl $(ROOT)/usr/sbin/usernetctl
@@ -25,6 +25,7 @@ install:
install -m 755 getkey $(ROOT)/sbin/getkey
install -m 755 ppp-watch $(ROOT)/sbin/ppp-watch
install -m 755 consoletype $(ROOT)/sbin/consoletype
+ install -m 755 rename_device $(ROOT)/lib/udev/rename_device
install -m 644 initlog.1 $(ROOT)$(mandir)/man1
install -m 644 genhostid.1 $(ROOT)$(mandir)/man1
install -m 644 doexec.1 $(ROOT)$(mandir)/man1
@@ -70,5 +71,8 @@ shvar.o: shvar.c
ppp-watch.o: ppp-watch.c
$(CC) $(CFLAGS) `pkg-config glib-2.0 --cflags` -c ppp-watch.c -o ppp-watch.o
+rename_device: rename_device.c
+ $(CC) $(CFLAGS) `pkg-config glib-2.0 --cflags` -o $@ $< -Wl,-Bstatic `pkg-config glib-2.0 --libs` -Wl,-Bdynamic
+
kmodule: kmodule.o
$(CC) $(LDFLAGS) -o $@ $< -Wl,-Bstatic -lpopt -Wl,-Bdynamic -lkudzu -lpci
diff --git a/udev/rules.d/60-net.rules b/udev/rules.d/60-net.rules
index ca0b3967..e023edad 100644
--- a/udev/rules.d/60-net.rules
+++ b/udev/rules.d/60-net.rules
@@ -1 +1,2 @@
+ACTION=="add", SUBSYSTEM=="net", IMPORT{program}="/lib/udev/rename_device"
SUBSYSTEM=="net", RUN+="/etc/sysconfig/network-scripts/net.hotplug"