diff -ru murasaki-0.7.12.orig/config/murasaki.sticky murasaki-0.7.12/config/murasaki.sticky --- murasaki-0.7.12.orig/config/murasaki.sticky 2003-09-17 11:57:49.000000000 +0900 +++ murasaki-0.7.12/config/murasaki.sticky 2004-03-24 22:13:52.000000000 +0900 @@ -1 +1,2 @@ +mousedev hid diff -ru murasaki-0.7.12.orig/pci/Makefile murasaki-0.7.12/pci/Makefile --- murasaki-0.7.12.orig/pci/Makefile 2003-09-22 13:35:45.000000000 +0900 +++ murasaki-0.7.12/pci/Makefile 2004-03-28 23:47:30.000000000 +0900 @@ -17,8 +17,7 @@ DEFAULT_PCIMAP=modules.$(MAPNAME) MAP=$(PCIMAP) PCI_DEF=-DMU_PCIMAP=\"$(PCIMAP)\" \ - -DMU_DEFAULT_PCIMAP=\"$(DEFAULT_PCIMAP)\" \ - -DONLY_CARDBUS + -DMU_DEFAULT_PCIMAP=\"$(DEFAULT_PCIMAP)\" CFLAGS += $(PCI_DEF) diff -ru murasaki-0.7.12.orig/scripts/Makefile murasaki-0.7.12/scripts/Makefile --- murasaki-0.7.12.orig/scripts/Makefile 2003-12-28 13:47:50.000000000 +0900 +++ murasaki-0.7.12/scripts/Makefile 2004-03-24 22:22:59.000000000 +0900 @@ -13,25 +13,15 @@ install_rc: @sed -e "s@##HOTPLUG##@$(HOTPLUG)@" -e "s@##PRELOAD_FILE##@$(PRELOAD_FILE)@" $(RC_FILE) > $(RC_FILE).real - @if [ -f $(RC_INIT_DIR)/$(LM) -a ! -f $(RC_INIT_DIR)/$(LM).old ];then \ - mv $(RC_INIT_DIR)/$(LM) $(RC_INIT_DIR)/$(LM).old;\ - echo "move $(RC_INIT_DIR)/$(LM) $(RC_INIT_DIR)/$(LM).old"; \ + @if [ ! -d $(RC_DIR) ];then \ + mkdir -p $(RC_DIR);\ fi - @if [ ! -d $(RC_INIT_DIR) ];then \ - mkdir -p $(RC_INIT_DIR);\ + @if [ -f $(RC_DIR)/$(RC_FILE) -a ! -f $(RC_DIR)/$(RC_FILE).old ];then \ + mv $(RC_DIR)/$(RC_FILE) $(RC_DIR)/$(RC_FILE).old;\ + echo "move $(RC_DIR)/$(RC_FILE) $(RC_DIR)/$(RC_FILE).old"; \ fi - @install -m $(BIN_MODE) $(RC_FILE).real $(RC_INIT_DIR)/$(LM) - @echo "install $(RC_INIT_DIR)/$(LM)" - @for level in ${RC_LEVEL_START}; \ - do \ - ln -sf ../init.d/$(LM) $(RC_DIR)/rc$${level}.d/$(RC_LEVEL_STARTFILE); \ - echo "link $(RC_INIT_DIR)/$(LM) -> $(RC_DIR)/rc$${level}.d/$(RC_LEVEL_STARTFILE)" ;\ - done - @for level in ${RC_LEVEL_KILL}; \ - do \ - ln -sf ../init.d/$(LM) $(RC_DIR)/rc$${level}.d/$(RC_LEVEL_KILLFILE); \ - echo "link $(RC_INIT_DIR)/$(LM) -> $(RC_DIR)/rc$${level}.d/$(RC_LEVEL_KILLFILE)" ;\ - done + @install -m $(BIN_MODE) $(RC_FILE).real $(RC_DIR)/$(RC_FILE) + @echo "install $(RC_DIR)/$(RC_FILE)" install_script_exec: @if [ -n "$(SCRIPT_EXEC)" ];then \ diff -ru murasaki-0.7.12.orig/scripts/net_config murasaki-0.7.12/scripts/net_config --- murasaki-0.7.12.orig/scripts/net_config 2003-09-25 08:53:05.000000000 +0900 +++ murasaki-0.7.12/scripts/net_config 2004-03-24 22:14:56.000000000 +0900 @@ -1,4 +1,4 @@ # Please let me know command name (except RedHat type) # to up/down network. -NETUP_CMD=ifup -NETDOWN_CMD=ifdown +NETUP_CMD=/etc/murasaki/bin/ifup +NETDOWN_CMD=/etc/murasaki/bin/ifdown diff -ru murasaki-0.7.12.orig/scripts/rc.murasaki murasaki-0.7.12/scripts/rc.murasaki --- murasaki-0.7.12.orig/scripts/rc.murasaki 2003-09-23 13:52:22.000000000 +0900 +++ murasaki-0.7.12/scripts/rc.murasaki 2004-03-24 22:35:53.000000000 +0900 @@ -102,11 +102,16 @@ fi build_preload if [ "${PRELOAD}" != "" ];then + echo "Initializing USB controller..." for mm in ${PRELOAD} do ${MODPROBE} ${MODPROBE_OPT} $mm done fi + if grep -q usbdevfs /proc/filesystems && ! grep -q usbdevfs /etc/mtab; then + mount -t usbdevfs usbdevfs /proc/bus/usb + fi + echo "Starting HotPlug service..." touch ${LOCK_FILE} echo ${MURASAKI_HOTPLUG} > ${PROC_HOTPLUG} NAME=`cat ${PROC_MODPROBE}` @@ -115,10 +120,12 @@ fi rm_sysdir if [ $INIT = 'on' ];then + echo "Probing and setting up devices..." initialize fi ;; stop) + echo "Shutting down HotPlug services..." rm -f ${LOCK_FILE} echo ${DEFAULT_HOTPLUG} > ${PROC_HOTPLUG} ;;