Merge pull request #13 from tjmcs/tb/update-to-5.x-kernel

Updating Hanlon-Microkernel to TCL-5.x based kernel

Author: tjmcs

README.md

@@ -23,6 +23,6 @@ If the Hanlon Microkernel that is being built/used is a development kernel, a fi
 
 In addition, this project also includes a number of additional ruby files and configuration files that are used by these services, a list of gems that are installed dynamically each time that the Microkernel boots (under the opt/gems directory), a copy of the 'bootsync.sh' script (under the opt directory in this project), and the 'hnl_mk_init.rb' script itself (which is used by that bootsync.sh script to start the appropriate Ruby-based services during the Microkernel boot process).
 
-Copies of the ruby scripts that appear at the top-level of this project's directory structure can be found in the /usr/local/bin directory of the Microkernel. In addition, the files that appear in the hanlon_microkernel subdirectory of this project are all part of the HanlonMicrokernel module, and those files are placed in the /usr/local/lib/ruby/1.8 directory in the Microkernel ISO.
+Copies of the ruby scripts that appear at the top-level of this project's directory structure can be found in the /usr/local/bin directory of the Microkernel. In addition, the files that appear in the hanlon_microkernel subdirectory of this project are all part of the HanlonMicrokernel module, and those files are placed in the /usr/local/lib/ruby/2.0.0 directory in the Microkernel ISO.
 
 It should be noted that this project also includes a set of scripts that are meant to be used to build a new instance of the Microkernel ISO. Instructions for building a new ISO instance using these scripts can be found in this project's Wiki. There are also a number of extensions to the standard Tiny Core Linux ISO that are bundled into the Hanlon Microkernel which are not included in this project. These extensions (and the other dependencies that are needed within the Hanlon Microkernel ISO that are not part of this project) are all downloaded dynamically when the Microkernel ISO is being built. Once again, instructions for building your own (custom) Microkernel ISO can be found in the project's Wiki.

additional-build-files/builtin-extensions.lst

@@ -1,13 +1,30 @@
+firmware-broadcom_bnx2.tcz
+firmware-broadcom_bnx2x.tcz
 openssh.tcz
 openssl-1.0.0.tcz
 dmidecode.tcz
 gcc_libs.tcz
 bash.tcz
-scsi-3.0.21-tinycore.tcz
-ruby.tcz
+scsi-3.8.13-tinycore.tcz
+ncurses.tcz
+ncurses-common.tcz
+libedit.tcz
+libxcb.tcz
+libXdmcp.tcz
+libXau.tcz
+libX11.tcz
+libXext.tcz
+libXrender.tcz
+libXft.tcz
+expat2.tcz
+freetype.tcz
+fontconfig.tcz
+libXss.tcz
+tcl.tcz
+tk.tcz
+gdbm.tcz
+ruby-2.0.tcz
 lshw.deb
-libssl-0.9.8.tcz
-firmware-bnx2.tcz
 libgpg-error.tcz
 libgcrypt.tcz
 popt.tcz

additional-build-files/mirror-extensions.lst

@@ -1,7 +1,6 @@
 fuse.tcz
 glib2-dev.tcz
 glib2.tcz
-libdnet.tcz
 libffi-dev.tcz
 libffi.tcz
 ncurses-common.tcz

build-bundle-file.sh

@@ -173,20 +173,16 @@ fi
   TCL_ISO_URL="$MK_BUNDLE_TCL_ISO_URL"
 [ -z "$RUBY_GEMS_URL" -a -n "$MK_BUNDLE_RUBY_GEMS_URL" ] && 
   RUBY_GEMS_URL="$MK_BUNDLE_RUBY_GEMS_URL"
-[ -z "$OPEN_VM_TOOLS_URL" -a -n "$MK_BUNDLE_OPEN_VM_TOOLS_URL" ] &&
-  OPEN_VM_TOOLS_URL="$MK_BUNDLE_OPEN_VM_TOOLS_URL"
 [ -z "$GEM_SERVER_URI" -a -n "$MK_BUNDLE_GEM_SERVER_URI" ] && 
   GEM_SERVER_URI="$MK_BUNDLE_GEM_SERVER_URI"
 
 # Set to default anything still not specified, for which there is a reasonable
 # default-value
 [ -z "$BUNDLE_TYPE" ] && BUNDLE_TYPE='dev'
-[ -z "$TCL_MIRROR_URI" ] && TCL_MIRROR_URI='http://distro.ibiblio.org/tinycorelinux/4.x/x86/tcz'
-[ -z "$TCL_ISO_URL" ] && TCL_ISO_URL='http://distro.ibiblio.org/tinycorelinux/4.x/x86/release/Core-current.iso'
+[ -z "$TCL_MIRROR_URI" ] && TCL_MIRROR_URI='http://distro.ibiblio.org/tinycorelinux/5.x/x86/tcz'
+[ -z "$TCL_ISO_URL" ] && TCL_ISO_URL='http://distro.ibiblio.org/tinycorelinux/5.x/x86/release/Core-current.iso'
 [ -z "$RUBY_GEMS_URL" ] && RUBY_GEMS_URL='http://production.cf.rubygems.org/rubygems/rubygems-1.8.24.tgz'
-[ -z "$OPEN_VM_TOOLS_URL" ] && OPEN_VM_TOOLS_URL='https://github.com/csc/Hanlon-Microkernel/releases/download/v1.0/mk-open-vm-tools.tar.gz'
-[ -z "$IPMI_TOOLS_URL" ] && IPMI_TOOLS_URL='https://github.com/csc/Hanlon-Microkernel/releases/download/v1.0/mk-ipmi-mods-and-tools.tar.gz'
-[ -z "$PRIV_BUSYBOX_URL" ] && PRIV_BUSYBOX_URL='https://github.com/csc/Hanlon-Microkernel/releases/download/v1.0/mk-custom-busybox.tar.gz'
+[ -z "$PRIV_BUSYBOX_URL" ] && PRIV_BUSYBOX_URL='https://github.com/csc/Hanlon-Microkernel/releases/download/v2.0.0/mk-custom-busybox.tar.gz'
 [ -z "${DEB_PACKAGE_LIST_URL[*]}" ] && DEB_PACKAGE_LIST_URL[0]='http://distro.ibiblio.org/tinycorelinux/5.x/x86/debian_wheezy_main_i386_Packages.gz'
 [ -z "$DEB_MIRROR_URL" ] && DEB_MIRROR_URL='ftp://ftp.us.debian.org/debian'
 
@@ -248,10 +244,10 @@ mkdir -p tmp-build-dir/usr/local/bin
 cp -p hnl_mk_*.rb tmp-build-dir/usr/local/bin
 
 # create copies of the files from this project that will be placed
-# into the /usr/local/lib/ruby/1.8/hanlon_microkernel directory in the Hanlon
+# into the /usr/local/lib/ruby/2.0.0/hanlon_microkernel directory in the Hanlon
 # Microkernel ISO
-mkdir -p tmp-build-dir/usr/local/lib/ruby/1.8/hanlon_microkernel
-cp -p hanlon_microkernel/*.rb tmp-build-dir/usr/local/lib/ruby/1.8/hanlon_microkernel
+mkdir -p tmp-build-dir/usr/local/lib/ruby/2.0.0/hanlon_microkernel
+cp -p hanlon_microkernel/*.rb tmp-build-dir/usr/local/lib/ruby/2.0.0/hanlon_microkernel
 
 # create a copy of the files from this project that will be placed into the
 # /opt directory in the Hanlon Microkernel ISO; as part of this process will
@@ -281,43 +277,53 @@ fi
 
 # create a copy of the local TCL Extension mirror that we will be running within
 # our Microkernel instances
-mkdir -p tmp-build-dir/tmp/tinycorelinux/4.x/x86/tcz
+mkdir -p tmp-build-dir/tmp/tinycorelinux/5.x/x86/tcz
 cp -p tmp/tinycorelinux/*.yaml tmp-build-dir/tmp/tinycorelinux
 for file in `cat $MIRROR_LIST`; do
   if [ ${file##*.} != "deb" ]; then
-    wget $WGET_V -P tmp-build-dir/tmp/tinycorelinux/4.x/x86/tcz $TCL_MIRROR_URI/$file
-    wget $WGET_V -P tmp-build-dir/tmp/tinycorelinux/4.x/x86/tcz $TCL_MIRROR_URI/$file.md5.txt
-    wget $WGET_V -P tmp-build-dir/tmp/tinycorelinux/4.x/x86/tcz $TCL_MIRROR_URI/$file.info
-    wget $WGET_V -P tmp-build-dir/tmp/tinycorelinux/4.x/x86/tcz $TCL_MIRROR_URI/$file.list
-    wget $WGET_V -P tmp-build-dir/tmp/tinycorelinux/4.x/x86/tcz $TCL_MIRROR_URI/$file.dep
+    wget $WGET_V -P tmp-build-dir/tmp/tinycorelinux/5.x/x86/tcz $TCL_MIRROR_URI/$file
+    wget $WGET_V -P tmp-build-dir/tmp/tinycorelinux/5.x/x86/tcz $TCL_MIRROR_URI/$file.md5.txt 2> /dev/null
+    wget $WGET_V -P tmp-build-dir/tmp/tinycorelinux/5.x/x86/tcz $TCL_MIRROR_URI/$file.info
+    wget $WGET_V -P tmp-build-dir/tmp/tinycorelinux/5.x/x86/tcz $TCL_MIRROR_URI/$file.list
+    wget $WGET_V -P tmp-build-dir/tmp/tinycorelinux/5.x/x86/tcz $TCL_MIRROR_URI/$file.dep 2> /dev/null
   else
     PKGNAME=${file%.*}
     echo "Installing .deb package for mirroring: $PKGNAME"
     ./bin/download-deb-pkg --list-file "./tmp-deb/" --mirror-url "$DEB_MIRROR_URL" --output-dir ./tmp-deb $PKGNAME
-    ./bin/deb2tcz.sh ./tmp-deb/$PKGNAME.deb tmp-build-dir/tmp/tinycorelinux/4.x/x86/tcz/$PKGNAME.tcz
+    ./bin/deb2tcz.sh ./tmp-deb/$PKGNAME.deb tmp-build-dir/tmp/tinycorelinux/5.x/x86/tcz/$PKGNAME.tcz
 
   fi
 done
 
 # and add the files listed in the file specified by the ADDTNL_MODS_LIST parameter
 # to the mirror as well
 if [ ! -z ${ADDTNL_MODS_LIST} ]; then
+  # remove the 'map' file associated with each module in the list
+  while read line; do
+    fields=( $line )
+    full_file=${fields[0]}
+    file=${full_file##*/}
+    rm tmp-build-dir/tmp/tinycorelinux/5.x/x86/tcz/${file}.map 2> /dev/null
+  done < ${ADDTNL_MODS_LIST}
+  # then add the files from the list
   while read line; do
     fields=( $line )
     full_file=${fields[0]}
     file=${full_file##*/}
     if [ ${file##*.} != "deb" ]; then
-      cp -p $full_file tmp-build-dir/tmp/tinycorelinux/4.x/x86/tcz
-      cp -p $full_file.md5.txt tmp-build-dir/tmp/tinycorelinux/4.x/x86/tcz
-      cp -p $full_file.dep tmp-build-dir/tmp/tinycorelinux/4.x/x86/tcz
-      rm tmp-build-dir/tmp/tinycorelinux/4.x/x86/tcz/${file}.map 2> /dev/null
-      echo "${fields[1]}  ${fields[2]}" >> tmp-build-dir/tmp/tinycorelinux/4.x/x86/tcz/${file}.map
+      if [ ! -f tmp-build-dir/tmp/tinycorelinux/5.x/x86/tcz/$file ]; then
+        cp -p $full_file tmp-build-dir/tmp/tinycorelinux/5.x/x86/tcz
+        cp -p $full_file.md5.txt tmp-build-dir/tmp/tinycorelinux/5.x/x86/tcz
+        cp -p $full_file.dep tmp-build-dir/tmp/tinycorelinux/5.x/x86/tcz 2> /dev/null
+      fi
+      echo "${fields[1]}  ${fields[2]}" >> tmp-build-dir/tmp/tinycorelinux/5.x/x86/tcz/${file}.map
     else
       PKGNAME=${file%.*}
-      echo "Installing .deb package as builtin: $PKGNAME"
-      ./bin/deb2tcz.sh $full_file tmp-build-dir/tmp/tinycorelinux/4.x/x86/tcz/$PKGNAME.tcz
-      rm tmp-build-dir/tmp/tinycorelinux/4.x/x86/tcz/${file}.map 2> /dev/null
-      echo "${fields[1]}  ${fields[2]}" >> tmp-build-dir/tmp/tinycorelinux/4.x/x86/tcz/${file}.map
+      if [ ! -f tmp-build-dir/tmp/tinycorelinux/5.x/x86/tcz/$PKGNAME.tcz ]; then
+        echo "Installing .deb package as builtin: $PKGNAME"
+        ./bin/deb2tcz.sh $full_file tmp-build-dir/tmp/tinycorelinux/5.x/x86/tcz/$PKGNAME.tcz
+      fi
+      echo "${fields[1]}  ${fields[2]}" >> tmp-build-dir/tmp/tinycorelinux/5.x/x86/tcz/${file}.map
     fi
   done < ${ADDTNL_MODS_LIST}
 fi
@@ -334,12 +340,12 @@ for file in `cat $BUILTIN_LIST`; do
     if [ $BUNDLE_TYPE != 'prod' ] || [ ! $file = 'openssh.tcz' ]; then
       wget $WGET_V -P tmp-build-dir/tmp/builtin/optional $TCL_MIRROR_URI/$file
       wget $WGET_V -P tmp-build-dir/tmp/builtin/optional $TCL_MIRROR_URI/$file.md5.txt
-      wget $WGET_V -P tmp-build-dir/tmp/builtin/optional $TCL_MIRROR_URI/$file.dep
+      wget $WGET_V -P tmp-build-dir/tmp/builtin/optional $TCL_MIRROR_URI/$file.dep 2> /dev/null
       echo $file >> tmp-build-dir/tmp/builtin/onboot.lst
     elif [ $BUNDLE_TYPE = 'prod' ] && [ -f tmp-build-dir/tmp/builtin/optional/$file ]
     then
       rm tmp-build-dir/tmp/builtin/optional/$file
-      rm tmp-build-dir/tmp/builtin/optional/$file.md5.txt 2> /dev/null
+      rm tmp-build-dir/tmp/builtin/optional/$file.md5.txt
       rm tmp-build-dir/tmp/builtin/optional/$file.dep 2> /dev/null
     fi
   else
@@ -361,12 +367,12 @@ if [ ! -z ${LOCAL_EXTENTS_LIST} ]; then
     if [ ${file##*.} != "deb" ]; then
       cp -p $full_file tmp-build-dir/tmp/builtin/optional
       cp -p $full_file.md5.txt tmp-build-dir/tmp/builtin/optional
-      cp -p $full_file.dep tmp-build-dir/tmp/builtin/optional
+      cp -p $full_file.dep tmp-build-dir/tmp/builtin/optional 2> /dev/null
       echo $file >> tmp-build-dir/tmp/builtin/onboot.lst
     else
       PKGNAME=${file%.*}
       echo "Installing .deb package as builtin: $PKGNAME"
-      ./bin/deb2tcz.sh $full_file tmp-build-dir/tmp/tinycorelinux/4.x/x86/tcz/$PKGNAME.tcz
+      ./bin/deb2tcz.sh $full_file tmp-build-dir/tmp/tinycorelinux/5.x/x86/tcz/$PKGNAME.tcz
       echo $file >> tmp-build-dir/tmp/builtin/onboot.lst
     fi
   done < ${LOCAL_EXTENTS_LIST}
@@ -417,18 +423,9 @@ ln -s /usr/local/sbin/dmidecode tmp-build-dir/usr/sbin 2> /dev/null
 #   1. ssh-setup-files.tar.gz -> contains the setup files needed for the
 #         SSH/SSL (used for development access to the Microkernel); if
 #         the '--build-prod-image' flag is set, then this file will be skipped
-#   2. mk-open-vm-tools.tar.gz -> contains the files needed for the
-#         'open_vm_tools.tcz' extension
-#   4. mk-ipmi-mods-and-tools.tar.gz -> contains the kernel modules and 
-#         tools needed to access the BMC associated with the node (if any)
-#         and report back facts from the BMC to the Hanlon server
-#   5. mk-custom-busybox.tar.gz -> contains the custom version of busybox that
+#   2. mk-custom-busybox.tar.gz -> contains the custom version of busybox that
 #         supports additional fields in the DHCP response handling process
 cp -p additional-build-files/*.gz tmp-build-dir/build_dir/dependencies
-file=`echo $OPEN_VM_TOOLS_URL | awk -F/ '{print $NF}'`
-wget $WGET_V -P tmp-build-dir/build_dir/dependencies $OPEN_VM_TOOLS_URL
-file=`echo $IPMI_TOOLS_URL | awk -F/ '{print $NF}'`
-wget $WGET_V -P tmp-build-dir/build_dir/dependencies $IPMI_TOOLS_URL
 file=`echo $PRIV_BUSYBOX_URL | awk -F/ '{print $NF}'`
 wget $WGET_V -P tmp-build-dir/build_dir/dependencies $PRIV_BUSYBOX_URL
 

hanlon_microkernel/hnl_mk_configuration_manager.rb

@@ -7,7 +7,7 @@
 require 'singleton'
 
 module HanlonMicrokernel
-  class RzMkConfigurationManager
+  class HnlMkConfigurationManager
     # make this class a singleton class (only want one)
     include Singleton
 

hanlon_microkernel/hnl_mk_fact_manager.rb

@@ -8,7 +8,7 @@
 require 'yaml'
 
 module HanlonMicrokernel
-  class RzMkFactManager
+  class HnlMkFactManager
 
     attr_accessor :prev_facts_filename
     attr_reader :last_saved_timestamp
@@ -56,26 +56,7 @@ def get_mac_id_array
     end
 
     def get_uuid
-      # loop through output of 'lshw -c system' command
-      %x[sudo lshw -c system].each { |line|
-        # check for line that includes the configuration (which has the
-        # uuid value embedded in it)
-        config_line_val = /^[ ]+configuration:\s+(.+)/.match(line)
-        if config_line_val && config_line_val[1]
-          # if got this far, then split the match into elements, each
-          # of which will look like "name=value"; then look for the
-          # element who's 'name' is 'uuid'
-          config_line_val[1].split.each { |elem|
-            uuid_elem_match = /^uuid=(.+)$/.match(elem)
-            if uuid_elem_match
-              # if got this far, we've found a match
-              return uuid_elem_match[1]
-            end
-          }
-        end
-      }
-      # if we got to here, no uuid was found, so return an empty string
-      ''
+      %x[sudo dmidecode -s system-uuid].chomp
     end
 
   end

hanlon_microkernel/hnl_mk_gem_controller.rb

@@ -9,7 +9,7 @@
 require 'singleton'
 
 module HanlonMicrokernel
-  class RzMkGemController
+  class HnlMkGemController
     # make this class a singleton class (only want one)
     include Singleton