diff options
| -rw-r--r-- | .cvsignore | 1 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | initscripts.spec | 6 | ||||
| -rw-r--r-- | sysconfig/network-scripts/network-functions | 1 |
4 files changed, 4 insertions, 6 deletions
diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 9fca2a13..00000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -initscripts*.tar.gz @@ -139,7 +139,7 @@ clean: @rm -fv *~ changenew ChangeLog.old *gz tag: - @git tag -a -m "Tag as $(TAG)" $(TAG) + @git tag -a -f -m "Tag as $(TAG)" $(TAG) @echo "Tagged as $(TAG)" archive: clean check tag changelog diff --git a/initscripts.spec b/initscripts.spec index e456b55d..cf260b61 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -200,7 +200,7 @@ rm -rf $RPM_BUILD_ROOT /etc/rc.d/rc.sysinit %config(noreplace) /etc/sysctl.conf %exclude /etc/profile.d/debug* -%config /etc/profile.d/* +/etc/profile.d/* /usr/sbin/sys-unconfig /sbin/setsysfont /bin/doexec @@ -247,12 +247,12 @@ rm -rf $RPM_BUILD_ROOT %files -n debugmode %defattr(-,root,root) %config(noreplace) /etc/sysconfig/debug -%config /etc/profile.d/debug* +/etc/profile.d/debug* %changelog * Tue Sep 30 2008 Bill Nottingham <notting@redhat.com> - 8.83-1 - various merge review fixes (#225900) - Notably: init scripts/network scripts are no longer %config + Notably: init scripts/network scripts are no longer %%config - remove some extraneous device-mapper initialization - use pidfile in status before calling pidof (#463205) - use plymouth directly, not the rhgb-client wrapper diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions index f28831a6..24153485 100644 --- a/sysconfig/network-scripts/network-functions +++ b/sysconfig/network-scripts/network-functions @@ -208,7 +208,6 @@ END { if [ -z "$curdev" ]; then return 1 fi - rename_device "$1" "$HWADDR" "$curdev" fi if [ ${alias} == "bonding" ]; then |