summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/Makefile.drakxtools3
-rw-r--r--perl-install/NEWS1
-rwxr-xr-xperl-install/standalone/service_harddrake.sh62
3 files changed, 2 insertions, 64 deletions
diff --git a/perl-install/Makefile.drakxtools b/perl-install/Makefile.drakxtools
index 4eb744488..935a59c44 100644
--- a/perl-install/Makefile.drakxtools
+++ b/perl-install/Makefile.drakxtools
@@ -30,7 +30,7 @@ install:
perl -pi -e "s/\"VER\"(; # version)/\"$(VERSION)\"\1/" standalone.pm
mkdir -p $(BINDEST) $(ETCDEST) $(SBINDEST) $(DATADIR)/{applications,harddrake,pixmaps,icons/{large,mini},autostart} $(PIXDIR) $(INITDIR) $(MENUDIR)
install -d $(INLIBDEST_DIRS:%=$(LIBDEST)/%)
- install $(STANDALONEPMS) standalone/service_harddrake.sh standalone/convert $(SBINDEST)
+ install $(STANDALONEPMS) standalone/convert $(SBINDEST)
install -s ../tools/rpcinfo-flushed ../tools/serial_probe/serial_probe $(SBINDEST)
ln -s XFdrake $(SBINDEST)/Xdrakres
ln -s fileshareset $(SBINDEST)/filesharelist
@@ -67,7 +67,6 @@ install:
rmdir $(LIBDEST)/icons/harddrake2/menu
install -m 644 standalone/menu/*.desktop $(DATADIR)/applications
mv $(LIBDEST)/icons/harddrake2/ $(DATADIR)/pixmaps/
- mv $(SBINDEST)/service_harddrake.sh $(INITDIR)/harddrake
mv $(SBINDEST)/convert $(DATADIR)/harddrake
mv $(SBINDEST)/service_harddrake $(DATADIR)/harddrake/
mv $(SBINDEST)/notify-x11-free-driver-switch $(DATADIR)/harddrake/
diff --git a/perl-install/NEWS b/perl-install/NEWS
index decde7bcc..82b73516c 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,5 +1,6 @@
- handle new driver:
o ethernet: enic
+- remove harddrake service (now run by mandrake_everytime)
Version 11.48 - 18 September 2008
diff --git a/perl-install/standalone/service_harddrake.sh b/perl-install/standalone/service_harddrake.sh
deleted file mode 100755
index 1419f3271..000000000
--- a/perl-install/standalone/service_harddrake.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/bash
-#
-# harddrake This scripts runs the harddrake hardware probe.
-#
-# chkconfig: 345 05 95
-# description: This runs the hardware probe, and optionally configures \
-# changed hardware.
-#
-### BEGIN INIT INFO
-# Provides: harddrake
-# X-Mandriva-Interactive
-# Should-Start: pcmcia dkms
-# Short-Description: The harddrake hardware probe
-# Description: This runs the hardware probe, and optionally configures
-# changed hardware.
-### END INIT INFO
-
-# This is an interactive program, we need the current locale
-[[ -f /etc/profile.d/10lang.sh ]] && . /etc/profile.d/10lang.sh
-
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-
-SUBSYS=/var/lock/subsys/harddrake
-
-case "$1" in
- start)
-# We (mdk) do not support updfstab (yet)
-# action "Updating /etc/fstab" /usr/sbin/updfstab
-
- gprintf "Checking for new hardware"
- /usr/share/harddrake/service_harddrake 2>/dev/null
- RETVAL=$?
- if [ "$RETVAL" -eq 0 ]; then
- action "" /bin/true
- else
- action "" /bin/false
- fi
- # We do not want to run this on random runlevel changes.
- touch $SUBSYS
-# [ /etc/modules.conf -nt /lib/modules/$(uname -r)/modules.dep ] && touch /lib/modules/$(uname -r)/modules.dep 2>/dev/null >/dev/null || : &
- exit $RETVAL
- ;;
- status)
- if [ -f $SUBSYS ]; then
- gprintf "Harddrake service was run at boot time"
- else gprintf "Harddrake service was not run at boot time"
- fi
- echo
- ;;
- reload|restart)
- ;;
- stop)
- # dummy
- rm -f $SUBSYS
- ;;
- *)
- gprintf "Usage: %s {start|stop}\n" "$0"
- exit 1
- ;;
-esac