--- alx-src/branches/alxconf_20060908/init.d/alxsettings 2010/12/09 09:06:33 1622 +++ alx-src/branches/alxconf-060/init.d/alxsettings 2012/04/13 17:15:03 3461 @@ -1,8 +1,8 @@ #!/bin/bash - +# $Id$ # -#%rlevels: 7:s 0:k 6:k +#%rlevels: 7:s 0:k #%start: 41 #%stop: 01 @@ -11,8 +11,6 @@ #%before: #%after: -# $Header: /home/cvsd/alx-cvs/alx-src/alxconfig-ng/init.d/alxsettings,v 1.27 2005-10-11 12:10:15 niro Exp $ - # checks first if the client was already configured and if it has an valid serial # if not it runs the autoconfiguration script # these settings will be used for client setup @@ -21,26 +19,25 @@ # if no changes are at server side they will be kept, if yes the get updated. # the server settings has higher priority. -source /etc/sysconfig/rc +source /etc/conf.d/rc source $rc_functions # mysql settings source /etc/alxconfig-ng/config.rc # helper functions -source /usr/lib/alxconfig-ng/functions/mysqlfunctions -source /usr/lib/alxconfig-ng/functions/serial_functions -source /usr/lib/alxconfig-ng/functions/config_modules -source /usr/lib/alxconfig-ng/functions/config_network -source /usr/lib/alxconfig-ng/functions/config_printers -source /usr/lib/alxconfig-ng/functions/config_sessions -source /usr/lib/alxconfig-ng/functions/config_x11 -source /usr/lib/alxconfig-ng/functions/config_auth -source /usr/lib/alxconfig-ng/functions/config_ssh_auth -source /usr/lib/alxconfig-ng/functions/config_versions - -# check if mysql is available -[ -x /usr/bin/mysql ] && MYSQL_ALX=true +source ${ALX_FUNCTIONS}/common +source ${ALX_FUNCTIONS}/mysqlfunctions +source ${ALX_FUNCTIONS}/serial_functions +source ${ALX_FUNCTIONS}/config_modules +source ${ALX_FUNCTIONS}/config_plugins +source ${ALX_FUNCTIONS}/config_network +source ${ALX_FUNCTIONS}/config_printers +source ${ALX_FUNCTIONS}/config_sessions +source ${ALX_FUNCTIONS}/config_x11 +source ${ALX_FUNCTIONS}/config_auth +source ${ALX_FUNCTIONS}/config_ssh_auth +source ${ALX_FUNCTIONS}/config_versions # other needed vars ALX_HW_DETECT=false @@ -55,28 +52,17 @@ # setup needed directories [ ! -d /etc/alxconfig-ng/state ] && install -d /etc/alxconfig-ng/state - -# read_cmdline ${item} -read_cmdline() -{ - local i - - for i in $(< /proc/cmdline) - do - [[ ${i} = $1 ]] && return 0 - done - - return 1 -} - update_system_settings() { - echo -e ${COLMAGENTA}"Checking system setup ..."${COLDEFAULT} + rc_mecho Checking system setup ... # get the modules settings # ! is the first thing that must be configured ! config_modules + # install or uninstall plugins + config_plugins + # imports network settings from db config_networking @@ -126,11 +112,11 @@ exit 1 fi - CUR_IP=$(/sbin/ifconfig ${ALX_IFACE} | sed -n '/addr:/s/ [^r]*..//gp') - CUR_MAC=$(/sbin/ifconfig ${ALX_IFACE} | grep HWaddr | cut -d ' ' -f11) + CUR_IP=$(ifconfig ${ALX_IFACE} | sed -n '/addr:/s/ [^r]*..//gp') + CUR_MAC=$(ifconfig ${ALX_IFACE} | grep HWaddr | cut -d ' ' -f11) CUR_MTIME=$(date +%s) - echo -e ${COLOREDSTAR} "Trying to validate my serial ..." + rc_print "Trying to validate my serial ..." # nice serial output $CURS_UP @@ -153,14 +139,14 @@ echo if [[ ${ALX_FORCED_RECHECK} = true ]] then - echo -e ${COLMAGENTA}"Hardware autodetection forced by system-administrator"${COLDEFAULT} + rc_mecho "Hardware autodetection forced by system-administrator" # always disable CONFD_NETWORKING here export ALX_CONFD_NETWORKING="false" else - echo -e ${COLMAGENTA}"Preparing system for first boot"${COLDEFAULT} + rc_mecho "Preparing system for first boot" fi ALX_HW_DETECT=true - /etc/init.d/hwdetect start + hwsetup # set hostname to alx_default_hostname # use old hostname if this is a forced re-check @@ -182,8 +168,9 @@ exit 1 fi - CUR_IP=$(/sbin/ifconfig eth0 | sed -n '/addr:/s/ [^r]*..//gp') - CUR_MAC=$(/sbin/ifconfig eth0 | grep HWaddr | cut -d ' ' -f11) + + CUR_IP=$(/sbin/ifconfig ${ALX_IFACE} | sed -n '/addr:/s/ [^r]*..//gp') + CUR_MAC=$(/sbin/ifconfig ${ALX_IFACE} | grep HWaddr | cut -d ' ' -f11) CUR_MTIME=$(date +%s) # abort now if this is a forced re-check @@ -192,7 +179,7 @@ # but first check the serial source /etc/alxconfig-ng/serial - echo -e ${COLOREDSTAR} "Trying to validate my serial ..." + rc_print "Trying to validate my serial ..." # nice serial output $CURS_UP @@ -220,7 +207,7 @@ return 0 fi - echo -e ${COLOREDSTAR} "Trying to get new serial ..." + rc_print "Trying to get new serial ..." # request a new serial; one command now (cause must be done in the same session) ALX_SERIAL=$(mysqldo "insert into client_serials (mtime, mac) values('${CUR_MTIME}','${CUR_MAC}'); @@ -282,30 +269,29 @@ [ -z "${ALX_DEFAULT_DOMAIN}" ] && ALX_DEFAULT_DOMAIN=localdomain [ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx - # vars used by hwdetect + # vars used by hwsetup local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER local MOUSETYPE XMOUSETYPE FULLNAME DEVICE - # get setting from hwdetect - source /etc/sysconfig/hwsetup/knoppix - source /etc/sysconfig/hwsetup/mouse + # get setting from hwsetup + source /etc/conf.d/hwsetup/knoppix + source /etc/conf.d/hwsetup/mouse echo - echo -e ${COLMAGENTA}"Importing detected settings to database"${COLDEFAULT} + rc_mecho "Importing detected settings to database" # network - echo -e " Network settings ..." + rc_mecho " Network settings ..." if [[ ${ALX_CONFD_NETWORKING} = true ]] then # get settings - #source ${rc_base}/init.d/network &> /dev/null for iface in $(onboot_interface_list ${network_settings}/net.*) do [[ $(< ${SETTINGSPATH}/confd-networking) != ${iface} ]] && continue - echo "WARNING: only importing settings for interface [ ${iface} ] !" - source ${network_settings}/net.${iface} || exit 1 - NETCARD_DRIVER="$(cat /etc/modules.d/net.${iface} | cut -d' ' -f3)" + rc_echo "WARNING: only importing settings for interface [ ${iface} ] !" + source ${network_settings}/net.${iface} || echo "Error: could not read '${network_settings}/net.${iface}'" + NETCARD_DRIVER="$(cat /etc/modprobe.d/net.${iface}.conf | cut -d' ' -f3)" mysqldo "insert into cfg_network( hostname, @@ -376,7 +362,7 @@ evaluate_retval # xserver - echo -e " Graphic settings ..." + rc_mecho " Graphic settings ..." # xserver general ( mysqldo "insert into cfg_graphic( serial, @@ -395,12 +381,12 @@ evaluate_retval # input - echo -e " Input settings ..." + rc_mecho " Input settings ..." mysqldo "insert into cfg_input(serial,mouse) values('${ALX_SERIAL}','${XMOUSETYPE}');" evaluate_retval # auth - echo -e " Authentification settings ..." + rc_mecho " Authentification settings ..." mysqldo "insert into client_auth( serial, username, @@ -421,24 +407,25 @@ # exchange ssh rsa keys - the first boot needs this ! # or no reboot will work via the webadmin - echo -e " SSH authentification settings ..." + rc_mecho " SSH authentification settings ..." HOME=/root config_ssh_auth evaluate_retval # autostart - echo -e " Autostart settings ..." + rc_mecho " Autostart settings ..." mysqldo "insert into cfg_autostart(serial,session) values('${ALX_SERIAL}','');" # screensaver - echo -e " Screensaver settings ..." + rc_mecho " Screensaver settings ..." mysqldo "insert into cfg_screensaver(serial,screensaver) values('${ALX_SERIAL}','')" # version info + rc_mecho " OS version info ..." local alx_os local alx_utils alx_os="$(< /etc/mageversion)" - alx_utils="$(magequery -n alxconfig-ng-alx | sed 's:.*\[\ \(.*\)\ \].*:\1:')" - alx_utils="${alx_utils/alxconfig-ng-alx-}" + alx_utils="$(magequery -n alxconfig-ng | sed 's:.*\[\ \(.*\)\ \].*:\1:')" + alx_utils="${alx_utils/alxconfig-ng-}" mysqldo "insert into client_version(serial,os,utils) values('${ALX_SERIAL}','${alx_os}','${alx_utils}')" evaluate_retval @@ -455,20 +442,20 @@ [ -z "${ALX_DEFAULT_DOMAIN}" ] && ALX_DEFAULT_DOMAIN=localdomain [ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx - # vars used by hwdetect + # vars used by hwsetup local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER local MOUSETYPE XMOUSETYPE FULLNAME DEVICE - # get setting from hwdetect - source /etc/sysconfig/hwsetup/knoppix - source /etc/sysconfig/hwsetup/mouse + # get setting from hwsetup + source /etc/conf.d/hwsetup/knoppix + source /etc/conf.d/hwsetup/mouse echo - echo -e ${COLMAGENTA}"Updating detected settings in database"${COLDEFAULT} + rc_mecho "Updating detected settings in database" # network - echo -e " Network settings ..." + rc_mecho " Network settings ..." if [[ ${ALX_CONFD_NETWORKING} = true ]] then # get settings @@ -476,9 +463,9 @@ for iface in $(onboot_interface_list ${network_settings}/net.*) do [[ $(< ${SETTINGSPATH}/confd-networking) != ${iface} ]] && continue - echo "WARNING: only importing settings for interface [ ${iface} ] !" + rc_echo "WARNING: only importing settings for interface [ ${iface} ] !" source ${network_settings}/net.${iface} || exit 1 - NETCARD_DRIVER="$(cat /etc/modules.d/net.${iface} | cut -d' ' -f3)" + NETCARD_DRIVER="$(cat /etc/modprobe.d/net.${iface}.conf | cut -d' ' -f3)" mysqldo "update cfg_network set hostname='${ALX_DEFAULT_HOSTNAME}', @@ -517,7 +504,7 @@ evaluate_retval # xserver - echo -e " Graphic settings ..." + rc_mecho " Graphic settings ..." # xserver general mysqldo "update cfg_graphic set module='${XMODULE}', @@ -528,11 +515,12 @@ evaluate_retval # input - echo -e " Input settings ..." + rc_mecho " Input settings ..." mysqldo "update cfg_input set mouse='${XMOUSETYPE}' where serial=${ALX_SERIAL};" evaluate_retval # version info + rc_mecho " OS version info ..." local alx_os local alx_utils alx_os="$(< /etc/mageversion)" @@ -552,36 +540,43 @@ [ -z "${ALX_DEFAULT_DOMAIN}" ] && ALX_DEFAULT_DOMAIN=localdomain [ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx - # vars used by hwdetect + # vars used by hwsetup local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER local MOUSETYPE XMOUSETYPE FULLNAME DEVICE - # get setting from hwdetect - source /etc/sysconfig/hwsetup/knoppix + # get setting from hwsetup + source /etc/conf.d/hwsetup/knoppix echo - echo -e ${COLMAGENTA}"Importing detected settings to local system"${COLDEFAULT} + rc_mecho "Importing detected settings to local system" if [[ ${ALX_CONFD_NETWORKING} = false ]] then - #[ ! -d ${SETTINGSPATH} ] && install -d ${SETTINGSPATH} - #echo "${NETCARD_DRIVER}" > ${SETTINGSPATH}/modules - - # set an device alias for modprobe.conf and modules.conf - [ ! -d /etc/modules.d ] && install -d /etc/modules.d + # set an device alias for modprobe.conf [ ! -d /etc/modprobe.d ] && install -d /etc/modprobe.d - echo "alias eth0 ${NETCARD_DRIVER}" > /etc/modules.d/net.eth0 - echo "alias eth0 ${NETCARD_DRIVER}" > /etc/modprobe.d/net.eth0 + # update only if not the same (to speed up bootprocess - no depmod) + CONFIG="/etc/modprobe.d/net.${ALX_IFACE}.conf" + clearconfig + addconfig "alias ${ALX_IFACE} ${cfg_network_module}" + + # update confd-networking default iface + [ ! -d ${SETTINGSPATH} ] && install -d ${SETTINGSPATH} + CONFIG="${SETTINGSPATH}/confd-networking" + clearconfig + addconfig "${ALX_IFACE}" # regenerate modprobe.conf - [ -x $(which modules-update) ] && modules-update || echo "cannot regen modprobe.conf" + [ -x $(which modules-update) ] && modules-update || rc_echo "modules-update not found!" evaluate_retval fi # set system state to 'already configured' touch /etc/alxconfig-ng/state/configured + # install slim desktopmanager configuration + config_display_manager + # if only an recheck was forced than abort now [[ ${ALX_FORCED_RECHECK} = true ]] && return 0 @@ -592,40 +587,82 @@ # now generate fluxbox config files # fluxbox main config - cat ${ALX_SKELETONS}/fluxbox/init \ - > ${ALX_UNPRIV_HOME}/.fluxbox/init + local fbinit + if [ -f ${ALX_SKELETONS}/fluxbox/init ] + then + fbinit="${ALX_SKELETONS}/fluxbox/init" + else + fbinit="/usr/share/fluxbox/init" + fi + cat ${fbinit} > ${ALX_UNPRIV_HOME}/.fluxbox/init # fluxbox autostart - cat ${ALX_SKELETONS}/fluxbox/apps \ - > ${ALX_UNPRIV_HOME}/.fluxbox/apps + CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/apps" + # do not show decorations on messages generated with xmessage + if [ -x /usr/bin/xmessage ] + then + addconfig '[app] (xmessage)' + addconfig ' [Deco] {NONE}' + addconfig '[end]' + fi + # add icon utility + [ -x /usr/bin/idesk ] && addconfig '[startup] {nohup idesk > /dev/null &}' + # add numlock utility + [ -x /usr/bin/numlockx ] && addconfig '[startup] {nohup numlockx on &}' + + # fluxbox hotkeys + local fbkeys + if [ -f ${ALX_SKELETONS}/fluxbox/keys ] + then + fbkeys="${ALX_SKELETONS}/fluxbox/keys" + else + fbkeys="/usr/share/fluxbox/keys" + fi + cat ${fbkeys} > ${ALX_UNPRIV_HOME}/.fluxbox/keys # fluxbox menu header - cat ${ALX_SKELETONS}/fluxbox/menu.header \ - > ${ALX_UNPRIV_HOME}/.fluxbox/menu + cat ${ALX_SKELETONS}/fluxbox/menu.header > ${ALX_UNPRIV_HOME}/.fluxbox/menu # now fix it with proper messages :P local ver="$(< /etc/mageversion)" - sed -i "s:@CHANGEME@:alx-${ver} #${ALX_SERIAL}:g" \ - ${ALX_UNPRIV_HOME}/.fluxbox/menu + sed -i "s:@CHANGEME@:alx-${ver} #${ALX_SERIAL}:g" ${ALX_UNPRIV_HOME}/.fluxbox/menu # add a newline (maybe there is no crlf in the header) echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu # fluxbox menu footer - cat ${ALX_SKELETONS}/fluxbox/menu.footer \ - >> ${ALX_UNPRIV_HOME}/.fluxbox/menu + cat ${ALX_SKELETONS}/fluxbox/menu.footer >> ${ALX_UNPRIV_HOME}/.fluxbox/menu # add a newline (maybe there is no crlf in the footer) echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu - # setup some standart icons (sysinfo.lnk) - # basic config - cat ${ALX_SKELETONS}/xtdesktop/xtdeskrc > ${ALX_UNPRIV_HOME}/.xtdeskrc - # clean desktop icon location - [ -d ${ALX_UNPRIV_HOME}/.xtdesktop ] && rm -rf ${ALX_UNPRIV_HOME}/.xtdesktop - install -d ${ALX_UNPRIV_HOME}/.xtdesktop + [ -d ${ALX_UNPRIV_HOME}/.idesktop ] && rm -rf ${ALX_UNPRIV_HOME}/.idesktop + install -d ${ALX_UNPRIV_HOME}/.idesktop + + # add shutdown, reboot icons + local name + # default settings + declare -i x=30 + declare -i y=30 + for i in shutdown reboot + do + case ${i} in + shutdown) name="Herunterfahren" ;; + reboot) name="Neustarten" ;; + esac + + generate_icon \ + --name "${name}" \ + --command "/usr/lib/alxconfig-ng/bin/user_${i}.sh" \ + --icon "${ALX_SESSIONS_ICONS}/${i}.png" \ + --dest "${dest}/${i}.lnk" \ + --xres "${x}" \ + --yres "${y}" + + y=$((${y} + 80)) + done # last but not least gen a icon with some sys informations local sysinfo @@ -647,22 +684,21 @@ --name "${sysinfo}" \ --command "exit 0" \ --icon "${ALX_SESSIONS_ICONS}/sysinfo.png" \ - --dest "${ALX_UNPRIV_HOME}/.xtdesktop/sysinfo.lnk" \ + --dest "${ALX_UNPRIV_HOME}/.idesktop/sysinfo.lnk" \ --xres "${xres}" \ --yres "${yres}" \ --icon-width "1" \ --icon-height "1" - # create a xinitrc - echo "exec startfluxbox" > ${ALX_UNPRIV_HOME}/.xinitrc - # set correct permissions chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME} chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}/.fluxbox chmod 0755 ${ALX_UNPRIV_HOME}/.fluxbox - chmod 0755 ${ALX_UNPRIV_HOME}/.xtdesktop - chmod 0644 ${ALX_UNPRIV_HOME}/.xtdeskrc - chmod 0644 ${ALX_UNPRIV_HOME}/.xinitrc + chmod 0755 ${ALX_UNPRIV_HOME}/.idesktop + if [ -f ${ALX_UNPRIV_HOME}/.ideskrc ] + then + chmod 0644 ${ALX_UNPRIV_HOME}/.ideskrc + fi } # start|stop @@ -679,13 +715,14 @@ module=$(cat ${SETTINGSPATH}/modules) modprobe ${module} fi + else - # vars used by hwdetect + # vars used by hwsetup local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER - # get setting from hwdetect - source /etc/sysconfig/hwsetup/knoppix + # get setting from hwsetup + source /etc/conf.d/hwsetup/knoppix modprobe ${NETCARD_DRIVER} fi @@ -694,43 +731,39 @@ # keeping like always safe: # no network should be startet here, # so we can delete all pid files if one exists - if ps -A|grep dhcpcd > /dev/null + if [[ ! -z $(pidof $(basename ${ALX_DHCP_PROG})) ]] then - echo -e ${COLMAGENTA}"Forcing network down"${COLDEFAULT} - dhcpcd -k + rc_mecho "Forcing network down" + killall $(basename ${ALX_DHCP_PROG}) &> /dev/null sleep 1 - else - rm -f /var/run/dhcpcd-eth?.pid fi - [[ ${ALX_CONFD_NETWORKING} = true ]] && [[ ${RUNLEVEL} != S ]] && \ - ${rc_base}/init.d/network stop + [[ ${ALX_CONFD_NETWORKING} = true ]] && ${rc_base}/init.d/network stop - echo -e ${COLMAGENTA}"Starting preliminary networking ... "${COLDEFAULT} + rc_mecho "Starting preliminary networking ... " # start network configured from /etc/conf.d if [[ ${ALX_CONFD_NETWORKING} = true ]] then ${rc_base}/init.d/network start else - echo -e ${COLOREDSTAR}"Starting default dhcp based networking ... "${COLDEFAULT} - # -t 10 timeout of 10 secs - dhcpcd -t 10 &> /dev/null + rc_print "Starting default dhcp based networking ... " + ${ALX_DHCP_PROG} ${ALX_DHCP_START} ${ALX_IFACE} &> /dev/null evaluate_retval fi ;; stop) - echo -e ${COLMAGENTA}"Stopping preliminary networking ... "${COLDEFAULT} + rc_mecho "Stopping preliminary networking ... " if [[ ${ALX_CONFD_NETWORKING} = true ]] then ${rc_base}/init.d/network stop else - echo -e ${COLOREDSTAR}"Stopping default dhcp based networking ... "${COLDEFAULT} - ifconfig eth0 down + rc_print "Stopping default dhcp based networking ... " + ifconfig ${ALX_IFACE} down fi - if ps -A|grep dhcpcd > /dev/null + if [[ ! -z $(pidof $(basename ${ALX_DHCP_PROG})) ]] then - dhcpcd -z &> /dev/null + killall $(basename ${ALX_DHCP_PROG}) &> /dev/null sleep 1 fi evaluate_retval @@ -745,55 +778,55 @@ reset_system_settings() { # force load of de kbdkeys - loadkeys -q de - echo - echo -en ${COLRED} - echo -n "*** Warning: you are about to reset *all* local settings on this system!" - echo -e ${COLDEFAULT} - echo "*** Do you really want to continue ?" - echo -n "*** Enter 'yes' to continue, anything else to abort: " + [ -x /usr/bin/loadkeys ] && loadkeys -q de + [ -x /sbin/loadkmap ] && loadkmap < /usr/share/busybox/keymaps/de.kmap + rc_echo + rc_echo -en "${COLRED}" + rc_echo -n '--- Warning: you are about to reset *all* local settings on this system!' + rc_echo -e "${COLDEFAULT}" + rc_echo '--- Do you really want to continue ?' + rc_echo -n '--- Enter 'yes' to continue, anything else to abort: ' read kbinsert if [[ ${kbinsert} = yes ]] then - echo -en ${COLRED} - echo -n "*** OK, you really want it ... killing all settings: " + rc_echo -en "${COLRED}" + rc_echo -n '--- OK, you really want it ... killing all settings: ' for i in 3 2 1 now do - echo -n " ${i}" + rc_echo -n " ${i}" sleep 1 done - echo -e ${COLDEFAULT} + rc_echo -e "${COLDEFAULT}" ## reset all settings: - rm -rf ${SETTINGSPATH}/* + rm -rf ${SETTINGSPATH} rm -f /etc/alxconfig-ng/serial rm -rf /etc/alxconfig-ng/state # clear all printers & net-shares - :> /etc/cups/printers.conf - :> /etc/samba/smb.conf + :> /etc/printcap - # remove inetd, cups & smb from init - rc-config del inetd &> /dev/null - rc-config del cups &> /dev/null - rc-config del samba &> /dev/null + # remove lprng + rc-config del lprng &> /dev/null + rc-config del nmbd &> /dev/null # remove all user settings [ -d ${ALX_UNPRIV_HOME} ] && rm -rf ${ALX_UNPRIV_HOME} + install -o ${ALX_UNPRIV_USER} -g ${ALX_UNPRIV_GROUP} -d ${ALX_UNPRIV_HOME} # remove all ica-sessions - find ${ALX_ICA_SESSIONS} -type f -name '*.ica' | xargs rm + find ${ALX_ICA_SESSIONS} -type f -name '*.ica' | xargs --no-run-if-empty rm # remove all old nics and modules configs - find /etc/conf.d -type f -name 'net.*' | xargs rm - find /etc/modules.d -type f -name 'net.*' | xargs rm + find /etc/conf.d -type f -name 'net.*' | xargs --no-run-if-empty rm + find /etc/modprobe.d -type f -name 'net.*' | xargs --no-run-if-empty rm # restore default networking cat ${ALX_SKELETONS}/net/net.eth0 > /etc/conf.d/net.eth0 - echo "I am done now, press [Enter] to reboot system ..." + rc_echo "I am done now, press [Enter] to reboot system ..." else - echo "Aborted, press [Enter] to reboot system ..." + rc_echo "Aborted, press [Enter] to reboot system ..." fi read reboot @@ -921,8 +954,8 @@ [ -f /etc/alxconfig-ng/state/state ] && rm /etc/alxconfig-ng/state/state sleep 0.1 ;; + *) echo "Usage: $0 {start|stop} ..." ;; esac -