Changeset 5148 for pkg/kev/main/initscripts-parsix-live/trunk/debian/live-autoconfig.init

Timestamp:

04/30/09 02:02:48 (4 years ago)

Author:

alanbach-guest

Message:

• Revert live-autoconfig to 1.0.11

File:

• pkg/kev/main/initscripts-parsix-live/trunk/debian/live-autoconfig.init (modified) (6 diffs)

pkg/kev/main/initscripts-parsix-live/trunk/debian/live-autoconfig.init

@@ -920 +920 @@
 echo -n "${NORMAL}"
 
+# KANOTIX autoconfig
+
 # udev support
 
@@ -930 +932 @@
         RUNLEVEL=S /etc/init.d/udev start &>/dev/null
                 # load capability LSM (needed for hal)
-                modprobe capability &>/dev/null                 
+                modprobe capability &>/dev/null
+                if [ -x /etc/init.d/dbus-1 ]; then
+                        /etc/init.d/dbus-1 start &>/dev/null
+                elif [ -x /etc/init.d/dbus ]; then
+                        /etc/init.d/dbus start &>/dev/null
+                fi
         fi                                                                                                           
 fi
@@ -969 +976 @@
                         basename="${basename%%.*}"
                         case "$basename" in *_acpi)
-                                egrep -qi "${basename%%_acpi}" /proc/acpi/dsdt 2>/dev/null &>/dev/null || continue ;;
+                                egrep -qi "${basename%%_acpi}" /proc/acpi/dsdt 2>/dev/null || continue ;;
                         esac
                         modprobe $basename &>/dev/null && echo -n " ${YELLOW}$basename${GREEN}" && found="yes"
@@ -975 +982 @@
                 test -z "$found" && echo -n "${BLUE}(none)"
                 echo "${NORMAL}"
-                fuser -k /proc/acpi/event &>/dev/null &>/dev/null
-                /etc/init.d/acpid start &>/dev/null &>/dev/null
+                fuser -k /proc/acpi/event &>/dev/null
+                /etc/init.d/acpid start &>/dev/null
         fi
 else
@@ -1317 +1324 @@
 
 # Fat-Client-Version: DHCP Broadcast for IP address
-#if checkbootparam "nodhcp"; then
-#       echo " ${BLUE}Skipping DHCP broadcast/network detection as requested on boot commandline.${NORMAL}"
-#else
-#       NETDEVICES="$(awk -F: '/ath.:|eth.:|tr.:|wlan.:/{print $1}' /proc/net/dev 2>/dev/null)"
-#       for DEVICE in $NETDEVICES; do
-#               echo -n " ${GREEN}Network device ${MAGENTA}$DEVICE${GREEN} detected, DHCP broadcasting for IP.${NORMAL}"
-#               trap 2 3 11
-#               pump -i $DEVICE &>/dev/null &
-#               trap "" 2 3 11
-#               sleep 1
-#               echo " ${BLUE}(Backgrounding)${NORMAL}"
-#       done
-#fi
-
-
-# Load DBUS
-echo " ${GREEN}Starting ${YELLOW}DBUS${GREEN} Service...${NORMAL}"
-/etc/init.d/dbus start
-
-# Load HAL
-echo " ${GREEN}Starting ${YELLOW}HAL${GREEN} Service...${NORMAL}"
-/etc/init.d/hal start
-
-# Load NetworkManager
-echo " ${GREEN}Starting ${YELLOW}NetworkManager${GREEN} Service...${NORMAL}"
-/etc/init.d/network-manager start
+if checkbootparam "nodhcp"; then
+        echo " ${BLUE}Skipping DHCP broadcast/network detection as requested on boot commandline.${NORMAL}"
+else
+        NETDEVICES="$(awk -F: '/ath.:|eth.:|tr.:|wlan.:/{print $1}' /proc/net/dev 2>/dev/null)"
+        for DEVICE in $NETDEVICES; do
+                echo -n " ${GREEN}Network device ${MAGENTA}$DEVICE${GREEN} detected, DHCP broadcasting for IP.${NORMAL}"
+                trap 2 3 11
+                pump -i $DEVICE &>/dev/null &
+                trap "" 2 3 11
+                sleep 1
+                echo " ${BLUE}(Backgrounding)${NORMAL}"
+        done
+fi
 
 findfile(){
@@ -1601 +1595 @@
         source "$MYCONFIG" "/home/${FLL_LIVE_USER}" || true
         echo "0" > /proc/sys/kernel/printk      
+fi
+
+
+# modem detection
+if ! checkbootparam "nomodem"; then
+        if lspci|grep Intel|grep -q "AC'97 Modem Controller"; then
+                /etc/init.d/sl-modem-daemon start &>/dev/null
+                grep -q ^sl-modem-daemon /etc/sysconfig/services &>/dev/null || echo sl-modem-daemon >> /etc/sysconfig/services
+        fi
 fi