Changeset 4480

Show
Ignore:
Timestamp:
06/13/10 17:11:47 (3 months ago)
Author:
finley
Message:

* remove hotplug and discover

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Makefile

    r4413 r4480  
    22#       "SystemImager"   
    33# 
    4 #   Copyright (C) 1999-2006 Brian Elliott Finley 
     4#   Copyright (C) 1999-2010 Brian Elliott Finley 
    55#   Copyright (C) 2001-2004 Hewlett-Packard Company <dannf@hp.com> 
    66#    
    …… 
    221221include $(TOPDIR)/make.d/bc.rul 
    222222include $(TOPDIR)/make.d/ctcs.rul 
    223 include $(TOPDIR)/make.d/discover-data.rul 
    224 include $(TOPDIR)/make.d/discover.rul 
    225223include $(TOPDIR)/make.d/dosfstools.rul 
    226224include $(TOPDIR)/make.d/e2fsprogs.rul 

  • trunk/TODO

    r4475 r4480  
    1616(-)  unclassified 
    1717 
    18 TODO list for SystemImager 
    19 ========================== 
    20 (1)     Fix source so that it builds on Ubuntu Lucid 
    21 (1.1)   Support grub2 
    22 (1.2)   Support ext4 
     18Finley's new TODO list for SystemImager 
     19--------------------------------------- 
     20(1) Fix source so that it builds on Ubuntu Lucid 
     21    (1.1) Busybox latest (done) 
     22(2) Support grub2 (and other improvements) 
    2323 
     24    * Thanks to Dennis Stam and Bas van der Vlies of SARA for their 
     25      notes (below w/my modifications) to help me along here 
     26 
     27        - Make sure init scripts for updated binaries come from the 
     28          binaries' packages 
     29        - xbusybox 1.16.1 
     30        - xparted 2.2+ needed for grub 2 so we can set the grub2 partition 
     31          flag 
     32        - xudev 157. So we could remove the hotplug software. 
     33          Autodetecting of hardware is better.  
     34        - yNo insmod and my_modules anymore?  I'm thinking we should keep 
     35          this feature around in the mainstream SystemImager code for now. 
     36        - kernel support with gpt labels needed for grub2 and upgrade to 
     37          2.6.33.3 and switch to cpio for initrd instead of cramfs. The 
     38          systemimager standard kernel use a lot of deprecated options. 
     39        - changed bittorent client to aria2. Can handle more protocols: 
     40           * http://aria2.sourceforge.net/ and is completely written in 
     41             C++ 
     42        - all filesystem tools are upgrade to a newer version. 
     43        - switched to udhcpc instead of dhclient. The former is included 
     44          standard in busybox. 
     45        - Further we completely removed the boel_binaries.tar.gz rsync 
     46          setup.  Our modules and utilities are all included in the 
     47          initrd.img. It is easier to upgrade to a new kernel. 
     48        - /etc/init.d/functions. A lot is removed or has been rewritten. 
     49        - the grub2 installations is handled in our post install script 
     50          for now 
     51 
     52 
     53(3) Support ext4 
     54(4) switch to udhcp 
     55 
     56---- 
     57 
     58The prior TODO list for SystemImager 
     59------------------------------------ 
    2460(8) Introduce a new command (si_power) to control the power of the clients 
    2561    (turn on/off/reboot, etc.), see also: ipmitool, BMC. 

  • trunk/doc/manual_source/faq.sgml

    r4307 r4480  
    754754      <ListItem> <para><command>devfsd</command></para> </ListItem> 
    755755      <ListItem> <para><command>ISC dhcp</command></para> </ListItem> 
    756       <ListItem> <para><command>discover</command></para> </ListItem> 
    757756      <ListItem> <para><command>dosfstools</command></para> </ListItem> 
    758757      <ListItem> <para><command>e2fsprogs</command></para> </ListItem> 

  • trunk/etc/autoinstallscript.template

    r4431 r4480  
    409409# 
    410410#   Detect scsi hardware and include the device IDs into the hardware.lst 
    411 #   file used by systemconfigurator. 
    412 #   Use pci-automod for 2.6 kernels, discover for 2.4 kernels. 
     411#   file used by systemconfigurator.  Use pci-automod for 2.6 kernels. 
     412# 
     413#   (no longer support 2.4 kernels -BEF-) 
    413414# 
    414415[ ! -d /a/etc/systemconfig ] && mkdir -p /a/etc/systemconfig 
    …… 
    421422    pci-automod --hwlist --class storage --class net --class serial --class bridge > /a/etc/systemconfig/hardware.lst 
    422423    logmsg "done" 
    423 else 
    424     SCSI_MODS=`discover -f "%m\n" scsi | grep -v ide-scsi | uniq` 
    425     for MOD in $SCSI_MODS; do 
    426         DEVID=`grep $MOD /proc/bus/pci/devices | cut -f 2 | sort | uniq` 
    427         for MYDEV in $DEVID; do 
    428             VENDOR=`echo $MYDEV | cut -b 1-4` 
    429             MODEL=`echo $MYDEV | cut -b 5-8` 
    430             echo "$VENDOR $MODEL scsi $MOD" >> /a/etc/systemconfig/hardware.lst 
    431             logmsg "Added SCSI device $VENDOR:$MODEL using module $MOD to hardware.lst" 
    432         done 
    433     done 
    434424fi 
    435425# 

  • trunk/initrd_source/initrd.rul

    r4448 r4480  
    6565include $(INITRD_DIR)/make.d/busybox.rul 
    6666include $(INITRD_DIR)/make.d/dhclient.rul 
    67 include $(INITRD_DIR)/make.d/hotplug.rul 
    6867include $(INITRD_DIR)/make.d/lsb.rul 
    6968include $(INITRD_DIR)/make.d/rsync.rul 
    …… 
    162161        cd $(INITRD_BUILD_DIR)/bin && ln -s ../lib/bittorrent/bittorrent-console 
    163162 
    164         # lsb init functions needed by udev and hotplug init scripts. 
     163        # lsb init functions needed by udev init script 
    165164        install -m 755 -d $(INITRD_BUILD_DIR)/lib/lsb 
    166165        install -m 644 $(LSB_DIR)/init-functions $(INITRD_BUILD_DIR)/lib/lsb 

  • trunk/initrd_source/skel/etc/init.d/functions

    r4468 r4480  
    777777# 
    778778start_udevd() { 
    779     # 
    780     # Start udevd first, then hotplug 
    781779    logmsg 
    782780    logmsg start_udevd 
    …… 
    790788        logmsg done 
    791789    fi 
    792 } 
    793 # 
    794 ################################################################################ 
    795 # 
    796 start_hotplug() { 
    797     # 
    798     # Start udevd first, then hotplug 
    799     logmsg 
    800     logmsg start_hotplug 
    801     touch /etc/fstab 
    802     /etc/init.d/hotplug start 
    803  
    804790} 
    805791# 
    …… 
    11241110################################################################################ 
    11251111# 
    1126 # Detect what we can. 
    1127 # Note: Modules that are needed during the initial boot stages of BOEL should 
    1128 #       be copied to the "skel/my_modules" directory prior to creating your 
    1129 #       custom initrd.gz. -BEF- 
    1130 # 
    1131 autodetect_hardware_and_load_modules() { 
    1132     logmsg 
    1133     logmsg autodetect_hardware_and_load_modules 
    1134     if [ -e /proc/sys/kernel/hotplug ] && uname -r | grep -q boel; then 
    1135         logmsg "Detecting hardware using hotplug (this may take a long time): " 
    1136         /etc/init.d/hotplug stop 
    1137         /etc/init.d/hotplug start 
    1138     elif [ -d /sys/bus -a -e /lib/modules/`uname -r`/modules.pcimap ]; then 
    1139         logmsg "Hardware already detected by hotplug" 
    1140     else 
    1141         logmsg "Detecting hardware using discover: " 
    1142         MODULES=`discover --module bridge ethernet ide scsi usb` 
    1143     fi 
    1144  
    1145     # Prepend with other modules that we will probably need. 
    1146     MODULES=`echo sd_mod ide-disk $MODULES | sort -u` 
    1147  
    1148     logmsg $MODULES 
    1149  
    1150     for MODULE in $MODULES 
    1151     do 
    1152         logmsg 
    1153         logmsg "Loading $MODULE... " 
    1154         if echo $MODULE | grep '[-_]' >/dev/null 2>&1; then 
    1155             if modprobe `echo $MODULE | sed 's/-/_/g'` 2>/dev/null; then 
    1156                 logmsg "done!" 
    1157             elif modprobe `echo $MODULE | sed 's/_/-/g'` 2>/dev/null; then 
    1158                 logmsg "done!" 
    1159             else 
    1160                 logmsg "not needed or already loaded." 
    1161             fi 
    1162         else 
    1163             modprobe $MODULE 2>/dev/null && logmsg "done!" || logmsg "not needed or already loaded." 
    1164         fi 
    1165     done 
    1166  
     1112show_loaded_modules() { 
    11671113    # Show loaded modules 
    11681114    logmsg ">> Loaded kernel modules:" 

  • trunk/initrd_source/skel/etc/init.d/rcS

    r4448 r4480  
    33#   "SystemImager"  
    44# 
    5 #   Copyright (C) 1999-2004 Brian Elliott Finley  
     5#   Copyright (C) 1999-2010 Brian Elliott Finley  
    66# 
    77#   $Id$ 
    …… 
    4646 
    4747start_udevd 
    48  
    49 start_hotplug 
    5048 
    5149mount_pts 
    …… 
    102100get_scripts_directory 
    103101 
    104 autodetect_hardware_and_load_modules 
     102show_loaded_modules 
    105103 
    106104# HOSTNAME may already be set via local.cfg -BEF- 

  • trunk/lib/SystemImager/UseYourOwnKernel.pm

    r4429 r4480  
    174174            print ">>> Appending insmod commands to ./my_modules_dir/INSMOD_COMMANDS...\n" if( $verbose ); 
    175175            if ($#modules == -1) { 
    176                 print " >> Using custom kernel: hotplug will be used to autodetect the needed modules...\n" 
     176                print " >> Using custom kernel: udev will be used to autodetect the needed modules...\n" 
    177177                    if( $verbose ); 
    178178            } else { 

  • trunk/make.d/boel_binaries.inc

    r4472 r4480  
    77#       $(TOPDIR)/tmp/$(ARCH)/ instead of just $(TOPDIR)/tmp/. -BEF- 
    88# 
     9#   2010.06.13  Brian Elliott Finley 
     10#   * remove discover related bits 
    911 
    1012BOEL_BINARIES_DIR       = $(TOPDIR)/tmp/boel_binaries 
    …… 
    98100        cd /usr/include && h2ph -d $(BOEL_BINARIES_DIR)/usr/lib/perl/5.6.1 asm/* 
    99101endif 
    100         # 
    101         # Copy over miscellaneous other files... 
    102         # 
    103         mkdir -m 755 -p $(BOEL_BINARIES_DIR)/usr/share/discover 
    104         install -m 644 $(DISCOVER_DATA_FILES) $(BOEL_BINARIES_DIR)/usr/share/discover 
    105102 
    106103        # copy over libnss files for non-uclibc arches