diff options
| -rw-r--r-- | initscripts.spec | 6 | ||||
| -rw-r--r-- | src/Makefile | 1 | ||||
| -rwxr-xr-x | src/ccw_init | 43 | ||||
| -rw-r--r-- | udev/rules.d/55-ccw.rules | 9 |
4 files changed, 1 insertions, 58 deletions
diff --git a/initscripts.spec b/initscripts.spec index ee4b6fad..978f5ffd 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -36,6 +36,7 @@ Conflicts: tcsh < 6.13-5 Conflicts: xorg-x11, glib2 < 2.11.1-2 Conflicts: alsa-utils < 1.0.18 Conflicts: plymouth < 0.7.0-0.2009.02.26 +Conflicts: s390utils < 2:1.8.2-11 # http://bugzilla.redhat.com/show_bug.cgi?id=252973 Conflicts: nut < 2.2.0 Obsoletes: hotplug @@ -84,8 +85,6 @@ rm -f $RPM_BUILD_ROOT/etc/inittab.* %ifnarch s390 s390x rm -f \ $RPM_BUILD_ROOT/etc/sysconfig/network-scripts/ifup-ctc \ - $RPM_BUILD_ROOT/lib/udev/rules.d/55-ccw.rules \ - $RPM_BUILD_ROOT/lib/udev/ccw_init %else rm -f \ $RPM_BUILD_ROOT/etc/rc.d/rc.sysinit.s390init \ @@ -212,9 +211,6 @@ rm -rf $RPM_BUILD_ROOT /lib/udev/rename_device /lib/udev/console_init /lib/udev/console_check -%ifarch s390 s390x -/lib/udev/ccw_init -%endif /sbin/service /sbin/ppp-watch %{_mandir}/man*/* diff --git a/src/Makefile b/src/Makefile index 767fe1ce..091c8a61 100644 --- a/src/Makefile +++ b/src/Makefile @@ -32,7 +32,6 @@ install: install -m 755 rename_device $(ROOT)/lib/udev/rename_device install -m 755 console_init $(ROOT)/lib/udev/console_init install -m 755 console_check $(ROOT)/lib/udev/console_check - install -m 755 ccw_init $(ROOT)/lib/udev/ccw_init install -m 644 genhostid.1 $(ROOT)$(mandir)/man1 install -m 644 getkey.1 $(ROOT)$(mandir)/man1 install -m 644 netreport.1 $(ROOT)$(mandir)/man1 diff --git a/src/ccw_init b/src/ccw_init deleted file mode 100755 index a5009b47..00000000 --- a/src/ccw_init +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash - -[ -z "$DEVPATH" ] && exit 0 -[ "$SUBSYSTEM" != "ccw" ] && exit 0 - -NOLOCALE="yes" - -. /etc/sysconfig/network-scripts/network-functions - -# First, determine our channel - -CHANNEL=${DEVPATH##*/} - -CONFIG=$(get_config_by_subchannel $CHANNEL) - -if [ -n "$CONFIG" ]; then - cd /etc/sysconfig/network-scripts - source_config -fi - -# SUBCHANNELS is only set on mainframe ccwgroup devices -[ -z "$SUBCHANNELS" -o -z "$NETTYPE" ] && exit 0 -DIR="/sys/bus/ccwgroup/drivers/$NETTYPE" -SYSDIR="$DIR/${SUBCHANNELS//,*/}" -[ -e $SYSDIR ] && exit 0 -echo "$SUBCHANNELS" > $DIR/group -if [ -n "$PORTNAME" ]; then - if [ "$NETTYPE" = "lcs" ]; then - [ -e $SYSDIR/portno ] && echo "$PORTNAME" > $SYSDIR/portno - else - [ -e $SYSDIR/portname ] && echo "$PORTNAME" > $SYSDIR/portname - fi -fi -if [ "$NETTYPE" = "ctc" -a -n "$CTCPROT" ]; then - echo "$CTCPROT" > $SYSDIR/protocol -fi -if [ -n "$OPTIONS" ]; then - - for i in $OPTIONS; do - echo "${i//*=/}" > "$SYSDIR/${i//=*/}" - done -fi -[ -e $SYSDIR/online ] && echo 1 > $SYSDIR/online diff --git a/udev/rules.d/55-ccw.rules b/udev/rules.d/55-ccw.rules deleted file mode 100644 index dc0db663..00000000 --- a/udev/rules.d/55-ccw.rules +++ /dev/null @@ -1,9 +0,0 @@ -ACTION=="add", SUBSYSTEM=="ccw", SYSFS{cutype}=="1731/01", RUN+="/lib/udev/ccw_init" -ACTION=="add", SUBSYSTEM=="ccw", SYSFS{cutype}=="1731/05", RUN+="/lib/udev/ccw_init" -ACTION=="add", SUBSYSTEM=="ccw", SYSFS{cutype}=="1731/06", RUN+="/lib/udev/ccw_init" -ACTION=="add", SUBSYSTEM=="ccw", SYSFS{cutype}=="3088/01", RUN+="/lib/udev/ccw_init" -ACTION=="add", SUBSYSTEM=="ccw", SYSFS{cutype}=="3088/08", RUN+="/lib/udev/ccw_init" -ACTION=="add", SUBSYSTEM=="ccw", SYSFS{cutype}=="3088/60", RUN+="/lib/udev/ccw_init" -ACTION=="add", SUBSYSTEM=="ccw", SYSFS{cutype}=="3088/61", RUN+="/lib/udev/ccw_init" -ACTION=="add", SUBSYSTEM=="ccw", SYSFS{cutype}=="3088/1E", RUN+="/lib/udev/ccw_init" -ACTION=="add", SUBSYSTEM=="ccw", SYSFS{cutype}=="3088/1F", RUN+="/lib/udev/ccw_init" |