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

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

Revision: 7504
          http://sourceforge.net/p/astlinux/code/7504
Author:   abelbeck
Date:     2016-02-03 16:01:17 +0000 (Wed, 03 Feb 2016)
Log Message:
-----------
runnix-iso, include ChangeLog.txt as <ISO_NAME>.txt and move runnix files to a directory

Modified Paths:
--------------
    branches/1.0/project/runnix-iso/files/configs/isolinux-serial.cfg
    branches/1.0/project/runnix-iso/files/rootfs_vfat/isolinux/isolinux.cfg
    branches/1.0/scripts/build-runnix-iso

Added Paths:
-----------
    branches/1.0/project/runnix-iso/files/rootfs_vfat/runnix/

Modified: branches/1.0/project/runnix-iso/files/configs/isolinux-serial.cfg
===================================================================
--- branches/1.0/project/runnix-iso/files/configs/isolinux-serial.cfg	2016-02-03 14:20:05 UTC (rev 7503)
+++ branches/1.0/project/runnix-iso/files/configs/isolinux-serial.cfg	2016-02-03 16:01:17 UTC (rev 7504)
@@ -6,6 +6,6 @@
 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
+    kernel /runnix/runnix
+    append initrd=/runnix/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/files/rootfs_vfat/isolinux/isolinux.cfg
===================================================================
--- branches/1.0/project/runnix-iso/files/rootfs_vfat/isolinux/isolinux.cfg	2016-02-03 14:20:05 UTC (rev 7503)
+++ branches/1.0/project/runnix-iso/files/rootfs_vfat/isolinux/isolinux.cfg	2016-02-03 16:01:17 UTC (rev 7504)
@@ -4,6 +4,6 @@
 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
+    kernel /runnix/runnix
+    append initrd=/runnix/runnix.img root=/dev/ram0 ro init=/runnix runimg=auto libata.dma=3 rootdelay=8
 

Modified: branches/1.0/scripts/build-runnix-iso
===================================================================
--- branches/1.0/scripts/build-runnix-iso	2016-02-03 14:20:05 UTC (rev 7503)
+++ branches/1.0/scripts/build-runnix-iso	2016-02-03 16:01:17 UTC (rev 7504)
@@ -61,8 +61,8 @@
     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
+  cp -p ${KERNEL} ${RUNDIR}/runnix/runnix
+  cp -p ${ROOTFS_EXT2_GZ} ${RUNDIR}/runnix/runnix.img
 
   if [ -n "$ISO_DIR" ]; then
     cp "$ISO_DIR"/*.img.gz ${RUNDIR}/os/
@@ -71,11 +71,13 @@
   fi
   gen_image_sha1_files ${RUNDIR}/os
 
-  rm -f ${ISO_NAME}
+  cp -p docs/ChangeLog.txt "${RUNDIR}/${ISO_NAME%.iso}.txt"
 
+  rm -f "${ISO_NAME}"
+
   echo "Generating ISO '${ISO_NAME}' ..."
   sudo genisoimage \
-    -o ${ISO_NAME} \
+    -o "${ISO_NAME}" \
     -b isolinux/isolinux.bin \
     -c isolinux/boot.cat \
     -V 'AstLinux ISO' \

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