[Astlinux-commits] SF.net SVN: astlinux:[7499] branches/1.0

[<abe...@us...>]

Revision: 7499
          http://sourceforge.net/p/astlinux/code/7499
Author:   abelbeck
Date:     2016-02-02 21:25:17 +0000 (Tue, 02 Feb 2016)
Log Message:
-----------
runnix-iso, add support for a serial console via 'build-runnix-iso install_image.img.gz serial'

Modified Paths:
--------------
    branches/1.0/project/runnix-iso/target_skeleton/runnix
    branches/1.0/scripts/build-runnix-iso

Added Paths:
-----------
    branches/1.0/project/runnix-iso/files/configs/
    branches/1.0/project/runnix-iso/files/configs/isolinux-serial.cfg

Added: branches/1.0/project/runnix-iso/files/configs/isolinux-serial.cfg
===================================================================
--- branches/1.0/project/runnix-iso/files/configs/isolinux-serial.cfg	                        (rev 0)
+++ branches/1.0/project/runnix-iso/files/configs/isolinux-serial.cfg	2016-02-02 21:25:17 UTC (rev 7499)
@@ -0,0 +1,11 @@
+serial 0 19200
+console 0
+default install
+timeout 10
+prompt 0
+display /isolinux/boot.msg
+
+label install
+    kernel /runnix
+    append initrd=/runnix.img root=/dev/ram0 ro init=/runnix runimg=auto libata.dma=3 rootdelay=8 console=ttyS0,19200n8
+

Modified: branches/1.0/project/runnix-iso/target_skeleton/runnix
===================================================================
--- branches/1.0/project/runnix-iso/target_skeleton/runnix	2016-02-02 18:00:56 UTC (rev 7498)
+++ branches/1.0/project/runnix-iso/target_skeleton/runnix	2016-02-02 21:25:17 UTC (rev 7499)
@@ -159,6 +159,11 @@
 
 echo "$DEVICE" >/tmp/boot_disk
 
+if [ -f $BASE/os/serialflag ]; then
+    export DIALOGOPTS="--ascii-lines"
+    export TERM="vt100"
+fi
+
 echo "Menu..."
 /sbin/installer-menu
 

Modified: branches/1.0/scripts/build-runnix-iso
===================================================================
--- branches/1.0/scripts/build-runnix-iso	2016-02-02 18:00:56 UTC (rev 7498)
+++ branches/1.0/scripts/build-runnix-iso	2016-02-02 21:25:17 UTC (rev 7499)
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# build-runnix-iso install_image.img.gz
+# build-runnix-iso install_image.img.gz [serial]
 #
 
 REQUIRED_CMDS="which sudo genisoimage"
@@ -41,7 +41,11 @@
   rm -rf ${RUNDIR}
   mkdir ${RUNDIR}
   cp -a project/runnix-iso/files/rootfs_vfat/* ${RUNDIR}/
-  find ${RUNDIR} -type d -name .svn | xargs rm -rf
+  find ${RUNDIR} -type d -name '.svn' | xargs rm -rf
+  if [ "$SERIAL" = "serial" ]; then
+    cp -p project/runnix-iso/files/configs/isolinux-serial.cfg ${RUNDIR}/isolinux/isolinux.cfg
+    touch ${RUNDIR}/os/serialflag
+  fi
   cp -p ${SYSLINUX_DIR}/core/isolinux.bin ${RUNDIR}/isolinux/isolinux.bin
   cp -p ${KERNEL} ${RUNDIR}/runnix
   cp -p ${ROOTFS_EXT2_GZ} ${RUNDIR}/runnix.img
@@ -107,10 +111,17 @@
   ISO_NAME="${ISO_FILE##*/}"
   ISO_NAME="${ISO_NAME%.img.gz}.iso"
 else
-  echo "Usage: ./scripts/build-runnix-iso install_image.img.gz"
+  echo "Usage: ./scripts/build-runnix-iso install_image.img.gz [serial]"
   exit 1
 fi
 
+if [ "$2" = "serial" ]; then
+  SERIAL="$2"
+  ISO_NAME="${ISO_NAME%.iso}-serial.iso"
+else
+  SERIAL=""
+fi
+
 if [ ! -f "$ISO_FILE" ]; then
   echo "build-runnix-iso: The $ISO_FILE file does not exist, exiting."  >&2
   exit 1

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.