Cel silverstone

.gitmodules

@@ -9,7 +9,7 @@
 	url = http://github.com/floodlight/infra
 [submodule "sm/bigcode"]
 	path = sm/bigcode
-	url = http://github.com/floodlight/bigcode
+	url = https://github.com/SW-CSV/bigcode
 [submodule "packages/base/any/kernels/legacy/linux-3.8.13"]
 	path = packages/base/any/kernels/legacy/linux-3.8.13
 	url = http://github.com/opennetworklinux/linux-3.8.13

builds/any/installer/installer.sh.in

@@ -141,6 +141,9 @@ if has_boot_env onl_installer_debug; then installer_debug=1; fi
 if test "$installer_debug"; then
   echo "Debug mode"
   set -x
+  installer_wait=30
+else
+  installer_wait=3
 fi
 
 # Pickup ONIE defines for this machine.
@@ -254,7 +257,7 @@ if test "${onie_platform}"; then
 
     installer_umount
 
-    if installer_reboot; then
+    if installer_reboot $installer_wait; then
       :
     else
       sync
@@ -587,7 +590,7 @@ trap - 0 1
 installer_umount
 
 if test "${onie_platform}"; then
-  installer_reboot
+  installer_reboot $installer_wait
 fi
 
 exit

builds/any/installer/sample-postinstall.sh

@@ -39,4 +39,104 @@ rootdir=$1; shift
 echo "Hello from postinstall"
 echo "Chroot is $rootdir"
 
-exit 0
+PATH_TMP='/tmp/os'
+EFI_PATH_TMP='/tmp/efi'
+DIAG_GRUB_DATA="function diag_bootcmd {
+                \$diag_grub_custom 
+            }"
+
+###  Delete ONL boot partition 
+ONL_DIAG=$(efibootmgr | grep "Open Network Linux" | awk '{print $1}')
+ONL_BOOT_NUM="${ONL_DIAG//Boot/}"
+ONL_BOOT_NUM="${ONL_BOOT_NUM//\*/}"
+# efibootmgr -b $ONL_BOOT_NUM -A # -B is inactive command
+efibootmgr -b $ONL_BOOT_NUM -B  # -B is delete command
+
+### Change parition name with -DIAG, The uninstall operation must not modify or remove this partiion.
+sgdisk --change-name=$(sgdisk -p /dev/sda | grep "ONL-BOOT" | awk '{print $1}'):"ONL-BOOT-DIAG" /dev/sda
+sgdisk --change-name=$(sgdisk -p /dev/sda | grep "ONL-CONFIG" | awk '{print $1}'):"ONL-CONFIG-DIAG" /dev/sda
+sgdisk --change-name=$(sgdisk -p /dev/sda | grep "ONL-IMAGES" | awk ' {print $1}'):"ONL-IMAGES-DIAG" /dev/sda
+sgdisk --change-name=$(sgdisk -p /dev/sda | grep "ONL-DATA" | awk '{print $1}'):"ONL-DATA-DIAG" /dev/sda
+
+### Set GPT system partition attribute bit (bit 0)
+sgdisk -A $(sgdisk -p /dev/sda | grep "ONL-BOOT" | awk '{print $1}'):set:0 /dev/sda
+sgdisk -A $(sgdisk -p /dev/sda | grep "ONL-CONFIG" | awk '{print $1}'):set:0 /dev/sda
+sgdisk -A $(sgdisk -p /dev/sda | grep "ONL-IMAGES" | awk '{print $1}'):set:0 /dev/sda
+sgdisk -A $(sgdisk -p /dev/sda | grep "ONL-DATA" | awk '{print $1}'):set:0 /dev/sda
+
+### Read grub config and set back to ONIE Diag grub.
+mkdir -p $PATH_TMP
+mount -v /dev/sda$(sgdisk -p /dev/sda | grep "ONL-BOOT-DIAG" | awk '{print $1}') $PATH_TMP
+ST_GRUB=$(cat $PATH_TMP/grub/grub.cfg | grep -n "menuentry \"Open Network Linux\" {" | head -n 1 | cut -d: -f1)
+EN_GRUB=$(tail $PATH_TMP/grub/grub.cfg -n +$ST_GRUB | grep -n "}" |head -n 1 |cut -d: -f1)
+EN_GRUB=$(($EN_GRUB+$ST_GRUB-1))
+
+sed -n -e $(($ST_GRUB+1)),$(($EN_GRUB-1))p $PATH_TMP/grub/grub.cfg > /tmp/grub_tmp
+# DIAG_GRUB="${DIAG_GRUB_DATA/"\$diag_grub_custom"/\"$DIAG_GRUB\"}"
+cp $rootdir/mnt/onie-boot/grub/grub.cfg $rootdir/mnt/onie-boot/grub/grubNEW.cfg
+cp $rootdir/mnt/onie-boot/grub/grub.cfg $rootdir/mnt/onie-boot/grub/grub_backup.cfg
+echo "Installing Diag OS grub to grub.cfg ....."
+echo "$(echo "}" | cat - $rootdir/mnt/onie-boot/grub/grubNEW.cfg)" > $rootdir/mnt/onie-boot/grub/grubNEW.cfg
+cat /tmp/grub_tmp | cat - $rootdir/mnt/onie-boot/grub/grubNEW.cfg > $rootdir/mnt/onie-boot/grub/grub.cfg
+echo "$(echo "function diag_bootcmd {" | cat - $rootdir/mnt/onie-boot/grub/grub.cfg)" > $rootdir/mnt/onie-boot/grub/grub.cfg
+echo "$(echo diag_menu=\"CLS Diag OS\" | cat - $rootdir/mnt/onie-boot/grub/grub.cfg)" > $rootdir/mnt/onie-boot/grub/grub.cfg
+rm -f $rootdir/mnt/onie-boot/grub/grubNEW.cfg
+
+
+# DIAG_GRUB="${DIAG_GRUB_DATA/"\$diag_grub_custom"/\"$DIAG_GRUB\"}"
+cp $rootdir/mnt/onie-boot/onie/grub/grub_backup.cfg $rootdir/mnt/onie-boot/onie/grub/grub-extra.cfg.cfg 2> /dev/null || :
+cp $rootdir/mnt/onie-boot/onie/grub/grub-extra.cfg $rootdir/mnt/onie-boot/onie/grub/grub_backup.cfg
+
+cp $rootdir/mnt/onie-boot/onie/grub/grub-extra.cfg $rootdir/mnt/onie-boot/onie/grub/grubNEW.cfg
+echo "Installing Diag OS grub grub-extra.cfg ....."
+echo "$(echo "}" | cat - $rootdir/mnt/onie-boot/onie/grub/grubNEW.cfg)" > $rootdir/mnt/onie-boot/onie/grub/grubNEW.cfg
+cat /tmp/grub_tmp | cat - $rootdir/mnt/onie-boot/onie/grub/grubNEW.cfg > $rootdir/mnt/onie-boot/onie/grub/grub-extra.cfg
+echo "$(echo "function diag_bootcmd {" | cat - $rootdir/mnt/onie-boot/onie/grub/grub-extra.cfg)" > $rootdir/mnt/onie-boot/onie/grub/grub-extra.cfg
+echo "$(echo diag_menu=\"CLS Diag OS\" | cat - $rootdir/mnt/onie-boot/onie/grub/grub-extra.cfg)" > $rootdir/mnt/onie-boot/onie/grub/grub-extra.cfg
+echo "$(echo "## Begin grub-extra.cfg" | cat - $rootdir/mnt/onie-boot/onie/grub/grub-extra.cfg)" > $rootdir/mnt/onie-boot/onie/grub/grub-extra.cfg
+rm -f $rootdir/mnt/onie-boot/onie/grub/grubNEW.cfg
+
+#Get boot order before create new one.
+CURRENT_BOOT_ORDER=$(efibootmgr | grep BootOrder: | awk '{ print $2 }')
+mkdir -p $EFI_PATH_TMP
+mount -v /dev/sda$(sgdisk -p /dev/sda | grep "EFI System" | awk '{print $1}') $EFI_PATH_TMP
+echo "Update EFI directory for ONL from /boot/efi/EFI/ONL to /boot/efi/EFI/ONL-DIAG"
+if [ -d /tmp/efi/EFI/ONL ]; then
+    mv /tmp/efi/EFI/ONL /tmp/efi/EFI/ONL-DIAG
+fi
+
+boot_num=$(efibootmgr -v | grep "CLS-DIAG-OS" | grep ')/File(' | tail -n 1 | awk '{ print $1 }')
+boot_num=${#boot_num}
+if [ $boot_num -eq 0 ]; then
+    efibootmgr -c -L "CLS-DIAG-OS" -l '\EFI\ONL-DIAG\grubx64.efi'
+fi
+
+#*Reorder* move CLS-DIAG-OS to back of list.
+boot_num=$(efibootmgr -v | grep "CLS-DIAG-OS" | grep ')/File(' | tail -n 1 | awk '{ print $1 }')
+boot_num=${boot_num#Boot}
+boot_num=${boot_num%\*}
+new_boot_order="$(echo -n $CURRENT_BOOT_ORDER | sed -e s/,$boot_num// -e s/$boot_num,// -e s/$boot_num//)"
+efibootmgr -o ${new_boot_order},${boot_num}
+
+echo "Copy grub-extra.cfg to diag-boocmd.cfg to prevent command disappear after Onie update ..."
+cp $rootdir/mnt/onie-boot/onie/grub/grub-extra.cfg $rootdir/mnt/onie-boot/onie/grub/diag-bootcmd.cfg
+
+echo "Create dummy partition for CLS Diag OS for prevent being destroy by onie-updater"
+# DUMMY_PARTITION_NUMBER_POST=$(sgdisk -p /dev/sda | grep CLS-DIAG | awk '{print $1}')
+# if [[ $DUMMY_PARTITION_NUMBER_POST -gt 0 ]]
+# then
+#     exit 0
+# fi
+START_POS=$(sgdisk -f /dev/sda)
+END_POS=$(($START_POS+2048))
+LAST_PARTITION_NUMBER=$(sgdisk -p /dev/sda | grep $(($START_POS-1)) | awk '{print $1}')
+NEW_PARTITION_NUMBER=$((LAST_PARTITION_NUMBER+1))
+sgdisk -n $NEW_PARTITION_NUMBER:$START_POS:$END_POS -t $NEW_PARTITION_NUMBER:0700 /dev/sda
+sgdisk --change-name=$NEW_PARTITION_NUMBER:"CLS-DIAG" /dev/sda
+sgdisk -A $(sgdisk -p /dev/sda | grep "CLS-DIAG" | awk '{print $1}'):set:0 /dev/sda
+dd if=/dev/zero of=/dev/sda$NEW_PARTITION_NUMBER bs=1M count=1
+mkfs.ext4 /dev/sda$NEW_PARTITION_NUMBER
+partprobe /dev/sda
+tune2fs -L "CLS-DIAG" /dev/sda$NEW_PARTITION_NUMBER
+
+exit 0

builds/any/installer/sample-preinstall.sh

@@ -35,4 +35,35 @@ rootdir=$1; shift
 echo "Hello from preinstall"
 echo "Chroot is $rootdir"
 
+### Change parition name with -DIAG, The uninstall operation must not modify or remove this partiion.
+### clear GPT system partition attribute bit (bit 0)
+if [ ! -z $(sgdisk -p /dev/sda | grep "ONL-BOOT-DIAG" | awk '{print $1}') ]; then
+    sgdisk --change-name=$(sgdisk -p /dev/sda | grep "ONL-BOOT-DIAG" | awk '{print $1}'):"ONL-BOOT" /dev/sda
+    sgdisk -A $(sgdisk -p /dev/sda | grep "ONL-BOOT" | awk '{print $1}'):clear:0 /dev/sda
+fi
+if [ ! -z $(sgdisk -p /dev/sda | grep "ONL-CONFIG-DIAG" | awk '{print $1}') ]; then
+    sgdisk --change-name=$(sgdisk -p /dev/sda | grep "ONL-CONFIG-DIAG" | awk '{print $1}'):"ONL-CONFIG" /dev/sda
+    sgdisk -A $(sgdisk -p /dev/sda | grep "ONL-CONFIG" | awk '{print $1}'):clear:0 /dev/sda
+fi
+if [ ! -z $(sgdisk -p /dev/sda | grep "ONL-IMAGES-DIAG" | awk '{print $1}') ]; then
+    sgdisk --change-name=$(sgdisk -p /dev/sda | grep "ONL-IMAGES-DIAG" | awk ' {print $1}'):"ONL-IMAGES" /dev/sda
+    sgdisk -A $(sgdisk -p /dev/sda | grep "ONL-IMAGES" | awk '{print $1}'):clear:0 /dev/sda
+fi
+if [ ! -z $(sgdisk -p /dev/sda | grep "ONL-DATA-DIAG" | awk '{print $1}') ]; then
+    sgdisk --change-name=$(sgdisk -p /dev/sda | grep "ONL-DATA-DIAG" | awk '{print $1}'):"ONL-DATA" /dev/sda
+    sgdisk -A $(sgdisk -p /dev/sda | grep "ONL-DATA" | awk '{print $1}'):clear:0 /dev/sda
+fi
+
+## Remove Dummy partition CLS-DIAG if exist
+if [ ! -z $(sgdisk -p /dev/sda | grep CLS-DIAG | awk '{print $1}') ]; then
+    DUMMY_PARTITION_NUMBER=$(sgdisk -p /dev/sda | grep CLS-DIAG | awk '{print $1}')
+    sgdisk -d $DUMMY_PARTITION_NUMBER /dev/sda
+fi
+
+## Move back the ONL efi partition for protect the conflict between install process.
+if [ -d /boot/efi/EFI/ONL-DIAG ]; then
+    mv /boot/efi/EFI/ONL-DIAG /boot/efi/EFI/ONL
+fi
+
+
 exit 0

builds/any/rootfs/jessie/common/all-base-packages.yml

@@ -4,11 +4,12 @@
 #
 ############################################################
 - base-files
-- sysvinit-core
 - locales
 - python
 - apt
 - apt-utils
+- debconf
+- dialog
 - procps
 - net-tools
 - iputils-ping

builds/any/rootfs/jessie/standard/standard.yml

@@ -11,6 +11,7 @@ variables:
   !include $ONL/make/versions/version-onl.yml
 
 Packages: &Packages
+  - !script  $ONL/tools/onl-init-pkgs.py ${INIT}
   - !include $ONL/builds/any/rootfs/$ONL_DEBIAN_SUITE/common/all-base-packages.yml
   - !include $ONL/builds/any/rootfs/$ONL_DEBIAN_SUITE/common/${ARCH}-base-packages.yml
   - !include $ONL/builds/any/rootfs/$ONL_DEBIAN_SUITE/common/${ARCH}-onl-packages.yml

builds/any/rootfs/stretch/common/all-base-packages.yml

@@ -4,11 +4,12 @@
 #
 ############################################################
 - base-files
-- sysvinit-core
 - locales
 - python
 - apt
 - apt-utils
+- debconf
+- dialog
 - procps
 - net-tools
 - iputils-ping

builds/any/rootfs/stretch/common/amd64-base-packages.yml

@@ -8,8 +8,10 @@
 - smartmontools
 - grub2
 - onl-upgrade
-- hw-management
+#- hw-management
 - onl-kernel-4.9-lts-x86-64-all-modules
 - onl-kernel-4.14-lts-x86-64-all-modules
 - efibootmgr
 - gdisk
+- ipmitool
+- valgrind

builds/any/rootfs/stretch/standard/standard.yml

@@ -11,6 +11,7 @@ variables:
   !include $ONL/make/versions/version-onl.yml
 
 Packages: &Packages
+  - !script  $ONL/tools/onl-init-pkgs.py ${INIT}
   - !include $ONL/builds/any/rootfs/$ONL_DEBIAN_SUITE/common/all-base-packages.yml
   - !include $ONL/builds/any/rootfs/$ONL_DEBIAN_SUITE/common/${ARCH}-base-packages.yml
   - !include $ONL/builds/any/rootfs/$ONL_DEBIAN_SUITE/common/${ARCH}-onl-packages.yml
@@ -66,9 +67,9 @@ Configure:
 
   update-rc.d:
     - 'faultd defaults'
-    - 'onlpd defaults'
+    - 'onlpd remove'
     - 'snmpd defaults'
-    - 'onlp-snmpd defaults'
+    - 'onlp-snmpd remove'
     - 'ssh defaults'
     - 'openbsd-inetd remove'
     - 'ntp remove'

builds/any/rootfs/wheezy/common/all-base-packages.yml

@@ -7,6 +7,8 @@
 - python
 - apt
 - apt-utils
+- debconf
+- dialog
 - procps
 - net-tools
 - iputils-ping

docker/images/builder8/1.9/Dockerfile

@@ -0,0 +1,22 @@
+############################################################
+#
+# Minor updates.
+# - libelf-dev for kernel 4.14
+# - cryptsetup-bin
+#
+############################################################
+FROM opennetworklinux/builder8:1.8
+MAINTAINER Jeffrey Townsend <jeffrey.townsend@bigswitch.com>
+
+# LTS architecture fixes
+
+RUN sudo sed -i s/'http:\/\/security'/'[arch=amd64,armel] http:\/\/security'/g /etc/apt/sources.list && \
+    apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get upgrade -y && \
+    apt-get install -y apt-transport-https
+
+#
+# Docker shell and other container tools.
+#
+COPY docker_shell /bin/docker_shell
+COPY container-id /bin/container-id

docker/images/builder8/1.9/Makefile

@@ -0,0 +1,19 @@
+VERSION=1.9
+USER=opennetworklinux
+REPO=builder8
+
+TOOLS=../../../tools/docker_shell ../../../tools/container-id
+
+build: check_version
+	cp $(TOOLS) .
+	docker build -t $(USER)/$(REPO):$(VERSION) .
+	rm -rf $(notdir $(TOOLS))
+
+#
+# Todo: Query remote repository to see if the request version already exists to avoid accidental overwrites
+# when a new image is built but the VERSION variable is not updated.
+#
+check_version:
+
+push:
+	docker push $(USER)/$(REPO):$(VERSION)

docker/images/builder9/1.2/Dockerfile

@@ -0,0 +1,17 @@
+############################################################
+#
+# Update Packages for arm64.
+# Additional build dependencies.
+#
+############################################################
+FROM opennetworklinux/builder9:1.1
+MAINTAINER Jeffrey Townsend <jeffrey.townsend@bigswitch.com>
+
+RUN apt-get update && \
+    apt-get upgrade -y && \
+    apt-get install -y apt-transport-https
+
+# Docker shell and other container tools.
+#
+COPY docker_shell /bin/docker_shell
+COPY container-id /bin/container-id

docker/images/builder9/1.2/Makefile

@@ -0,0 +1,19 @@
+VERSION=1.2
+USER=opennetworklinux
+REPO=builder9
+
+TOOLS=../../../tools/docker_shell ../../../tools/container-id
+
+build: check_version
+	cp $(TOOLS) .
+	docker build -t $(USER)/$(REPO):$(VERSION) .
+	rm -rf $(notdir $(TOOLS))
+
+#
+# Todo: Query remote repository to see if the request version already exists to avoid accidental overwrites
+# when a new image is built but the VERSION variable is not updated.
+#
+check_version:
+
+push:
+	docker push $(USER)/$(REPO):$(VERSION)

docker/tools/onlbuilder

@@ -18,8 +18,8 @@ g_current_uid  = os.getuid()
 g_timestamp = datetime.datetime.now().strftime("%Y-%m-%d.%H%M%S")
 
 g_builder7_image_name="opennetworklinux/builder7:1.2"
-g_builder8_image_name="opennetworklinux/builder8:1.8"
-g_builder9_image_name="opennetworklinux/builder9:1.1"
+g_builder8_image_name="opennetworklinux/builder8:1.9"
+g_builder9_image_name="opennetworklinux/builder9:1.2"
 
 g_default_image_name=g_builder8_image_name
 g_default_container_name = "%s_%s" % (g_current_user, g_timestamp)

docs/Building.md

@@ -1,4 +1,5 @@
-#How to Build Open Network Linux 
+How to Build Open Network Linux 
+============================================================
 
 In case you are not interested in building ONL from scratch
 (it takes a while) you can download pre-compiled binaries from
@@ -55,7 +56,8 @@ and the SWI files (if you want them) are in
 
 
 
-#Installing Docker Gotchas
+Installing Docker Gotchas
+------------------------------------------------------------
 
 Docker installer oneliner (for reference: see docker.com for details)
 
@@ -78,7 +80,7 @@ Consider enabling builds for non-privileged users with:
 - If you run as non-root without this, you will get errors like `..: dial unix /var/run/docker.sock: permission denied`
 - Building as root is fine as well (it immediately jumps into a root build shell), so this optional
 
-#Additional Build Details
+Additional Build Details
 ----------------------------------------------------------
 
 The rest of this guide talks about how to build specific 

make/config.mk

@@ -26,6 +26,10 @@ export ONL_DEBIAN_SUITE_$(ONL_DEBIAN_SUITE)=1
 
 export BUILD_DIR_BASE=BUILD/$(ONL_DEBIAN_SUITE)
 
+# init system options sysvinit, systemd. default is sysvinit
+ifndef INIT
+  export INIT := sysvinit
+endif
 
 # Use the new module database tool to resolve dependencies dynamically.
 ifndef BUILDER_MODULE_DATABASE