SVN: bootdisk/trunk/batch-installer/installer-prep
Author: hawk Date: Sun Apr 8 19:39:54 2007 New Revision: 8450 Modified: bootdisk/trunk/batch-installer/installer-prep Log: - cleanup Modified: bootdisk/trunk/batch-installer/installer-prep == --- bootdisk/trunk/batch-installer/installer-prep (original) +++ bootdisk/trunk/batch-installer/installer-prep Sun Apr 8 19:39:54 2007 @@ -258,7 +258,7 @@ load_net_device_modules () { local mod mark -local pre_load i +local i # if we have it already (e.g. loaded by pcimcia cardmgr), do not load if ip link show $net_device /dev/null 21; then return; fi @@ -276,11 +276,6 @@ else mod=$net_device_module fi -pre_load=`grep -s ^$mod\.o| /etc/eth.list.in | \ - sed -e 's/[^|]*|[^|]*|\([^|]*\).*/\1/' | sed -e 's/\.o/ /g'` -for i in $pre_load ; do -load_module $i -done load_module $mod $net_device_module_options } ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
bootdisk/trunk/batch-installer/installer-prep
Author: hawk Date: Tue Mar 21 22:47:18 2006 New Revision: 7262 Modified: bootdisk/trunk/batch-installer/installer-prep Log: - if we are installing from net, try to load modules from net to avoid addons juggling (but fallback to addons when network loading fails) - small cosmetic Modified: bootdisk/trunk/batch-installer/installer-prep == --- bootdisk/trunk/batch-installer/installer-prep (original) +++ bootdisk/trunk/batch-installer/installer-prep Tue Mar 21 22:47:18 2006 @@ -75,46 +75,55 @@ test -d $modules_dir || die No $modules_dir directory if test ! -r $modules_dir/${1}.o; then - # try to load from addons diskette - package=`find_package ${1}` - test $package || die No package contains module $1 - addons=`find_addons $package` - test $addons || die No addons disk contains package $package - first=yes - # the source will be the diskette, temporarily - # (that _is_ mountable) - tmp=$source_not_mountable - source_not_mountable= - while : ; do - if grep -q $source_mountpoint /proc/mounts; then - umount $source_mountpoint || : +package=`find_package ${1}` +test $package || die No package contains module $1 + # if we are installing from net, try to fetch whole required package + # (to avoid fetching it again if some other module from it will be needed) +if test -n $source_not_mountable; then + if load_package $package; then + tmp=value fi - - if mount /dev/fd0 -t ext2 $source_mountpoint 2/dev/null ; then - if load_package $package ${1}.o; then - break - else - nls This disk does not contain package %s with module %s.\n $package $1 + fi + # if fetching from network wasn't executed or has failed, search for + # required module on addons disks + if test -z $tmp ; then + addons=`find_addons $package` + test $addons || die No addons disk contains package $package + first=yes + # the source will be the diskette, temporarily + # (that _is_ mountable) + tmp=$source_not_mountable + source_not_mountable= + while : ; do + if grep -q $source_mountpoint /proc/mounts; then + umount $source_mountpoint || : fi - else - if test ! $first ; then - nls Cannot mount diskette!\n + + if mount /dev/fd0 -t ext2 $source_mountpoint 2/dev/null ; then + if load_package $package ${1}.o; then + break + else + nls This disk does not contain package %s with module %s.\n $package $1 + fi + else + if test ! $first ; then + nls Cannot mount diskette!\n + fi fi - fi - - if test $first ; then - nls Module %s is not available, package %s must be loaded.\n $1 $package - nls Please insert disk \addons %d\ and press Enter\n $addons - first= - else - nls Try another disk and press Enter.\n - fi - read ans - done - # restore correct value - source_not_mountable=$tmp - umount $source_mountpoint || : + if test $first ; then + nls Module %s is not available, package %s must be loaded.\n $1 $package + nls Please insert disk \addons %d\ and press Enter\n $addons + first= + else + nls Try another disk and press Enter.\n + fi + read ans + done + # restore correct value + source_not_mountable=$tmp + umount $source_mountpoint || : + fi fi # find and load modules on which our wanted module depends @@ -180,7 +189,10 @@ ;; esac snarf -n $file - ) || die Cannot get $file + ) || { + log warn `nls Cannot get %s $file` + return 1 + } file=$tmp/${pkg}.tar.gz else file=${source_mountpoint}${source_dir}/$inst_dir/${pkg}.tar.gz @@ -189,7 +201,7 @@ # try without source_dir (for addons disk) file=${source_mountpoint}/$inst_dir/${pkg}.tar.gz test -f $file || { - echo No file ${source_mountpoint}${source_dir}/$inst_dir/${pkg}.tar.gz nor ${source_mountpoint}/$inst_dir/${pkg}.tar.gz + log warn `nls No file %s nor %s ${source_mountpoint}${source_dir}/$inst_dir/${pkg}.tar.gz ${source_mountpoint}/$inst_dir/${pkg}.tar.gz` return 1
bootdisk/trunk/batch-installer/installer-prep
Author: hawk Date: Sun Mar 19 20:00:50 2006 New Revision: 7225 Modified: bootdisk/trunk/batch-installer/installer-prep Log: - load required filesystem module before mounting disk source Modified: bootdisk/trunk/batch-installer/installer-prep == --- bootdisk/trunk/batch-installer/installer-prep (original) +++ bootdisk/trunk/batch-installer/installer-prep Sun Mar 19 20:00:50 2006 @@ -220,6 +220,26 @@ load_module isofs } +load_fs_modules () { +case $source_filesystem in +ext2) + load_module ext2 + ;; +reiserfs) + load_module reiserfs + ;; +jfs) + load_module jfs + ;; +ext3) + load_module ext3 + ;; +xfs) + load_module xfs + ;; +esac +} + load_nfs_modules () { load_module nfs } @@ -564,6 +584,7 @@ load_module sd_mod ;; esac + load_fs_modules mount_source -o ro find_source_dir ;; ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
bootdisk/trunk/batch-installer/installer-prep
Author: hawk Date: Sun Mar 19 20:35:54 2006 New Revision: 7232 Modified: bootdisk/trunk/batch-installer/installer-prep Log: - when source is already mounted, umount it (fixes mount errors while doing installation after previously failed one) Modified: bootdisk/trunk/batch-installer/installer-prep == --- bootdisk/trunk/batch-installer/installer-prep (original) +++ bootdisk/trunk/batch-installer/installer-prep Sun Mar 19 20:35:54 2006 @@ -25,7 +25,7 @@ # mount wrapper mount_source () { test -d ${source_mountpoint} || mkdir ${source_mountpoint} -if cat /proc/mounts | grep -q $source_mountpoint; then return; fi +if cat /proc/mounts | grep -q $source_mountpoint; then umount ${source_mountpoint}; fi log info `nls Mounting %s on %s type %s ${source_device} ${source_mountpoint} ${source_filesystem}` log_wrap_verb mount -t ${source_filesystem} ${source_device} ${source_mountpoint} $@ } ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
bootdisk/trunk/batch-installer/installer-prep
Author: hawk Date: Mon Mar 20 00:50:02 2006 New Revision: 7246 Modified: bootdisk/trunk/batch-installer/installer-prep Log: - cosmetics Modified: bootdisk/trunk/batch-installer/installer-prep == --- bootdisk/trunk/batch-installer/installer-prep (original) +++ bootdisk/trunk/batch-installer/installer-prep Mon Mar 20 00:50:02 2006 @@ -444,7 +444,7 @@ # also write entries to modules.conf/modprobe.conf for ide in $detected_ide; do if echo $1 | grep -q $ide; then - # if not ide-generit then write info about ide adapters + # if not ide-generic then write info about ide adapters # into modules.conf/modprobe.conf if test x$ide != xide-generic; then for i in /etc/modules.conf /etc/modprobe.conf; do @@ -473,7 +473,9 @@ fi done - # same for scsi + # check if any of modules to be loaded is for SCSI device + # and if it is, load module sd_mod, also write entries to + # modules.conf/modprobe.conf for scsi in $detected_scsi; do if echo $1 | grep -q $scsi; then for i in /etc/modules.conf /etc/modprobe.conf; do ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
bootdisk/trunk/batch-installer/installer-prep
Author: hawk Date: Tue Dec 6 22:49:37 2005 New Revision: 6603 Modified: bootdisk/trunk/batch-installer/installer-prep Log: - ide-detect is always required with IDE drivers - perform load_device_modules basename checking after getting to the source (again) - moved load_device_modules call to fix problem with load_package on network based installs Modified: bootdisk/trunk/batch-installer/installer-prep == --- bootdisk/trunk/batch-installer/installer-prep (original) +++ bootdisk/trunk/batch-installer/installer-prep Tue Dec 6 22:49:37 2005 @@ -387,13 +387,14 @@ local detected_ide detectded_scsi detected_ide=`detect-pci-devices ide -m` - detected_ide=$detected_ide ide-detect detected_scsi=`detect-pci-devices scsi -m` - # go through list of modules and load them or call required functions + # go through list of modules and load them, skip or call required functions for module in $1; do -if test x$module = xcpqarray; then +if test x$module = xide-generic; then + : skip +elif test x$module = xcpqarray; then . installer-raid-functions setup_cpqarray elif test x$module = xcciss; then @@ -429,7 +430,13 @@ rm -f $i.tmp fi done - # check if ide-disk is loaded and if not, load it + # check if ide-detect is loaded and if not, load it + if lsmod | grep -q '^ide-detect ' ; then +: skip + else +load_module ide-detect + fi + # same for ide-disk if lsmod | grep -q '^ide-disk ' ; then : skip else @@ -492,9 +499,6 @@ # invoked as load_nodule runs function load_module, if test x`basename $0 || :` = xload_module; then load_module $@; exit $? -# invoked as load_device_modules, runs function load_device_modules -elif test x`basename $0` = xload_device_modules; then -load_device_modules $@; exit $? elif test x`basename $0 || :` = xinstaller-prep-source; then # only source (and net) parts are prepared source_only=yes @@ -522,12 +526,6 @@ fi fi - load hostadapter modules if necessary # - -if ! test -z $hostadapters_modules; then - load_device_modules $hostadapters_modules -fi - ## get to the source ## case $source in cdrom) @@ -577,6 +575,17 @@ # invoked as load_package runs function load_package, if test x`basename $0 || :` = xload_package; then load_package $@; exit $? +# invoked as load_device_modules, runs function load_device_modules +elif test x`basename $0` = xload_device_modules; then +load_device_modules $@; exit $? +fi + +# modules for source/destination devices should be loaded by now +# but to be sure, lets call it again in case someone has fooled +# manual installation procedure + +if ! test -z $hostadapters_modules; then + load_device_modules $hostadapters_modules fi ## install packages needed in next stage ## ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
bootdisk/trunk/batch-installer/installer-prep
Author: hawk Date: Wed Dec 7 00:26:52 2005 New Revision: 6606 Modified: bootdisk/trunk/batch-installer/installer-prep Log: - do not write ide-generic to modules.conf/modprobe.conf - moved back load_device_modules basename checking - comments cosmetics Modified: bootdisk/trunk/batch-installer/installer-prep == --- bootdisk/trunk/batch-installer/installer-prep (original) +++ bootdisk/trunk/batch-installer/installer-prep Wed Dec 7 00:26:52 2005 @@ -387,13 +387,16 @@ local detected_ide detectded_scsi detected_ide=`detect-pci-devices ide -m` + detected_ide=$detected_ide ide-generic detected_scsi=`detect-pci-devices scsi -m` - # go through list of modules and load them, skip or call required functions + # go through list of modules... for module in $1; do +# skip if ide-generic if test x$module = xide-generic; then : skip +# for some raid modules we must call proper function elif test x$module = xcpqarray; then . installer-raid-functions setup_cpqarray @@ -409,6 +412,7 @@ elif test x$module = xi2o_block; then . installer-raid-functions setup_i2o +# for all others we simply need to load module else load_module $module fi @@ -416,20 +420,24 @@ done # check if any of modules to be loaded is for IDE device - # and if it is, load module ide-disk + # and if it is, load module ide-detect and ide-disk + # also write entries to modules.conf/modprobe.conf for ide in $detected_ide; do if echo $1 | grep -q $ide; then - ## write info about ide adapters into modules.conf/modprobe.conf - for i in /etc/modules.conf /etc/modprobe.conf; do -if ! cat $i 2 /dev/null | grep -q ^alias ide_hostadapter; then - test ! -f $i || cp $i $i.tmp - echo alias ide_hostadapter $ide $i.tmp - # alias for devfsd - echo alias ide-hosts $ide $i.tmp - sort $i.tmp | uniq $i - rm -f $i.tmp -fi - done + # if not ide-generit then write info about ide adapters + # into modules.conf/modprobe.conf + if test x$ide != xide-generic; then +for i in /etc/modules.conf /etc/modprobe.conf; do + if ! cat $i 2 /dev/null | grep -q ^alias ide_hostadapter; then +test ! -f $i || cp $i $i.tmp +echo alias ide_hostadapter $ide $i.tmp +# alias for devfsd +echo alias ide-hosts $ide $i.tmp +sort $i.tmp | uniq $i +rm -f $i.tmp + fi +done + fi # check if ide-detect is loaded and if not, load it if lsmod | grep -q '^ide-detect ' ; then : skip @@ -499,6 +507,9 @@ # invoked as load_nodule runs function load_module, if test x`basename $0 || :` = xload_module; then load_module $@; exit $? +# invoked as load_device_modules, runs function load_device_modules +elif test x`basename $0` = xload_device_modules; then +load_device_modules $@; exit $? elif test x`basename $0 || :` = xinstaller-prep-source; then # only source (and net) parts are prepared source_only=yes @@ -575,9 +586,6 @@ # invoked as load_package runs function load_package, if test x`basename $0 || :` = xload_package; then load_package $@; exit $? -# invoked as load_device_modules, runs function load_device_modules -elif test x`basename $0` = xload_device_modules; then -load_device_modules $@; exit $? fi # modules for source/destination devices should be loaded by now ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
bootdisk/trunk/batch-installer/installer-prep
Author: hawk Date: Sat Dec 3 18:37:39 2005 New Revision: 6585 Modified: bootdisk/trunk/batch-installer/installer-prep Log: - load sd_mod only if scsi_mod is already loaded to avoid it when its not necessary (ie. for DAC960) - cosmetics Modified: bootdisk/trunk/batch-installer/installer-prep == --- bootdisk/trunk/batch-installer/installer-prep (original) +++ bootdisk/trunk/batch-installer/installer-prep Sat Dec 3 18:37:39 2005 @@ -417,9 +417,7 @@ rm -f $i.tmp fi done - # if ide-disk is already loaded we havn't got anything to do. - # note that this ain't that simple with SCSI -- scsi_hostadapter - # might have been changed since last load etc. + # check if ide-disk is loaded and if not, load it if lsmod | grep -q '^ide-disk ' ; then : skip else @@ -441,10 +439,14 @@ rm -f $i.tmp fi done + # check if sd_mod is loaded and if not, load it but only if scsi_mod + # is loaded too (to avoid loading it when its not needed ie. for DAC960) if lsmod | grep -q '^sd_mod ' ; then : skip else -load_module sd_mod +if lsmod | grep -q '^scsi_mod ' ; then + load_module sd_mod + fi fi fi done ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
bootdisk/trunk/batch-installer/installer-prep
Author: hawk Date: Sat Dec 3 20:04:32 2005 New Revision: 6589 Modified: bootdisk/trunk/batch-installer/installer-prep Log: - if we are using dhcp, don't reconfigure network interface every time when installer-prep is executed Modified: bootdisk/trunk/batch-installer/installer-prep == --- bootdisk/trunk/batch-installer/installer-prep (original) +++ bootdisk/trunk/batch-installer/installer-prep Sat Dec 3 20:04:32 2005 @@ -268,6 +268,9 @@ # net config configure_network () { + +local dhcp_pid + if test ${net_v6} != yes -a ${net_v6} != no ; then if echo ${net_ipaddr} | grep : ; then net_v6=yes @@ -297,35 +300,41 @@ log_wrap ip link set $net_device up fi -# remove any addresses assigned before (if any) -ip addr show ${net_device} | grep ^ *inet \ -| while read inet addr rest; do - log debug deleting existing address $addr for ${net_device} - log_wrap ip addr delete $addr dev ${net_device} -done +# get pid of dhcp client +dhcp_pid=`ps|grep dhcpcd|awk '{print $1}'` -if test ${net_v6} = yes ; then - ip addr show ${net_device} | grep ^ *inet6 \ +# if we are using dhcp and dhcpcd is already running do nothing +if test $net_ipaddr = dhcp test $dhcp_pid != ; then + : skip +else + # remove any addresses assigned before (if any) + ip addr show ${net_device} | grep ^ *inet \ | while read inet addr rest; do -if echo $addr | grep -q ^fe80 ; then - continue - fi -log debug deleting existing v6 address $addr for ${net_device} +log debug deleting existing address $addr for ${net_device} log_wrap ip addr delete $addr dev ${net_device} done + + if test ${net_v6} = yes ; then +ip addr show ${net_device} | grep ^ *inet6 \ +| while read inet addr rest; do + if echo $addr | grep -q ^fe80 ; then +continue + fi + log debug deleting existing v6 address $addr for ${net_device} + log_wrap ip addr delete $addr dev ${net_device} +done + fi fi if test $net_ipaddr = dhcp; then - # af_packet is needed for dhcpcd - load_module af_packet - # kill old instance of dhcpcd - kill `ps|grep dhcpcd|awk '{print $1}'` 2/dev/null || : - rm /var/run/dhcp*pid 2/dev/null || : - log info waiting for dhcpcd to die (3 seconds) - sleep 3 - log info running dhcpcd - dhcpcd $net_device || die Problems with dhcp - log info $net_device configured with dhcp + # if dhcpcd is not running, run it + if test $dhcp_pid = ; then +# af_packet is needed for dhcpcd +load_module af_packet +log info running dhcpcd +dhcpcd $net_device || die Problems with dhcp +log info $net_device configured with dhcp + fi else test x$net_prefix != xauto || guess_net_prefix log info Setting address $net_ipaddr/$net_prefix for ${net_device} ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
bootdisk/trunk/batch-installer/installer-prep
Author: hawk Date: Sat Dec 3 20:29:23 2005 New Revision: 6590 Modified: bootdisk/trunk/batch-installer/installer-prep Log: - make sure dhcpcd is not running before launching it Modified: bootdisk/trunk/batch-installer/installer-prep == --- bootdisk/trunk/batch-installer/installer-prep (original) +++ bootdisk/trunk/batch-installer/installer-prep Sat Dec 3 20:29:23 2005 @@ -331,6 +331,9 @@ if test $dhcp_pid = ; then # af_packet is needed for dhcpcd load_module af_packet +# dhcpcd shouldn't be running but who knows... +kill `ps|grep dhcpcd|awk '{print $1}'` 2/dev/null || : +rm /var/run/dhcp*pid 2/dev/null || : log info running dhcpcd dhcpcd $net_device || die Problems with dhcp log info $net_device configured with dhcp ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
bootdisk/trunk/batch-installer/installer-prep
Author: hawk Date: Sat Nov 26 16:47:45 2005 New Revision: 6570 Modified: bootdisk/trunk/batch-installer/installer-prep Log: - fixed problem with dhcpcd not being killed when PID Modified: bootdisk/trunk/batch-installer/installer-prep == --- bootdisk/trunk/batch-installer/installer-prep (original) +++ bootdisk/trunk/batch-installer/installer-prep Sat Nov 26 16:47:45 2005 @@ -319,7 +319,7 @@ # af_packet is needed for dhcpcd load_module af_packet # kill old instance of dhcpcd - kill `ps|grep dhcpcd|sed -e 's/ / /g' |cut -d' ' -f2` 2/dev/null || : + kill `ps|grep dhcpcd|awk '{print $1}'` 2/dev/null || : rm /var/run/dhcp*pid 2/dev/null || : log info waiting for dhcpcd to die (3 seconds) sleep 3 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
bootdisk/trunk/batch-installer: installer-prep installer-raid-functions installer-validate installer...
Author: hawk Date: Tue Nov 22 17:00:45 2005 New Revision: 6546 Modified: bootdisk/trunk/batch-installer/installer-prep bootdisk/trunk/batch-installer/installer-raid-functions bootdisk/trunk/batch-installer/installer-validate bootdisk/trunk/batch-installer/installer.conf bootdisk/trunk/batch-installer/pci/sh-scan-pci bootdisk/trunk/batch-installer/ui/ui-functions bootdisk/trunk/batch-installer/ui/ui-main bootdisk/trunk/batch-installer/ui/ui-makeform bootdisk/trunk/batch-installer/ui/ui-wizard Log: - rewritten hostadapters selection/detection code, now user must choose for which adapters he wants modules to be loaded Modified: bootdisk/trunk/batch-installer/installer-prep == --- bootdisk/trunk/batch-installer/installer-prep (original) +++ bootdisk/trunk/batch-installer/installer-prep Tue Nov 22 17:00:45 2005 @@ -103,6 +103,7 @@ fi if test $first ; then + nls Module %s is not available, package %s must be loaded.\n $1 $package nls Please insert disk \addons %d\ and press Enter\n $addons first= else @@ -219,15 +220,6 @@ load_module isofs } -load_ide_modules () { -load_module ide-detect - sleep 1 -} - -load_scsi_modules () { -load_hostadapters scsi -} - load_nfs_modules () { load_module nfs } @@ -378,111 +370,84 @@ test x$source_device != xauto || die cannot autodetect cdrom device, must specify one } -load_hostadapters () { -local modules_dir=/lib/modules/`uname -r` +# load modules needed for devices mentioned in $1 +load_device_modules () { -case $1 in - scsi ) - if test x$scsi_hostadapters = xauto; then - adapters=`detect-pci-devices scsi -m || :` - test $adapters || \ - die No SCSI adapters detected, must specify module(s) by hand - else - adapters=$scsi_hostadapters - fi -;; - ide ) - if test x$ide_hostadapters = xauto; then - adapters=`detect-pci-devices ide -m || :` - test $adapters || \ - die No IDE adapters detected, must specify module(s) by hand - else - adapters=$ide_hostadapters - fi -;; - * ) -die unknown hostadapter: $1 -esac - + local detected_ide detectded_scsi + detected_ide=`detect-pci-devices ide -m` + detected_ide=$detected_ide ide-detect + detected_scsi=`detect-pci-devices scsi -m` + + # go through list of modules and load them or call required functions + for module in $1; do + +if test x$module = xcpqarray; then + . installer-raid-functions + setup_cpqarray +elif test x$module = xcciss; then + . installer-raid-functions + setup_cciss +elif test x$module = xDAC960; then + . installer-raid-functions + setup_DAC960 +elif test x$module = xataraid; then + . installer-raid-functions + setup_ataraid +elif test x$module = xi20; then + . installer-raid-functions + setup_i2o +else + load_module $module +fi -modules_o= -for i in $adapters; do - if test -f $modules_dir/${i}.o; then - : - else - # ok download modules from source (assume we install _on_ scsi and have source already) - # TODO: handle the case we need modules from addons (install _from_ scsi) - modules_o=$modules_o ${i}.o - fi -done - -if test $1 = scsi -a $modules_o; then - # Ignore error here. The most possible reason is that we are installing - # from scsi cdrom/disk, and modules needs to be fetched from addon - # disk (load_module handles it). - load_package scsi-low-mod $modules_o || : -fi - -for i in $adapters; do - load_module $i - ## write info about scsi adapters into modules.conf/modprobe.conf - for j in /etc/modules.conf /etc/modprobe.conf; do - test ! -f $j || cp $j $j.tmp - echo alias ${1}_hostadapter $i $j.tmp - # alias for devfsd - echo alias ${1}-hosts $i $j.tmp - sort $j.tmp | uniq $j - rm -f $j.tmp - done -done -} + done + # check if any of modules to be loaded is for IDE device + # and if it is, load module ide-disk + for ide in $detected_ide; do +if echo $1 | grep -q $ide; then + ## write info about ide adapters into modules.conf/modprobe.conf + for i in /etc/modules.conf /etc/modprobe.conf; do +if ! cat $i | grep -q ^alias ide_hostadapter; then + test ! -f $i || cp $i $i.tmp + echo alias ide_hostadapter $ide $i.tmp + # alias for devfsd + echo alias ide-hosts $ide $i.tmp + sort $i.tmp | uniq $i + rm -f $i.tmp +fi + done
bootdisk/trunk/batch-installer/installer-prep
Author: hawk Date: Tue Nov 22 19:38:35 2005 New Revision: 6549 Modified: bootdisk/trunk/batch-installer/installer-prep Log: - make non-wizard installer working again, execute load_device_modules if needed Modified: bootdisk/trunk/batch-installer/installer-prep == --- bootdisk/trunk/batch-installer/installer-prep (original) +++ bootdisk/trunk/batch-installer/installer-prep Tue Nov 22 19:38:35 2005 @@ -478,7 +478,7 @@ # invoked as load_nodule runs function load_module, if test x`basename $0 || :` = xload_module; then load_module $@; exit $? -# invoked as load_device_module, runs function load_device_modules +# invoked as load_device_modules, runs function load_device_modules elif test x`basename $0` = xload_device_modules; then load_device_modules $@; exit $? elif test x`basename $0 || :` = xinstaller-prep-source; then @@ -508,6 +508,12 @@ fi fi + load hostadapter modules if necessary # + +if ! test -z $hostadapters_modules; then + load_device_modules $hostadapters_modules +fi + ## get to the source ## case $source in cdrom) @@ -555,7 +561,6 @@ esac # invoked as load_package runs function load_package, -# invoked as load_device_module, runs function load_device_modules if test x`basename $0 || :` = xload_package; then load_package $@; exit $? fi ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
bootdisk/trunk/batch-installer/installer-prep
Author: hawk Date: Tue Nov 22 20:02:28 2005 New Revision: 6554 Modified: bootdisk/trunk/batch-installer/installer-prep Log: - typo + fix, thx qboosh Modified: bootdisk/trunk/batch-installer/installer-prep == --- bootdisk/trunk/batch-installer/installer-prep (original) +++ bootdisk/trunk/batch-installer/installer-prep Tue Nov 22 20:02:28 2005 @@ -393,7 +393,7 @@ elif test x$module = xataraid; then . installer-raid-functions setup_ataraid -elif test x$module = xi20; then +elif test x$module = xi2o_block; then . installer-raid-functions setup_i2o else ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
bootdisk/trunk/batch-installer/installer-prep
Author: hawk Date: Tue Nov 22 22:03:10 2005 New Revision: 6555 Modified: bootdisk/trunk/batch-installer/installer-prep Log: - suppress errors while cating /etc/{modules,modprobe}.conf Modified: bootdisk/trunk/batch-installer/installer-prep == --- bootdisk/trunk/batch-installer/installer-prep (original) +++ bootdisk/trunk/batch-installer/installer-prep Tue Nov 22 22:03:10 2005 @@ -408,7 +408,7 @@ if echo $1 | grep -q $ide; then ## write info about ide adapters into modules.conf/modprobe.conf for i in /etc/modules.conf /etc/modprobe.conf; do -if ! cat $i | grep -q ^alias ide_hostadapter; then +if ! cat $i 2 /dev/null | grep -q ^alias ide_hostadapter; then test ! -f $i || cp $i $i.tmp echo alias ide_hostadapter $ide $i.tmp # alias for devfsd @@ -432,7 +432,7 @@ for scsi in $detected_scsi; do if echo $1 | grep -q $scsi; then for i in /etc/modules.conf /etc/modprobe.conf; do -if ! cat $i | grep -q ^alias scsi_hostadapter; then +if ! cat $i 2 /dev/null | grep -q ^alias scsi_hostadapter; then test ! -f $i || cp $i $i.tmp echo alias scsi_hostadapter $scsi $i.tmp # alias for devfsd ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
bootdisk/trunk/batch-installer/installer-prep
Author: hawk Date: Tue Nov 22 22:37:25 2005 New Revision: 6556 Modified: bootdisk/trunk/batch-installer/installer-prep Log: - oops! Modified: bootdisk/trunk/batch-installer/installer-prep == --- bootdisk/trunk/batch-installer/installer-prep (original) +++ bootdisk/trunk/batch-installer/installer-prep Tue Nov 22 22:37:25 2005 @@ -510,7 +510,7 @@ load hostadapter modules if necessary # -if ! test -z $hostadapters_modules; then +if ! test -z $hostadapters_modules; then load_device_modules $hostadapters_modules fi ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit